Merge pull request #59 from redlink-gmbh/umm/399-medication_boolean-goal-template

MORE-Platform#399 medication and boolean goal template

Author: westei

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/BooleanValue.java

@@ -22,4 +22,9 @@ public Class<Boolean> getValueType() {
     public String getType() {
         return "BOOLEAN";
     }
+
+    @Override
+    public Value<Boolean> clone() {
+        return copyState(new BooleanValue(getId()));
+    }
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/ChoiceValue.java

@@ -8,15 +8,25 @@
  */
 package io.redlink.more.studymanager.core.properties.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ChoiceValue extends Value<String> {
-    private List<String> options;
+    private List<String> options =  new ArrayList<>();
 
     public ChoiceValue(String id) {
         super(id);
     }
 
+    public List<String> getOptions() {
+        return options;
+    }
+
+    public ChoiceValue setOptions(List<String> options) {
+        this.options = options == null ? new ArrayList<>() : options;
+        return this;
+    }
+
     @Override
     public String getType() {
         return "CHOICE";
@@ -26,4 +36,10 @@ public String getType() {
     public Class<String> getValueType() {
         return String.class;
     }
+
+    @Override
+    public Value<String> clone() {
+        return copyState(new ChoiceValue(getId())
+                .setOptions(getOptions()));
+    }
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/ConfigSection.java

@@ -52,4 +52,11 @@ public final Void getDefaultValue() {
     public final boolean isRequired() {
         return false;
     }
+
+    @Override
+    public Value<Void> clone() {
+        return copyState(new ConfigSection(getId()));
+    }
+
+
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/IntegerRangeValue.java

@@ -60,4 +60,10 @@ public IntegerRangeValue setMax(int max) {
         return this;
     }
 
+    @Override
+    public Value<IntegerRange> clone() {
+        return copyState(new IntegerRangeValue(getId())
+                .setMax(getMax())
+                .setMin(getMin()));
+    }
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/IntegerValue.java

@@ -54,4 +54,12 @@ public IntegerValue setMax(int max) {
         this.max = max;
         return this;
     }
+
+    @Override
+    public Value<Integer> clone() {
+        return copyState(new IntegerValue(getId())
+                .setMax(getMax())
+                .setMin(getMin()));
+    }
+
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/NamedIntegerRangeValue.java

@@ -61,4 +61,11 @@ public NamedIntegerRangeValue setMax(int max) {
         return this;
     }
 
+    @Override
+    public Value<NamedIntegerRange> clone() {
+        return copyState(new NamedIntegerRangeValue(getId())
+                .setMax(getMax())
+                .setMin(getMin()));
+    }
+
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/ObjectValue.java

@@ -22,4 +22,10 @@ public Class<Object> getValueType() {
     public String getType() {
         return "OBJECT";
     }
+
+    @Override
+    public Value<Object> clone() {
+        return copyState(new ObjectValue(getId()));
+    }
+
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/StringListValue.java

@@ -46,4 +46,11 @@ public StringListValue setMaxSize(int maxSize) {
         this.maxSize = maxSize;
         return this;
     }
+
+    @Override
+    public Value<List> clone() {
+        return copyState(new StringListValue(getId())
+                .setMinSize(getMinSize())
+                .setMaxSize(getMaxSize()));
+    }
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/StringTemplateValue.java

@@ -3,6 +3,7 @@
 import io.redlink.more.studymanager.core.validation.ValidationIssue;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -26,6 +27,10 @@ public StringTemplateValue(String id, Set<String> allowList) {
         this.allowList = allowList;
     }
 
+    public Set<String> getAllowList() {
+        return allowList;
+    }
+
     @Override
     public String getType() {
         return "STRINGTEMPLATE";
@@ -54,4 +59,9 @@ protected ValidationIssue doValidate(String value) {
         return super.doValidate(value);
     }
 
+    @Override
+    public Value<String> clone() {
+        return copyState(new StringTemplateValue(getId(),getAllowList()));
+    }
+
 }

studymanager-core/src/main/java/io/redlink/more/studymanager/core/properties/model/StringTextValue.java

@@ -22,4 +22,10 @@ public String getType() {
     public Class<String> getValueType() {
         return String.class;
     }
+
+    @Override
+    public Value<String> clone() {
+        return copyState(new StringTextValue(getId()));
+    }
+
 }