TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to change use enum for org/equipment

Browse Source
This commit is contained in:
Eike Kettner
2021-03-10 23:54:04 +01:00
parent 0229a867af
commit 274e433d9d
10 changed files with 252 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -392,7 +392,8 @@ trait Conversions {
v.contacts.map(mkContact).toList,
ro.notes,
ro.created,
ro.shortName
ro.shortName,
ro.use
)
}
@ -415,7 +416,7 @@ trait Conversions {
now,
now,
v.shortName.map(_.trim),
OrgUse.Correspondent
v.use
)
} yield OOrganization.OrgAndContacts(org, cont)
}
@ -441,7 +442,7 @@ trait Conversions {
v.created,
now,
v.shortName.map(_.trim),
OrgUse.Correspondent
v.use
)
} yield OOrganization.OrgAndContacts(org, cont)
}
@ -630,17 +631,17 @@ trait Conversions {
// equipment
def mkEquipment(re: REquipment): Equipment =
Equipment(re.eid, re.name, re.created, re.notes)
Equipment(re.eid, re.name, re.created, re.notes, re.use)
def newEquipment[F[_]: Sync](e: Equipment, cid: Ident): F[REquipment] =
timeId.map({ case (id, now) =>
REquipment(id, cid, e.name.trim, now, now, e.notes, EquipmentUse.Concerning)
REquipment(id, cid, e.name.trim, now, now, e.notes, e.use)
})
def changeEquipment[F[_]: Sync](e: Equipment, cid: Ident): F[REquipment] =
Timestamp
.current[F]
.map(now => REquipment(e.id, cid, e.name.trim, e.created, now, e.notes, EquipmentUse.Concerning))
.map(now => REquipment(e.id, cid, e.name.trim, e.created, now, e.notes, e.use))
// idref