diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue index e91609d077..dad9c0e1b4 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue @@ -105,13 +105,7 @@ option-value="value" placeholder="Select a trigger" /> - + crosses the threshold { return 'static'; }); -const comparisonOperations = [ - { label: 'increases to above', value: true }, - { label: 'decreases to below', value: false } -]; - const onUpdateName = (name: string) => { const intervention = cloneDeep(props.intervention); intervention.name = name; @@ -243,8 +232,7 @@ const onInterventionTypeChange = (value: string) => { { threshold: Number.NaN, value: Number.NaN, - parameter: '', - isGreaterThan: true + parameter: '' } ]; } @@ -258,12 +246,6 @@ const onTargetParameterChange = (event: DropdownChangeEvent) => { emit('update', intervention); }; -const onComparisonOperatorChange = (event: DropdownChangeEvent) => { - const intervention = cloneDeep(props.intervention); - intervention.dynamicInterventions[0].isGreaterThan = event.value; - emit('update', intervention); -}; - const onSemanticChange = (event: DropdownChangeEvent) => { const intervention = cloneDeep(props.intervention); intervention.type = event.value; diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue index c646a4ea1c..ce374c76a3 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue @@ -120,9 +120,7 @@ Set {{ intervention.type }} {{ appliedTo }} to {{ intervention.dynamicInterventions[0].value }} when the {{ intervention.dynamicInterventions[0].parameter }} - {{ - intervention.dynamicInterventions[0].isGreaterThan ? 'increases to above' : 'decreases to below' - }} + when it crosses the threshold value {{ intervention.dynamicInterventions[0].threshold }}.

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue index 6752a361e5..ba90aaff33 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue @@ -9,9 +9,8 @@

Set the {{ config.intervention?.type }}  {{ config.intervention?.appliedTo }} to - {{ dynamicInterventions[0].threshold }} days when it - {{ dynamicInterventions[0].isGreaterThan ? 'increase to above' : 'decrease to below' }} - the threshold value {{ dynamicInterventions[0].value }} person. + {{ dynamicInterventions[0].threshold }} days when it crosses the threshold value + {{ dynamicInterventions[0].value }} person.

diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue index d3d97bbcbb..519d8e4396 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue @@ -10,9 +10,8 @@
  • Set the {{ intervention?.type }}  {{ intervention?.appliedTo }} to - {{ dynamicIntervention.threshold }} days when it - {{ dynamicIntervention.isGreaterThan ? 'increase to above' : 'decrease to below' }} - the threshold value {{ dynamicIntervention.value }} person. + {{ dynamicIntervention.threshold }} days when it crosses the threshold value + {{ dynamicIntervention.value }} person.
  • diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts index 06fc780c92..a7fc5a280a 100644 --- a/packages/client/hmi-client/src/types/Types.ts +++ b/packages/client/hmi-client/src/types/Types.ts @@ -593,7 +593,6 @@ export interface DynamicIntervention { parameter: string; threshold: number; value: number; - isGreaterThan: boolean; } export interface Intervention { diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java index b9a191b817..98ef3eb6fa 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java @@ -10,7 +10,6 @@ public class DynamicIntervention { private String parameter; private Number threshold; private Number value; - private Boolean isGreaterThan; @Override public DynamicIntervention clone() { @@ -18,7 +17,6 @@ public DynamicIntervention clone() { clone.parameter = this.parameter; clone.threshold = this.threshold; clone.value = this.value; - clone.isGreaterThan = this.isGreaterThan; return clone; } }