Support readonly/computed for dates #207

AtlasOfLivingAustralia · Aug 21, 2023 · a183be4 · a183be4
1 parent 346bf02
commit a183be4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 13 deletions.
diff --git a/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy b/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy
@@ -130,7 +130,13 @@ class ModelJSTagLib {
      */
     void renderDataModelItem(JSModelRenderContext ctx) {
         Map mod = ctx.dataModel
-        if (mod.computed) {
+        if (mod.dataType == 'date') {
+            dateViewModel(ctx)
+        }
+        else if (mod.dataType == 'time') {
+            timeViewModel(ctx)
+        }
+        else if (mod.computed) {
             computedModel(ctx)
         }
         else if (mod.dataType == 'text') {
@@ -151,12 +157,6 @@ class ModelJSTagLib {
         else if (mod.dataType == 'species') {
             speciesModel(ctx)
         }
-        else if (mod.dataType == 'date') {
-            dateViewModel(ctx)
-        }
-        else if (mod.dataType == 'time') {
-            timeViewModel(ctx)
-        }
         else if (mod.dataType == 'document') {
             documentViewModel(ctx)
         }
@@ -624,7 +624,14 @@ class ModelJSTagLib {
     }
 
     def dateViewModel(JSModelRenderContext ctx) {
-        observable(ctx, ["{simpleDate: false}"])
+        List extenders =  ["{simpleDate: {includeTime:false}}"]
+        if (ctx.dataModel.computed) {
+            extenders = ["{simpleDate: {includeTime:false, readOnly:true}}"]
+            computedModel(ctx, extenders)
+        }
+        else {
+            observable(ctx, extenders)
+        }
     }
 
     def booleanViewModel(JSModelRenderContext ctx) {
@@ -670,7 +677,7 @@ class ModelJSTagLib {
         observable(ctx, ["{feature:config}"])
     }
 
-    def computedModel(JSModelRenderContext ctx) {
+    def computedModel(JSModelRenderContext ctx, List extenders = []) {
 
         // TODO computed values within tables are rendered differently to values outside tables for historical reasons
         // This should be tidied up.
@@ -681,10 +688,11 @@ class ModelJSTagLib {
             computedValueRenderer.computedViewModel(ctx.out, ctx.attrs, ctx.dataModel, ctx.propertyPath, ctx.propertyPath)
         }
 
-        if (requiresMetadataExtender(ctx.dataModel)) {
-            ctx.out << INDENT*3 << "${ctx.propertyPath}.${ctx.dataModel.name} = ${ctx.propertyPath}.${ctx.dataModel.name}${extenderJS(ctx, [])};\n"
+        if (extenders || requiresMetadataExtender(ctx.dataModel)) {
+            ctx.out << INDENT*3 << "${ctx.propertyPath}.${ctx.dataModel.name} = ${ctx.propertyPath}.${ctx.dataModel.name}${extenderJS(ctx, extenders)};\n"
         }
 
+
     }
 
     def audioModel(JSModelRenderContext ctx) {

diff --git a/grails-app/views/output/_dateDataTypeEditModelTemplate.gsp b/grails-app/views/output/_dateDataTypeEditModelTemplate.gsp
@@ -1,5 +1,5 @@
 <div id="${context.source}Date" class="input-group">
-    <input class="form-control form-control-sm inputDatePicker" data-bind="${context.databindAttrs}" type="text" size="12" ${context.validationAttr}/>
+    <input class="form-control form-control-sm inputDatePicker" ${context.attributes} data-bind="${context.databindAttrs}" type="text" size="12" ${context.validationAttr}/>
     <div class="input-group-append">
         <span class="add-on input-group-text open-datepicker"><i class="fa fa-th"></i></span>
     </div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/main/groovy/au/org/ala/ecodata/forms/ComputedValueRenderer.groovy b/src/main/groovy/au/org/ala/ecodata/forms/ComputedValueRenderer.groovy
@@ -17,7 +17,17 @@ class ComputedValueRenderer {
         String expression = computed.expression
         int decimalPlaces = getNumberOfDecimalPlaces(model, computed)
 
-        out << "return ecodata.forms.expressionEvaluator.evaluate('${expression}', ${dependantContext}, ${decimalPlaces});\n";
+        String expressionType
+        switch (model.dataType) {
+            case 'text':
+            case 'date':
+                expressionType = 'evaluateString'
+                break
+            default:
+                expressionType = "evaluate"
+        }
+
+        out << "return ecodata.forms.expressionEvaluator.${expressionType}('${expression}', ${dependantContext}, ${decimalPlaces});\n";
     }
 
     private int getNumberOfDecimalPlaces(Map model, Map computed) {