diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-11-29 15:57:49 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 15:57:49 +0700 |
| commit | 16b8fa21f38ee98864e1476d78ca78aa949f2ad3 (patch) | |
| tree | 0df2101bfb9e405b00f04bf9ec0b076842f38097 /src | |
| parent | 93f96aa8157dedd90fc3fc30dff520a6340f66d3 (diff) | |
| parent | d52bcb362be0d5a4ff87db8759b8d83b2a616323 (diff) | |
| download | rest-query-16b8fa21f38ee98864e1476d78ca78aa949f2ad3.tar.gz rest-query-16b8fa21f38ee98864e1476d78ca78aa949f2ad3.tar.bz2 rest-query-16b8fa21f38ee98864e1476d78ca78aa949f2ad3.zip | |
Merge pull request #71 from drivergroup/PDSUI-2407v0.14.22
PDSUI-2407 Removed unnecessary records' statuses
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala | 12 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala index d3bc56e..cf13d1a 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala @@ -85,12 +85,8 @@ object MedicalRecord { } object Status { - case object Unprocessed extends Status - case object PreCleaning extends Status case object New extends Status case object Cleaned extends Status - case object PreOrganized extends Status - case object PreOrganizing extends Status case object Reviewed extends Status case object Organized extends Status case object Done extends Status @@ -98,12 +94,8 @@ object MedicalRecord { case object Archived extends Status def fromString(status: String): Option[Status] = status match { - case "Unprocessed" => Some(Unprocessed) - case "PreCleaning" => Some(PreCleaning) case "New" => Some(New) case "Cleaned" => Some(Cleaned) - case "PreOrganized" => Some(PreOrganized) - case "PreOrganizing" => Some(PreOrganizing) case "Reviewed" => Some(Reviewed) case "Organized" => Some(Organized) case "Done" => Some(Done) @@ -113,12 +105,8 @@ object MedicalRecord { } val All: Set[Status] = Set[Status]( - Unprocessed, - PreCleaning, New, Cleaned, - PreOrganized, - PreOrganizing, Reviewed, Organized, Done, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala index cbe4951..d3fe2c9 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala @@ -16,13 +16,8 @@ object record { import common._ implicit val recordStatusFormat: EnumJsonFormat[Status] = new EnumJsonFormat[Status]( - "PreCleaning" -> Status.PreCleaning, - "Unprocessed" -> Status.Unprocessed, - "PreOrganized" -> Status.PreOrganized, "New" -> Status.New, "Cleaned" -> Status.Cleaned, - "PreOrganized" -> Status.PreOrganized, - "PreOrganizing" -> Status.PreOrganizing, "Reviewed" -> Status.Reviewed, "Organized" -> Status.Organized, "Done" -> Status.Done, |