diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-11-15 12:23:59 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-15 12:23:59 +0700 |
commit | 10e9512ff196d33ef6475e89fa89e937af6aea8b (patch) | |
tree | 0952117a3227483c881ca1d50828cb435c4d8182 /src/main | |
parent | aa7f7297daf13c6a31578959299484dc4be4ccc7 (diff) | |
parent | 9d907320174e59b29a3293d937b5e6eb7fd55af9 (diff) | |
download | rest-query-10e9512ff196d33ef6475e89fa89e937af6aea8b.tar.gz rest-query-10e9512ff196d33ef6475e89fa89e937af6aea8b.tar.bz2 rest-query-10e9512ff196d33ef6475e89fa89e937af6aea8b.zip |
Merge pull request #63 from drivergroup/PDSUI-2345v0.14.11
PDSUI-2345 [Added new States] Store some more granular information in records/documents history
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala | 30 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala | 56 |
2 files changed, 47 insertions, 39 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala index 089658e..43a1832 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala @@ -18,16 +18,20 @@ object DocumentHistory { sealed trait State object State { + case object New extends State case object Extract extends State case object Review extends State + case object Done extends State case object Flag extends State - case object New extends State + case object Archive extends State val All: Set[State] = Set( + State.New, State.Extract, State.Review, + State.Done, State.Flag, - State.New + State.Archive ) private val stateToName: Map[State, String] = @@ -51,15 +55,15 @@ object DocumentHistory { } object Action { - case object Start extends Action - case object Submit extends Action - case object Unassign extends Action - case object Resolve extends Action - case object Flag extends Action - case object Archive extends Action - case object PostedEvidence extends Action - case object CreatedDocument extends Action - case object ReadDocument extends Action + case object Start extends Action + case object Submit extends Action + case object Unassign extends Action + case object Resolve extends Action + case object Flag extends Action + case object Archive extends Action + case object PostEvidence extends Action + case object CreateDocument extends Action + case object ReadDocument extends Action val All: Set[Action] = Set( Action.Start, @@ -68,8 +72,8 @@ object DocumentHistory { Action.Resolve, Action.Flag, Action.Archive, - Action.PostedEvidence, - Action.CreatedDocument, + Action.PostEvidence, + Action.CreateDocument, Action.ReadDocument ) diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala index bdbdc93..5ed5805 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala @@ -23,14 +23,18 @@ object MedicalRecordHistory { case object Clean extends State case object Organize extends State case object Review extends State + case object Done extends State case object Flag extends State + case object Archive extends State val All: Set[State] = Set( State.New, State.Clean, State.Organize, State.Review, - State.Flag + State.Done, + State.Flag, + State.Archive ) private val stateToName: Map[State, String] = @@ -51,22 +55,22 @@ object MedicalRecordHistory { } object Action { - case object Start extends Action - case object Submit extends Action - case object Unassign extends Action - case object Resolve extends Action - case object Flag extends Action - case object Archive extends Action - case object SavedDuplicate extends Action - case object SavedReorder extends Action - case object SavedRotation extends Action - case object DeletedDuplicate extends Action - case object DeletedReorder extends Action - case object DeletedRotation extends Action - case object CreatedDocument extends Action - case object DeletedDocument extends Action - case object CreatedRecord extends Action - case object ReadRecord extends Action + case object Start extends Action + case object Submit extends Action + case object Unassign extends Action + case object Resolve extends Action + case object Flag extends Action + case object Archive extends Action + case object SaveDuplicate extends Action + case object SaveReorder extends Action + case object SaveRotation extends Action + case object DeleteDuplicate extends Action + case object DeleteReorder extends Action + case object DeleteRotation extends Action + case object CreateDocument extends Action + case object DeleteDocument extends Action + case object CreateRecord extends Action + case object ReadRecord extends Action val All: Set[Action] = Set( Action.Start, @@ -75,15 +79,15 @@ object MedicalRecordHistory { Action.Resolve, Action.Flag, Action.Archive, - Action.SavedDuplicate, - Action.SavedReorder, - Action.SavedRotation, - Action.DeletedDuplicate, - Action.DeletedReorder, - Action.DeletedRotation, - Action.CreatedDocument, - Action.DeletedDocument, - Action.CreatedRecord, + Action.SaveDuplicate, + Action.SaveReorder, + Action.SaveRotation, + Action.DeleteDuplicate, + Action.DeleteReorder, + Action.DeleteRotation, + Action.CreateDocument, + Action.DeleteDocument, + Action.CreateRecord, Action.ReadRecord ) |