diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala index d3d63cb..eff2276 100644 --- a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala +++ b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala @@ -25,7 +25,7 @@ (page.osobniCislo.value, page.parametr.value, page.kriterium.value) def onChangeAction(key: PageKey): Action = - FetchParameterCriteria( + FetchParameterCriterion( key._1, key._2, key._3, @@ -69,7 +69,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): PageComponent.ViewModel = import connectors.* PageComponent.ViewModel( diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala index d3d63cb..eff2276 100644 --- a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala +++ b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala @@ -25,7 +25,7 @@ (page.osobniCislo.value, page.parametr.value, page.kriterium.value) def onChangeAction(key: PageKey): Action = - FetchParameterCriteria( + FetchParameterCriterion( key._1, key._2, key._3, @@ -69,7 +69,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): PageComponent.ViewModel = import connectors.* PageComponent.ViewModel( diff --git a/app/src/main/scala/mdr/pdb/app/state/AppState.scala b/app/src/main/scala/mdr/pdb/app/state/AppState.scala index 4f95f5d..8ea0261 100644 --- a/app/src/main/scala/mdr/pdb/app/state/AppState.scala +++ b/app/src/main/scala/mdr/pdb/app/state/AppState.scala @@ -70,7 +70,7 @@ given JsonDecoder[UserContract] = DeriveJsonDecoder.gen given JsonDecoder[UserInfo] = DeriveJsonDecoder.gen - given JsonDecoder[ParameterCriteria] = DeriveJsonDecoder.gen + given JsonDecoder[ParameterCriterion] = DeriveJsonDecoder.gen given JsonDecoder[Parameter] = DeriveJsonDecoder.gen private val actions = EventBus[Action]() @@ -140,7 +140,7 @@ pushParameters(mockParameters) router.replaceState(Page.DetailParametru(o, p)) } - case FetchParameterCriteria(osc, paramId, critId, page) => + case FetchParameterCriterion(osc, paramId, critId, page) => Task.attempt { for o <- mockData.find(_.personalNumber == osc) diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala index d3d63cb..eff2276 100644 --- a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala +++ b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala @@ -25,7 +25,7 @@ (page.osobniCislo.value, page.parametr.value, page.kriterium.value) def onChangeAction(key: PageKey): Action = - FetchParameterCriteria( + FetchParameterCriterion( key._1, key._2, key._3, @@ -69,7 +69,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): PageComponent.ViewModel = import connectors.* PageComponent.ViewModel( diff --git a/app/src/main/scala/mdr/pdb/app/state/AppState.scala b/app/src/main/scala/mdr/pdb/app/state/AppState.scala index 4f95f5d..8ea0261 100644 --- a/app/src/main/scala/mdr/pdb/app/state/AppState.scala +++ b/app/src/main/scala/mdr/pdb/app/state/AppState.scala @@ -70,7 +70,7 @@ given JsonDecoder[UserContract] = DeriveJsonDecoder.gen given JsonDecoder[UserInfo] = DeriveJsonDecoder.gen - given JsonDecoder[ParameterCriteria] = DeriveJsonDecoder.gen + given JsonDecoder[ParameterCriterion] = DeriveJsonDecoder.gen given JsonDecoder[Parameter] = DeriveJsonDecoder.gen private val actions = EventBus[Action]() @@ -140,7 +140,7 @@ pushParameters(mockParameters) router.replaceState(Page.DetailParametru(o, p)) } - case FetchParameterCriteria(osc, paramId, critId, page) => + case FetchParameterCriterion(osc, paramId, critId, page) => Task.attempt { for o <- mockData.find(_.personalNumber == osc) diff --git a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala index 84782db..5f0f74c 100644 --- a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala +++ b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala @@ -12,7 +12,7 @@ case class AutorizujDukaz( osoba: OsobniCislo, parametr: Parameter.Id, - kriterium: ParameterCriteria.Id, + kriterium: ParameterCriterion.Id, dukaz: List[DocumentRef], platiDo: Option[LocalDate] ) extends Command diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala index d3d63cb..eff2276 100644 --- a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala +++ b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala @@ -25,7 +25,7 @@ (page.osobniCislo.value, page.parametr.value, page.kriterium.value) def onChangeAction(key: PageKey): Action = - FetchParameterCriteria( + FetchParameterCriterion( key._1, key._2, key._3, @@ -69,7 +69,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): PageComponent.ViewModel = import connectors.* PageComponent.ViewModel( diff --git a/app/src/main/scala/mdr/pdb/app/state/AppState.scala b/app/src/main/scala/mdr/pdb/app/state/AppState.scala index 4f95f5d..8ea0261 100644 --- a/app/src/main/scala/mdr/pdb/app/state/AppState.scala +++ b/app/src/main/scala/mdr/pdb/app/state/AppState.scala @@ -70,7 +70,7 @@ given JsonDecoder[UserContract] = DeriveJsonDecoder.gen given JsonDecoder[UserInfo] = DeriveJsonDecoder.gen - given JsonDecoder[ParameterCriteria] = DeriveJsonDecoder.gen + given JsonDecoder[ParameterCriterion] = DeriveJsonDecoder.gen given JsonDecoder[Parameter] = DeriveJsonDecoder.gen private val actions = EventBus[Action]() @@ -140,7 +140,7 @@ pushParameters(mockParameters) router.replaceState(Page.DetailParametru(o, p)) } - case FetchParameterCriteria(osc, paramId, critId, page) => + case FetchParameterCriterion(osc, paramId, critId, page) => Task.attempt { for o <- mockData.find(_.personalNumber == osc) diff --git a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala index 84782db..5f0f74c 100644 --- a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala +++ b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala @@ -12,7 +12,7 @@ case class AutorizujDukaz( osoba: OsobniCislo, parametr: Parameter.Id, - kriterium: ParameterCriteria.Id, + kriterium: ParameterCriterion.Id, dukaz: List[DocumentRef], platiDo: Option[LocalDate] ) extends Command diff --git a/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala b/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala new file mode 100644 index 0000000..07eb9a6 --- /dev/null +++ b/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala @@ -0,0 +1,12 @@ +package mdr.pdb.parameters +package query +package repo + +import mdr.pdb.OsobniCislo + +import zio.* + +trait ParametersRepository: + def allParameters(): Task[List[Parameter]] + def parametersOfUser(user: OsobniCislo): Task[List[Parameter]] + def proofsOfUser(user: OsobniCislo): Task[List[Proof]] diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala index d3d63cb..eff2276 100644 --- a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala +++ b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala @@ -25,7 +25,7 @@ (page.osobniCislo.value, page.parametr.value, page.kriterium.value) def onChangeAction(key: PageKey): Action = - FetchParameterCriteria( + FetchParameterCriterion( key._1, key._2, key._3, @@ -69,7 +69,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): PageComponent.ViewModel = import connectors.* PageComponent.ViewModel( diff --git a/app/src/main/scala/mdr/pdb/app/state/AppState.scala b/app/src/main/scala/mdr/pdb/app/state/AppState.scala index 4f95f5d..8ea0261 100644 --- a/app/src/main/scala/mdr/pdb/app/state/AppState.scala +++ b/app/src/main/scala/mdr/pdb/app/state/AppState.scala @@ -70,7 +70,7 @@ given JsonDecoder[UserContract] = DeriveJsonDecoder.gen given JsonDecoder[UserInfo] = DeriveJsonDecoder.gen - given JsonDecoder[ParameterCriteria] = DeriveJsonDecoder.gen + given JsonDecoder[ParameterCriterion] = DeriveJsonDecoder.gen given JsonDecoder[Parameter] = DeriveJsonDecoder.gen private val actions = EventBus[Action]() @@ -140,7 +140,7 @@ pushParameters(mockParameters) router.replaceState(Page.DetailParametru(o, p)) } - case FetchParameterCriteria(osc, paramId, critId, page) => + case FetchParameterCriterion(osc, paramId, critId, page) => Task.attempt { for o <- mockData.find(_.personalNumber == osc) diff --git a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala index 84782db..5f0f74c 100644 --- a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala +++ b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala @@ -12,7 +12,7 @@ case class AutorizujDukaz( osoba: OsobniCislo, parametr: Parameter.Id, - kriterium: ParameterCriteria.Id, + kriterium: ParameterCriterion.Id, dukaz: List[DocumentRef], platiDo: Option[LocalDate] ) extends Command diff --git a/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala b/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala new file mode 100644 index 0000000..07eb9a6 --- /dev/null +++ b/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala @@ -0,0 +1,12 @@ +package mdr.pdb.parameters +package query +package repo + +import mdr.pdb.OsobniCislo + +import zio.* + +trait ParametersRepository: + def allParameters(): Task[List[Parameter]] + def parametersOfUser(user: OsobniCislo): Task[List[Parameter]] + def proofsOfUser(user: OsobniCislo): Task[List[Proof]] diff --git a/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala b/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala index 8bd8687..b849072 100644 --- a/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala +++ b/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala @@ -6,5 +6,5 @@ trait Codecs: - given JsonCodec[ParameterCriteria] = DeriveJsonCodec.gen + given JsonCodec[ParameterCriterion] = DeriveJsonCodec.gen given JsonCodec[Parameter] = DeriveJsonCodec.gen diff --git a/app/src/main/scala/mdr/pdb/app/Page.scala b/app/src/main/scala/mdr/pdb/app/Page.scala index 335c7b0..a707094 100644 --- a/app/src/main/scala/mdr/pdb/app/Page.scala +++ b/app/src/main/scala/mdr/pdb/app/Page.scala @@ -76,7 +76,11 @@ ) object DetailKriteria { - def apply(o: UserInfo, p: Parameter, k: ParameterCriteria): DetailKriteria = + def apply( + o: UserInfo, + p: Parameter, + k: ParameterCriterion + ): DetailKriteria = DetailKriteria( Titled(o.personalNumber, Some(o.name)), Titled(p.id, Some(p.name)), @@ -98,7 +102,7 @@ def apply( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): UpravDukazKriteria = UpravDukazKriteria( Titled(o.personalNumber, Some(o.name)), diff --git a/app/src/main/scala/mdr/pdb/app/actions.scala b/app/src/main/scala/mdr/pdb/app/actions.scala index 9296fd0..f9d9c6a 100644 --- a/app/src/main/scala/mdr/pdb/app/actions.scala +++ b/app/src/main/scala/mdr/pdb/app/actions.scala @@ -11,11 +11,11 @@ case class FetchUserDetails(osc: OsobniCislo) extends Action case class FetchParameters(osc: OsobniCislo) extends Action case class FetchParameter(osc: OsobniCislo, paramId: String) extends Action -case class FetchParameterCriteria( +case class FetchParameterCriterion( osc: OsobniCislo, paramId: String, critId: String, - page: (UserInfo, Parameter, ParameterCriteria) => Page + page: (UserInfo, Parameter, ParameterCriterion) => Page ) extends Action case class FetchAvailableFiles(osc: OsobniCislo) extends Action case class NavigateTo(page: Page) extends Action diff --git a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala index b647b67..35b3fbe 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/DetailKriteriaPageConnector.scala @@ -29,7 +29,7 @@ )((x, _, _) => x) val $pageChangeSignal = $paramChangeSignal.map( - FetchParameterCriteria(_, _, _, Page.DetailKriteria(_, _, _)) + FetchParameterCriterion(_, _, _, Page.DetailKriteria(_, _, _)) ) val $data = state.details.startWithNone @@ -66,7 +66,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): DetailKriteriaPage.ViewModel = DetailKriteriaPage.ViewModel( o.toDetailOsoby, diff --git a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala index 40ac894..579ab72 100644 --- a/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala +++ b/app/src/main/scala/mdr/pdb/app/connectors/conversions.scala @@ -38,9 +38,9 @@ a = container(param) ) -extension (crit: ParameterCriteria) +extension (crit: ParameterCriterion) def toKriterium( - container: ParameterCriteria => Anchor + container: ParameterCriterion => Anchor ): DetailKriteria.ViewModel = DetailKriteria.ViewModel( nazev = crit.criteriumText, diff --git a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala index d3d63cb..eff2276 100644 --- a/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala +++ b/app/src/main/scala/mdr/pdb/app/pages/detail/UpravDukaz.scala @@ -25,7 +25,7 @@ (page.osobniCislo.value, page.parametr.value, page.kriterium.value) def onChangeAction(key: PageKey): Action = - FetchParameterCriteria( + FetchParameterCriterion( key._1, key._2, key._3, @@ -69,7 +69,7 @@ private def buildModel( o: UserInfo, p: Parameter, - k: ParameterCriteria + k: ParameterCriterion ): PageComponent.ViewModel = import connectors.* PageComponent.ViewModel( diff --git a/app/src/main/scala/mdr/pdb/app/state/AppState.scala b/app/src/main/scala/mdr/pdb/app/state/AppState.scala index 4f95f5d..8ea0261 100644 --- a/app/src/main/scala/mdr/pdb/app/state/AppState.scala +++ b/app/src/main/scala/mdr/pdb/app/state/AppState.scala @@ -70,7 +70,7 @@ given JsonDecoder[UserContract] = DeriveJsonDecoder.gen given JsonDecoder[UserInfo] = DeriveJsonDecoder.gen - given JsonDecoder[ParameterCriteria] = DeriveJsonDecoder.gen + given JsonDecoder[ParameterCriterion] = DeriveJsonDecoder.gen given JsonDecoder[Parameter] = DeriveJsonDecoder.gen private val actions = EventBus[Action]() @@ -140,7 +140,7 @@ pushParameters(mockParameters) router.replaceState(Page.DetailParametru(o, p)) } - case FetchParameterCriteria(osc, paramId, critId, page) => + case FetchParameterCriterion(osc, paramId, critId, page) => Task.attempt { for o <- mockData.find(_.personalNumber == osc) diff --git a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala index 84782db..5f0f74c 100644 --- a/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala +++ b/domain/parameters/command/model/src/main/scala/mdr/pdb/parameters/command/commands.scala @@ -12,7 +12,7 @@ case class AutorizujDukaz( osoba: OsobniCislo, parametr: Parameter.Id, - kriterium: ParameterCriteria.Id, + kriterium: ParameterCriterion.Id, dukaz: List[DocumentRef], platiDo: Option[LocalDate] ) extends Command diff --git a/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala b/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala new file mode 100644 index 0000000..07eb9a6 --- /dev/null +++ b/domain/parameters/query/repo/src/main/scala/mdr/pdb/parameters/query/repo/ParametersRepository.scala @@ -0,0 +1,12 @@ +package mdr.pdb.parameters +package query +package repo + +import mdr.pdb.OsobniCislo + +import zio.* + +trait ParametersRepository: + def allParameters(): Task[List[Parameter]] + def parametersOfUser(user: OsobniCislo): Task[List[Parameter]] + def proofsOfUser(user: OsobniCislo): Task[List[Proof]] diff --git a/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala b/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala index 8bd8687..b849072 100644 --- a/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala +++ b/domain/parameters/shared/json/src/main/scala/mdr/pdb/parameters/json/Codecs.scala @@ -6,5 +6,5 @@ trait Codecs: - given JsonCodec[ParameterCriteria] = DeriveJsonCodec.gen + given JsonCodec[ParameterCriterion] = DeriveJsonCodec.gen given JsonCodec[Parameter] = DeriveJsonCodec.gen diff --git a/domain/parameters/shared/model/src/main/scala/mdr/pdb/parameters/Parameter.scala b/domain/parameters/shared/model/src/main/scala/mdr/pdb/parameters/Parameter.scala index be0234d..04cc1d7 100644 --- a/domain/parameters/shared/model/src/main/scala/mdr/pdb/parameters/Parameter.scala +++ b/domain/parameters/shared/model/src/main/scala/mdr/pdb/parameters/Parameter.scala @@ -4,15 +4,19 @@ import java.math.BigInteger import java.security.MessageDigest -object ParameterCriteria: +case class Proof( + criterionId: ParameterCriterion.Id +) + +object ParameterCriterion: type Id = String -case class ParameterCriteria( +case class ParameterCriterion( chapterId: String, itemId: String, criteriumText: String ): - val id: ParameterCriteria.Id = s"${chapterId}${itemId}" + val id: ParameterCriterion.Id = s"${chapterId}${itemId}" object Parameter: type Id = String @@ -21,5 +25,5 @@ id: Parameter.Id, name: String, description: String, - criteria: List[ParameterCriteria] + criteria: List[ParameterCriterion] )