Added try catch for resolving additionalFields

Updated config for registration_flows.dart

Author: naveenr-egov

apps/health_campaign_field_worker_app/lib/sampleJsonConfigs/registration_flows.dart

@@ -3207,25 +3207,41 @@ final dynamic sampleFlows = {
             "fallback": 1,
             "condition": {
               "if": {
-                "left": {"value": "{{dose}}", "operation": "increment"},
-                "right": "{{deliveryLength}}",
-                "operator": "lte"
+                "left": "{{cycle}}",
+                "right": "{{currentRunningCycle}}",
+                "operator": "equals"
               },
-              "else": 1,
-              "then": {"value": "{{dose}}", "operation": "increment"}
+              "then": {
+                "if": {
+                  "left": {"value": "{{dose}}", "operation": "increment"},
+                  "right": "{{deliveryLength}}",
+                  "operator": "lte"
+                },
+                "then": {"value": "{{dose}}", "operation": "increment"},
+                "else": 1
+              },
+              "else": 1
             }
           },
           "nextCycleId": {
             "order": 5,
-            "fallback": "{{cycle}}",
+            "fallback": "{{currentRunningCycle}}",
             "condition": {
               "if": {
-                "left": {"value": "{{dose}}", "operation": "increment"},
-                "right": "{{deliveryLength}}",
-                "operator": "lte"
+                "left": "{{cycle}}",
+                "right": "{{currentRunningCycle}}",
+                "operator": "equals"
+              },
+              "then": {
+                "if": {
+                  "left": {"value": "{{dose}}", "operation": "increment"},
+                  "right": "{{deliveryLength}}",
+                  "operator": "lte"
+                },
+                "then": "{{cycle}}",
+                "else": {"value": "{{cycle}}", "operation": "increment"}
               },
-              "else": {"value": "{{cycle}}", "operation": "increment"},
-              "then": "{{cycle}}"
+              "else": "{{currentRunningCycle}}"
             }
           },
           "deliveryLength": {
@@ -3261,6 +3277,19 @@ final dynamic sampleFlows = {
             "select": "{{id}}",
             "default": -1,
             "takeFirst": true
+          },
+          "effectiveDose": {
+            "order": 6,
+            "fallback": 0,
+            "condition": {
+              "if": {
+                "left": "{{nextCycleId}}",
+                "right": "{{cycle}}",
+                "operator": "equals"
+              },
+              "then": "{{dose}}",
+              "else": 0
+            }
           }
         },
         "relations": [
@@ -3368,7 +3397,7 @@ final dynamic sampleFlows = {
           },
           "futureDeliveries": {
             "from": "{{targetCycle.0.deliveries}}",
-            "skip": {"from": "{{dose}}"},
+            "skip": {"from": "{{effectiveDose}}"},
             "order": 3,
             "where": {
               "left": "{{item.deliveryStrategy}}",
@@ -3605,7 +3634,7 @@ final dynamic sampleFlows = {
               {
                 "key": "deliveryStrategy",
                 "value": "{{navigation.deliveryStrategy}}"
-              },
+              }
             ],
             "onError": [
               {
@@ -3619,7 +3648,7 @@ final dynamic sampleFlows = {
         {
           "actionType": "CREATE_EVENT",
           "properties": {
-            "entity": "HOUSEHOLD, INDIVIDUAL, PROJECTBENEFICIARY, MEMBER",
+            "entity": "TASK",
             "onError": [
               {
                 "actionType": "SHOW_TOAST",
@@ -3670,7 +3699,7 @@ final dynamic sampleFlows = {
               }
             }
           ],
-          "condition": {"expression": "doseIndex == '1'"}
+          "condition": {"expression": "doseIndex == 1"}
         },
         {
           "actionType": "NAVIGATION",
@@ -3692,7 +3721,9 @@ final dynamic sampleFlows = {
                 "actionType": "SHOW_TOAST",
                 "properties": {"message": "Navigation failed."}
               }
-            ]
+            ],
+            "navigationMode": "popUntilAndPush",
+            "popUntilPageName": "householdOverview"
           }
         }
       ],

packages/digit_flow_builder/lib/blocs/state_wrapper_builder.dart

@@ -166,24 +166,22 @@ class WrapperBuilder {
           }
         }
 
-
-        try{
+        try {
           // 3. Computed fields
           final computed = _applyComputed(wrapperData, config);
           wrapperData.addAll(computed);
-        } catch(e){
+        } catch (e) {
           print(e.toString());
         }
 
-        try{
+        try {
           // 4. Computed list fields
           final computedList = _applyComputedList(wrapperData, config);
           wrapperData.addAll(computedList);
-        } catch(e){
+        } catch (e) {
           print(e.toString());
         }
 
-
         wrappers.add(wrapperData);
       }
     } catch (e, st) {
@@ -273,7 +271,8 @@ class WrapperBuilder {
 
         // Handle equalsFrom with template resolution
         if (equalsFrom != null) {
-          final resolvedEquals = _resolveValue(equalsFrom, root, resolveContext);
+          final resolvedEquals =
+              _resolveValue(equalsFrom, root, resolveContext);
           if (resolvedEquals != null && value != resolvedEquals) return false;
         } else if (equals != null && value != equals) return false;
       } else {
@@ -625,22 +624,27 @@ class WrapperBuilder {
 
             final List<dynamic> next = [];
             for (final item in current) {
-              dynamic val;
-              if (item is Map) {
-                val = item[part];
-              } else if (item is EntityModel)
-                val = EnhancedEntityFieldAccessor.getFieldValue(item, part);
-              else if (item is AdditionalField) if ((part == 'key')) {
-                val = item.key;
-              } else {
-                val = (part == 'value') ? item.value : null;
-              }
-              if (val != null) {
-                if (val is Iterable && val is! String) {
-                  next.addAll(val.where((e) => e != null));
+              try {
+                dynamic val;
+                if (item is Map) {
+                  val = item[part];
+                } else if (item is EntityModel)
+                  val = EnhancedEntityFieldAccessor.getFieldValue(item, part);
+                else if (item is AdditionalField) if ((part == 'key')) {
+                  val = item.key;
                 } else {
-                  next.add(val);
+                  val = (part == 'value') ? item.value : null;
+                }
+                if (val != null) {
+                  if (val is Iterable && val is! String) {
+                    next.addAll(val.where((e) => e != null));
+                  } else {
+                    next.add(val);
+                  }
                 }
+              } catch (_) {
+                // Skip items where field access fails (e.g., tasks without additionalFields)
+                continue;
               }
             }
             if (next.isEmpty) return null;