Skip to content

Commit 1d8d03f

Browse files
westeiwestei
authored
Merge pull request #60 from redlink-gmbh/umm/399-goal-property-refinements
MORE-Platform#399 goal property refinements
2 parents f0123ba + 9e191ea commit 1d8d03f

7 files changed

Lines changed: 68 additions & 72 deletions

File tree

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,6 @@ public abstract class AbstractAmountOfGoalTemplateFactory<C extends GoalTemplate
3333

3434
protected static final String AMOUNT_OF_PROPERTY_PREFIX = GOAL_TEMPLATE_PROPERTY_PREFIX + "amountOfGoal.";
3535

36-
protected static final Value<Void> CONFIG_SECTION_CONFIGURATION = new ConfigSection("configuration")
37-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "section.configuration.name")
38-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "section.configuration.description");
39-
protected static final Value<Void> CONFIG_SECTION_GOAL_CONFIGURATION = new ConfigSection("goal-configuration")
40-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "section.goal.name")
41-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "section.goal.description");
42-
protected static final Value<Void> CONFIG_SECTION_STATUS = new ConfigSection("status-texts")
43-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "section.status-texts.name")
44-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "section.status-texts.description");
45-
protected static final Value<Void> CONFIG_SECTION_SELF_REPORT = new ConfigSection("self-report")
46-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "section.self-report.name")
47-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "section.self-report.description");
48-
4936
protected static final Value<Void> CONFIGS_GOAL_AMOUNT_GROUP = new ValueGroup("goal")
5037
.setName(AMOUNT_OF_PROPERTY_PREFIX + "goal.name")
5138
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "goal.description");

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,6 @@ public abstract class AbstractBooleanGoalTemplateFactory<C extends GoalTemplate<
3535

3636
protected static final String BOOLEAN_PROPERTY_PREFIX = GOAL_TEMPLATE_PROPERTY_PREFIX + "boolean.";
3737

38-
protected static final Value<Void> CONFIG_SECTION_CONFIGURATION = new ConfigSection("configuration")
39-
.setName(BOOLEAN_PROPERTY_PREFIX + "section.configuration.name")
40-
.setDescription(BOOLEAN_PROPERTY_PREFIX + "section.configuration.description");
41-
protected static final Value<Void> CONFIG_SECTION_GOAL_CONFIGURATION = new ConfigSection("goal-configuration")
42-
.setName(BOOLEAN_PROPERTY_PREFIX + "section.goal.name")
43-
.setDescription(BOOLEAN_PROPERTY_PREFIX + "section.goal.description");
44-
protected static final Value<Void> CONFIG_SECTION_STATUS = new ConfigSection("status-texts")
45-
.setName(BOOLEAN_PROPERTY_PREFIX + "section.status-texts.name")
46-
.setDescription(BOOLEAN_PROPERTY_PREFIX + "section.status-texts.description");
47-
protected static final Value<Void> CONFIG_SECTION_SELF_REPORT = new ConfigSection("self-report")
48-
.setName(BOOLEAN_PROPERTY_PREFIX + "section.self-report.name")
49-
.setDescription(BOOLEAN_PROPERTY_PREFIX + "section.self-report.description");
50-
5138
protected static final Value<Boolean> CONFIGS_GOAL_DESIRED = new BooleanValue("goal.desired")
5239
.setName(BOOLEAN_PROPERTY_PREFIX + "goal.desired.name")
5340
.setDescription(BOOLEAN_PROPERTY_PREFIX + "goal.desired.description")

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,14 @@ public List<Value> getProperties() {
4646
DAYS_OF_WEEK,
4747

4848
CONFIG_SECTION_STATUS,
49-
new StringTextValue("status-100-reached")
50-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-100-reached.name")
51-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-100-reached.description")
52-
.setDefaultValue("Du hast dein Tagesziel erfolgreich gemeistert. Weiter so!"),
53-
new StringTextValue("status-75-reached")
54-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-75-reached.name")
55-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-75-reached.description")
49+
STATUS_100_PERCENT_REACHED,
50+
STATUS_75_PERCENT_REACHED.copyOf()
5651
.setDefaultValue("Dein Ziel ist zum greifen nah. Ein bisschen und Du hast es geschafft!"),
57-
new StringTextValue("status-not-reached")
58-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-not-reached.name")
59-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-not-reached.description")
52+
STATUS_0_PERCENT_REACHED.copyOf()
6053
.setDefaultValue("Du bist auf dem richtigen Weg. Jede Schluck zählt für Dein wohlbefinden."),
6154

6255
CONFIG_SECTION_SELF_REPORT,
63-
new StringTextValue("self-report-question")
64-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "self-report-question.name")
65-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "self-report-question.description")
56+
SELF_REPORT_QUESTION.copyOf()
6657
.setDefaultValue("Wie viele Einheiten hast Du heute getrunken? Bitte trage den Wert ein.")
6758
);
6859
}

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,14 @@ public List<Value> getProperties() {
4545
DAYS_OF_WEEK,
4646

4747
CONFIG_SECTION_STATUS,
48-
new StringTextValue("status-100-reached")
49-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-100-reached.name")
50-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-100-reached.description")
51-
.setDefaultValue("Du hast dein Tagesziel erfolgreich gemeistert. Weiter so!"),
52-
new StringTextValue("status-75-reached")
53-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-75-reached.name")
54-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-75-reached.description")
48+
STATUS_100_PERCENT_REACHED,
49+
STATUS_75_PERCENT_REACHED.copyOf()
5550
.setDefaultValue("Dein Ziel ist zum greifen nah. Ein bisschen mehr und Du hast es geschafft!"),
56-
new StringTextValue("status-not-reached")
57-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-not-reached.name")
58-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-not-reached.description")
51+
STATUS_0_PERCENT_REACHED.copyOf()
5952
.setDefaultValue("Du bist auf den richtigen Weg. Jede Portion zählt für Dein wohlbefinden."),
6053

6154
CONFIG_SECTION_SELF_REPORT,
62-
new StringTextValue("self-report-question")
63-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "self-report-question.name")
64-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "self-report-question.description")
55+
SELF_REPORT_QUESTION.copyOf()
6556
.setDefaultValue("Wie viele Portionen hast Du heute gegessen? Bitte trage den Wert ein.")
6657
);
6758
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,8 @@ public List<Value> getProperties() {
4242
.setDefaultValue(true)
4343
.setImmutable(true),
4444

45-
CONFIG_SECTION_GOAL_CONFIGURATION,
46-
CONFIGS_GOAL_QUESTION.copyOf()
47-
.setDefaultValue("Medikament eingenommen?"),
48-
4945
CONFIG_SECTION_SELF_REPORT,
50-
new StringTextValue("self-report-question")
51-
.setName(BOOLEAN_PROPERTY_PREFIX + "self-report-question.name")
52-
.setDescription(BOOLEAN_PROPERTY_PREFIX + "self-report-question.description")
53-
.setRequired(false)
46+
SELF_REPORT_QUESTION.copyOf()
5447
.setDefaultValue("Hast du das Medikament eingenommen?")
5548
);
5649
}

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,15 @@ public List<Value> getProperties() {
5050
DAYS_OF_WEEK,
5151

5252
CONFIG_SECTION_STATUS,
53-
new StringTextValue("status-day-not-consumed")
54-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-day-not-consumed.name")
55-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-day-not-consumed.description")
53+
STATUS_NOT_CONSUMED.copyOf()
5654
.setDefaultValue("Starker Tag! Du hast heute nichts konsumiert."),
57-
new StringTextValue("status-day-under-limit")
58-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-day-under-limit.name")
59-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-day-under-limit.description")
55+
STATUS_UNDER_LIMIT.copyOf()
6056
.setDefaultValue("Du gemacht. Du bist im Ziel geblieben und hast die Kontrolle behalten. Weiter so!"),
61-
new StringTextValue("status-day-over-limit")
62-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "status-day-over-limit.name")
63-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "status-day-over-limit.description")
57+
STATUS_OVER_LIMIT.copyOf()
6458
.setDefaultValue("Du hast heute mehr konsumiert als ausgemacht. Bleib dran. Morgen geht es wieder besser."),
6559

6660
CONFIG_SECTION_SELF_REPORT,
67-
new StringTextValue("self-report-question")
68-
.setName(AMOUNT_OF_PROPERTY_PREFIX + "self-report-question.name")
69-
.setDescription(AMOUNT_OF_PROPERTY_PREFIX + "self-report-question.description")
61+
SELF_REPORT_QUESTION.copyOf()
7062
.setDefaultValue("Wie viele Einheiten hast Du heute <goal.activity>? Bitte trage den Wert ein.")
7163
);
7264
}

‎studymanager-goaltemplates/src/main/java/io/redlink/more/studymanager/core/factory/GoalTemplateFactory.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.redlink.more.studymanager.core.measurement.MeasurementSet;
1515
import io.redlink.more.studymanager.core.properties.GoalTemplateProperties;
1616
import io.redlink.more.studymanager.core.properties.model.BooleanValue;
17+
import io.redlink.more.studymanager.core.properties.model.ConfigSection;
1718
import io.redlink.more.studymanager.core.properties.model.IntegerRange;
1819
import io.redlink.more.studymanager.core.properties.model.IntegerRangeValue;
1920
import io.redlink.more.studymanager.core.properties.model.StringTextValue;
@@ -162,4 +163,58 @@ public final String getDescription() {
162163
.setDescription(GLOBAL_PROPERTY_PREFIX + "customShowAsTodoItemState.description")
163164
.setDefaultValue(false);
164165

166+
/*
167+
* Config Sections for Goals
168+
*/
169+
protected static final Value<Void> CONFIG_SECTION_CONFIGURATION = new ConfigSection("configuration")
170+
.setName(GLOBAL_PROPERTY_PREFIX + "section.configuration.name")
171+
.setDescription(GLOBAL_PROPERTY_PREFIX + "section.configuration.description");
172+
protected static final Value<Void> CONFIG_SECTION_GOAL_CONFIGURATION = new ConfigSection("goal-configuration")
173+
.setName(GLOBAL_PROPERTY_PREFIX + "section.goal.name")
174+
.setDescription(GLOBAL_PROPERTY_PREFIX + "section.goal.description");
175+
protected static final Value<Void> CONFIG_SECTION_STATUS = new ConfigSection("status-texts")
176+
.setName(GLOBAL_PROPERTY_PREFIX + "section.status-texts.name")
177+
.setDescription(GLOBAL_PROPERTY_PREFIX + "section.status-texts.description");
178+
protected static final Value<Void> CONFIG_SECTION_SELF_REPORT = new ConfigSection("self-report")
179+
.setName(GLOBAL_PROPERTY_PREFIX + "section.self-report.name")
180+
.setDescription(GLOBAL_PROPERTY_PREFIX + "section.self-report.description");
181+
182+
/*
183+
* Goal status properties
184+
*/
185+
protected static final Value<String> STATUS_100_PERCENT_REACHED = new StringTextValue("status-100-reached")
186+
.setName(GLOBAL_PROPERTY_PREFIX + "status-100-reached.name")
187+
.setDescription(GLOBAL_PROPERTY_PREFIX + "status-100-reached.description")
188+
.setDefaultValue("Du hast dein Tagesziel erfolgreich gemeistert. Weiter so!");
189+
protected static final Value<String> STATUS_75_PERCENT_REACHED = new StringTextValue("status-75-reached")
190+
.setName(GLOBAL_PROPERTY_PREFIX + "status-75-reached.name")
191+
.setDescription(GLOBAL_PROPERTY_PREFIX + "status-75-reached.description")
192+
.setDefaultValue("Dein Ziel ist zum greifen nah. Du hast es fast geschafft!");
193+
protected static final Value<String> STATUS_0_PERCENT_REACHED = new StringTextValue("status-not-reached")
194+
.setName(GLOBAL_PROPERTY_PREFIX + "status-not-reached.name")
195+
.setDescription(GLOBAL_PROPERTY_PREFIX + "status-not-reached.description")
196+
.setDefaultValue("Du bist auf den richtigen Weg. Behalte Dein Tagesziel im Auge.");
197+
198+
protected static final Value<String> STATUS_NOT_CONSUMED = new StringTextValue("status-day-not-consumed")
199+
.setName(GLOBAL_PROPERTY_PREFIX + "status-day-not-consumed.name")
200+
.setDescription(GLOBAL_PROPERTY_PREFIX + "status-day-not-consumed.description")
201+
.setDefaultValue("Starker Tag! Du hast heute nichts konsumiert.");
202+
protected static final Value<String> STATUS_UNDER_LIMIT = new StringTextValue("status-day-under-limit")
203+
.setName(GLOBAL_PROPERTY_PREFIX + "status-day-under-limit.name")
204+
.setDescription(GLOBAL_PROPERTY_PREFIX + "status-day-under-limit.description")
205+
.setDefaultValue("Du gemacht. Du bist im Ziel geblieben und hast die Kontrolle behalten. Weiter so!");
206+
protected static final Value<String> STATUS_OVER_LIMIT = new StringTextValue("status-day-over-limit")
207+
.setName(GLOBAL_PROPERTY_PREFIX + "status-day-over-limit.name")
208+
.setDescription(GLOBAL_PROPERTY_PREFIX + "status-day-over-limit.description")
209+
.setDefaultValue("Du hast heute mehr konsumiert als ausgemacht. Bleib dran. Morgen geht es wieder besser.");
210+
211+
/*
212+
* Self Report Properties
213+
*/
214+
215+
protected static final Value<String> SELF_REPORT_QUESTION = new StringTextValue("self-report-question")
216+
.setName(GLOBAL_PROPERTY_PREFIX + "self-report-question.name")
217+
.setDescription(GLOBAL_PROPERTY_PREFIX + "self-report-question.description");
218+
219+
165220
}

0 commit comments

Comments
 (0)