#6 - remove default value, show calendar navigators, and buttonbar

cristal-ise · May 11, 2018 · d080c82 · d080c82
1 parent db63189
commit d080c82
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/org/cristalise/kernel/persistency/outcomebuilder/field/DateField.java b/src/main/java/org/cristalise/kernel/persistency/outcomebuilder/field/DateField.java
@@ -57,7 +57,7 @@ public JSONObject generateNgDynamicForms(Map<String, Object> inputs) {
         date.put("format", primeNGDateFormat);
 
         JSONObject additional = getAdditionalConfigNgDynamicForms(date);
-        additional.put("yearRange", "1990:2030");
+        additional.put("yearRange", "1990:2050");
         additional.put("yearNavigator", true);
         additional.put("monthNavigator", true);
         additional.put("showButtonBar", true);

diff --git a/src/main/java/org/cristalise/kernel/persistency/outcomebuilder/field/DateTimeField.java b/src/main/java/org/cristalise/kernel/persistency/outcomebuilder/field/DateTimeField.java
@@ -50,6 +50,7 @@ public JSONObject generateNgDynamicForms(Map<String, Object> inputs) {
         date.put("showTime", true);
 
         JSONObject additional = getAdditionalConfigNgDynamicForms(date);
+        additional.put("yearRange", "1990:2050");
         additional.put("yearNavigator", true);
         additional.put("monthNavigator", true);
         additional.put("showButtonBar", true);

diff --git a/src/test/data/outcomeBuilder/PatientDetailsNGForms.json b/src/test/data/outcomeBuilder/PatientDetailsNGForms.json
@@ -39,7 +39,12 @@
       "required": false
     },
     {
-      "additional": {"utc": false},
+      "additional": {
+        "showButtonBar": true,
+        "yearRange": "1990:2050",
+        "yearNavigator": true,
+        "monthNavigator": true
+      },
       "format": "yy-mm-dd",
       "cls": {
         "grid": {