diff options
4 files changed, 25 insertions, 34 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/entities/TrialHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala index cc96cbd..9210742 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala @@ -17,25 +17,31 @@ object TrialHistory { sealed trait State object State { - case object Summarize extends State - case object Criteriarize extends State - case object Review extends State - case object Flag extends State + case object Summarize extends State + case object Criteriarize extends State + case object Review extends State + case object ReviewSummary extends State + case object ReviewCriteria extends State + case object Flag extends State - val All: Set[State] = Set[State](Summarize, Criteriarize, Review, Flag) + val All: Set[State] = Set[State](Summarize, Criteriarize, Review, ReviewSummary, ReviewCriteria, Flag) val fromString: PartialFunction[String, State] = { - case "Summarize" => State.Summarize - case "Criteriarize" => State.Criteriarize - case "Review" => State.Review - case "Flag" => State.Flag + case "Summarize" => State.Summarize + case "Criteriarize" => State.Criteriarize + case "Review" => State.Review + case "ReviewSummary" => State.ReviewSummary + case "ReviewCriteria" => State.ReviewCriteria + case "Flag" => State.Flag } def stateToString(x: State): String = x match { - case State.Summarize => "Summarize" - case State.Criteriarize => "Criteriarize" - case State.Review => "Review" - case State.Flag => "Flag" + case State.Summarize => "Summarize" + case State.Criteriarize => "Criteriarize" + case State.Review => "Review" + case State.ReviewSummary => "ReviewSummary" + case State.ReviewCriteria => "ReviewCriteria" + case State.Flag => "Flag" } implicit def toPhiString(x: State): PhiString = 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, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala index c8df1d8..f71ec12 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala @@ -10,10 +10,12 @@ object trialhistory { import common._ implicit val trialStateFormat = new EnumJsonFormat[State]( - "Summarize" -> State.Summarize, - "Criteriarize" -> State.Criteriarize, - "Review" -> State.Review, - "Flag" -> State.Flag + "Summarize" -> State.Summarize, + "Criteriarize" -> State.Criteriarize, + "Review" -> State.Review, + "ReviewSummary" -> State.ReviewSummary, + "ReviewCriteria" -> State.ReviewCriteria, + "Flag" -> State.Flag ) implicit val trialActionFormat = new EnumJsonFormat[Action]( |