Flora and Fauna updated dataset filter

AtlasOfLivingAustralia · Nov 30, 2023 · a5d24bb · a5d24bb
1 parent 8863809
commit a5d24bb
Showing 1 changed file with 50 additions and 16 deletions.
diff --git a/forms/nht/nhtOutputReport.json b/forms/nht/nhtOutputReport.json
@@ -9035,10 +9035,26 @@
                           "context-path": "owner.custom.dataSets"
                         },
                         "filter": {
-                          "expression": "serviceId == 13 and progress == 'finished' and type == 'Baseline dataset associated with a project outcome'"
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 13 and dataSet.progress == 'finished' and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
                         }
                       }
-                    }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "source": {
+                            "context-path": "owner.custom.dataSets"
+                          },
+                          "find": {
+                            "namespace": "dataSet",
+                            "expression": "dataSet.dataSetId == dataSetId"
+                          },
+                          "target": "$data"
+                        }
+                      }
+                    ]
                   },
                   {
                     "columns": [
@@ -9089,6 +9105,9 @@
                     "name": "investmentPriorities2",
                     "dataType": "stringList",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
                     "constraints": {
                       "type": "pre-populated",
                       "config": {
@@ -9471,8 +9490,6 @@
           {
             "dataType": "number",
             "name": "totalSurveyBaselineInvoiced",
-            "validate": "required,min[0]",
-            "defaultValue": 1,
             "validate": [
               {
                 "param": {
@@ -9481,7 +9498,8 @@
                 },
                 "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": 1
           },
           {
             "dataType": "number",
@@ -9495,8 +9513,6 @@
           {
             "dataType": "number",
             "name": "totalSurveyIndicatorInvoiced",
-            "validate": "required,min[0]",
-            "defaultValue": 1,
             "validate": [
               {
                 "param": {
@@ -9505,7 +9521,8 @@
                 },
                 "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": 1
           },
           {
             "dataType": "text",
@@ -10991,10 +11008,26 @@
                           "context-path": "owner.custom.dataSets"
                         },
                         "filter": {
-                          "expression": "serviceId == 15 and progress == 'finished'"
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 15 and dataSet.progress == 'finished' and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
                         }
                       }
-                    }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "source": {
+                            "context-path": "owner.custom.dataSets"
+                          },
+                          "find": {
+                            "namespace": "dataSet",
+                            "expression": "dataSet.dataSetId == dataSetId"
+                          },
+                          "target": "$data"
+                        }
+                      }
+                    ]
                   },
                   {
                     "columns": [
@@ -11050,6 +11083,9 @@
                     "name": "investmentPriorities2",
                     "dataType": "stringList",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
                     "constraints": {
                       "type": "pre-populated",
                       "config": {
@@ -11432,8 +11468,6 @@
           {
             "dataType": "number",
             "name": "totalSurveyBaselineInvoiced",
-            "validate": "required,min[0]",
-            "defaultValue": 1,
             "validate": [
               {
                 "param": {
@@ -11442,7 +11476,8 @@
                 },
                 "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": 1
           },
           {
             "dataType": "number",
@@ -11456,8 +11491,6 @@
           {
             "dataType": "number",
             "name": "totalSurveyIndicatorInvoiced",
-            "validate": "required,min[0]",
-            "defaultValue": 1,
             "validate": [
               {
                 "param": {
@@ -11466,7 +11499,8 @@
                 },
                 "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": 1
           },
           {
             "dataType": "text",