Skip to content

Commit d771401

Browse files
westeiwestei
authored
Merge pull request #61 from redlink-gmbh/umm/399-goal-property-refinements-2
MORE-Platform#399 goal property refinements 2
2 parents 1d8d03f + c39414c commit d771401

8 files changed

Lines changed: 1 addition & 24 deletions

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/AbstractAmountOfGoalTemplateFactory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import io.redlink.more.studymanager.core.measurement.Measurement;
66
import io.redlink.more.studymanager.core.measurement.MeasurementSet;
77
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
8-
import io.redlink.more.studymanager.core.properties.model.ConfigSection;
98
import io.redlink.more.studymanager.core.properties.model.IntegerRange;
109
import io.redlink.more.studymanager.core.properties.model.IntegerRangeValue;
1110
import io.redlink.more.studymanager.core.properties.model.StringValue;

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/AbstractBooleanGoalTemplateFactory.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66
import io.redlink.more.studymanager.core.measurement.MeasurementSet;
77
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
88
import io.redlink.more.studymanager.core.properties.model.BooleanValue;
9-
import io.redlink.more.studymanager.core.properties.model.ConfigSection;
10-
import io.redlink.more.studymanager.core.properties.model.IntegerRange;
11-
import io.redlink.more.studymanager.core.properties.model.IntegerRangeValue;
129
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
13-
import io.redlink.more.studymanager.core.properties.model.StringValue;
1410
import io.redlink.more.studymanager.core.properties.model.Value;
15-
import io.redlink.more.studymanager.core.properties.model.ValueGroup;
1611

1712
import java.util.Objects;
1813
import java.util.Set;

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/AmoutOfGoalTemplate.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package io.redlink.more.studymanager.component.goaltemplate;
22

33
import io.redlink.more.studymanager.core.component.GoalTemplate;
4-
import io.redlink.more.studymanager.core.component.Observation;
54
import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
6-
import io.redlink.more.studymanager.core.factory.GoalTemplateFactory;
75
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
8-
import io.redlink.more.studymanager.core.properties.ObservationProperties;
96
import io.redlink.more.studymanager.core.sdk.MoreGoalTemplateSDK;
107

118
public class AmoutOfGoalTemplate<C extends GoalTemplateProperties> extends GoalTemplate<C> {

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/BooleanGoalTemplateFactory.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package io.redlink.more.studymanager.component.goaltemplate;
22

33
import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
4-
import io.redlink.more.studymanager.core.factory.GoalTemplateFactory;
54
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
6-
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
75
import io.redlink.more.studymanager.core.properties.model.Value;
86
import io.redlink.more.studymanager.core.sdk.MoreGoalTemplateSDK;
97

108
import java.util.List;
11-
import java.util.Set;
129

1310

1411
public class BooleanGoalTemplateFactory extends AbstractBooleanGoalTemplateFactory<BooleanGoalTemplate<GoalTemplateProperties>, GoalTemplateProperties> {
@@ -35,10 +32,7 @@ public List<Value> getProperties() {
3532
SHOW_AS_TODO_ITEM_STATE,
3633

3734
CONFIG_SECTION_SELF_REPORT,
38-
new StringTextValue("self-report-question")
39-
.setName(BOOLEAN_PROPERTY_PREFIX + "self-report-question.name")
40-
.setDescription(BOOLEAN_PROPERTY_PREFIX + "self-report-question.description")
41-
.setRequired(false)
35+
SELF_REPORT_QUESTION.copyOf()
4236
.setDefaultValue("Hast du Heute dein Ziel erreicht?")
4337
);
4438
}

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/DrinkAmountOfGoalTemplateFactory.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.redlink.more.studymanager.component.goaltemplate;
22

33
import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
4-
import io.redlink.more.studymanager.core.factory.GoalTemplateFactory;
54
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
65
import io.redlink.more.studymanager.core.properties.model.StringTemplateValue;
7-
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
86
import io.redlink.more.studymanager.core.properties.model.Value;
97
import io.redlink.more.studymanager.core.sdk.MoreGoalTemplateSDK;
108

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/EatAmountOfGoalTemplateFactory.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.redlink.more.studymanager.component.goaltemplate;
22

33
import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
4-
import io.redlink.more.studymanager.core.factory.GoalTemplateFactory;
54
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
65
import io.redlink.more.studymanager.core.properties.model.StringTemplateValue;
7-
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
86
import io.redlink.more.studymanager.core.properties.model.Value;
97
import io.redlink.more.studymanager.core.sdk.MoreGoalTemplateSDK;
108

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/MedicationGoalTemplateFactory.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.redlink.more.studymanager.component.goaltemplate;
22

33
import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
4-
import io.redlink.more.studymanager.core.factory.GoalTemplateFactory;
54
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
6-
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
75
import io.redlink.more.studymanager.core.properties.model.Value;
86
import io.redlink.more.studymanager.core.sdk.MoreGoalTemplateSDK;
97

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/component/goaltemplate/ReduceAmountOfGoalTemplateFactory.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.redlink.more.studymanager.component.goaltemplate;
22

33
import io.redlink.more.studymanager.core.exception.ConfigurationValidationException;
4-
import io.redlink.more.studymanager.core.factory.GoalTemplateFactory;
54
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
65
import io.redlink.more.studymanager.core.properties.model.StringTemplateValue;
7-
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
86
import io.redlink.more.studymanager.core.properties.model.StringValue;
97
import io.redlink.more.studymanager.core.properties.model.Value;
108
import io.redlink.more.studymanager.core.sdk.MoreGoalTemplateSDK;

0 commit comments

Comments
 (0)