diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-11-29 12:02:30 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 12:02:30 +0700 |
| commit | 93f96aa8157dedd90fc3fc30dff520a6340f66d3 (patch) | |
| tree | f019f03a413a1f617fd35286a97903bc7e9d12bb | |
| parent | 357ed83683bf49c952c4de60d8a671089150e23c (diff) | |
| parent | 4cc495d47288202c19f7f921a1b7bb545fb54260 (diff) | |
| download | rest-query-93f96aa8157dedd90fc3fc30dff520a6340f66d3.tar.gz rest-query-93f96aa8157dedd90fc3fc30dff520a6340f66d3.tar.bz2 rest-query-93f96aa8157dedd90fc3fc30dff520a6340f66d3.zip | |
Merge pull request #70 from drivergroup/TRIAL-149v0.14.21
TRIAL-149 Added more states for trial history
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala | 32 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala | 10 |
2 files changed, 25 insertions, 17 deletions
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/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]( |