diff options
| author | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-03 13:09:49 -0700 |
|---|---|---|
| committer | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-03 13:09:49 -0700 |
| commit | 98d6f3d136a16310300e23b12e6b730ac7ade6b6 (patch) | |
| tree | 34ef97bc59f3c34d20a18cd65107655d319097fc /src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala | |
| parent | 1d0202a3964637ffb93180a1c89617633ab5ab18 (diff) | |
| parent | 0653b90dddc294fddb0e81059aef00b202113d78 (diff) | |
| download | rest-query-98d6f3d136a16310300e23b12e6b730ac7ade6b6.tar.gz rest-query-98d6f3d136a16310300e23b12e6b730ac7ade6b6.tar.bz2 rest-query-98d6f3d136a16310300e23b12e6b730ac7ade6b6.zip | |
Merge branch 'add-slot-eligibility-arms' into trial-46-disease-entity
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala index afb86b3..26ced22 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala @@ -1,5 +1,6 @@ package xyz.driver.pdsuidomain.entities +import xyz.driver.entities.labels.{Label, LabelCategory} import xyz.driver.pdsuicommon.domain.{LongId, StringId} import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuidomain.entities.Criterion.Meta.Evidence @@ -8,9 +9,10 @@ final case class Criterion(id: LongId[Criterion], trialId: StringId[Trial], text: Option[String], isCompound: Boolean, - meta: String) { + meta: String, + inclusion: Option[Boolean]) { - def isValid(): Boolean = text.nonEmpty && Option(meta).isDefined + def isValid: Boolean = text.nonEmpty && Option(meta).isDefined } object Criterion { @@ -41,7 +43,7 @@ object CriterionArm { final case class CriterionLabel(id: LongId[CriterionLabel], labelId: Option[LongId[Label]], criterionId: LongId[Criterion], - categoryId: Option[LongId[Category]], + categoryId: Option[LongId[LabelCategory]], value: Option[Boolean], isDefining: Boolean) |