Worklist changes

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -48,6 +48,17 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       descFlexConTextTitle = genericResponseModel!.pDESCFLEXCONTEXTNAME ?? "";
       getEitDffStructureList = genericResponseModel?.getEITDFFStructureList ?? [];
       //getEitDffStructureList = getEitDffStructureList!.where((element) => element.dISPLAYFLAG != "N").toList();
+      if (dynamicParams!.collectionNotificationList != null && dynamicParams!.collectionNotificationList!.isNotEmpty) {
+        getEitDffStructureList!.forEach((element) {
+          dynamicParams!.collectionNotificationList!.forEach((element2) {
+            if (element.sEGMENTNAME == element2.segmentName) {
+              element.fieldAnswer = element2.varchar2Value;
+              element.eSERVICESDV ??= ESERVICESDV();
+              element.eSERVICESDV!.pIDCOLUMNNAME = element2.varchar2Value;
+            }
+          });
+        });
+      }
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -57,7 +68,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   }
 
   void validateTransaction() async {
-    /// try {
+    try {
       Utils.showLoading(context);
       List<Map<String, dynamic>> values = getEitDffStructureList!.map((e) {
         String tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
@@ -91,6 +102,11 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_OBJECT_VERSION_NUMBER", nUMBERVALUE: 0, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
 
       genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
+      if (dynamicParams!.collectionNotificationList != null && dynamicParams!.collectionNotificationList!.isNotEmpty) {
+        Utils.hideLoading(context);
+        Navigator.pop(context, values);
+        return;
+      }
       SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
       Utils.hideLoading(context);
       await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
@@ -98,10 +114,10 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       Utils.showLoading(context);
       await LeaveBalanceApiClient().cancelHrTransaction(submitEITTransactionList.pTRANSACTIONID!);
       Utils.hideLoading(context);
-    // } catch (ex) {
+    } catch (ex) {
-    //   Utils.hideLoading(context);
+      Utils.hideLoading(context);
-    //   Utils.handleException(ex, context, null);
+      Utils.handleException(ex, context, null);
-    // }
+    }
   }
 
   String dESCFLEXCONTEXTCODE = "";

lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart

@@ -88,7 +88,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenAddress> {
         getAddressDffStructureList!
             .insert(1, GetAddressDffStructureList(fORMATTYPE: 'C', sEGMENTPROMPT: LocaleKeys.profile_country.tr(), eSERVICESVS: eSerivceList, getEmployeeAddressList: GetEmployeeAddressList()));
       }
-      print(getAddressDffStructureList);
+
       // genericResponseModel = await ProfileApiClient().getColStructure(dynamicParams!.dynamicId, 'GET_BASIC_DET_COLS_STRUCTURE', dynamicParams!.requestID);
       // getBasicDetColsStructureList = genericResponseModel?.getBasicDetColsStructureList ?? [];
       // getBasicDetColsStructureList?.forEach((element) {

lib/ui/work_list/sheets/update_continue_sheet.dart

@@ -29,7 +29,7 @@ class UpdateContinueSheet extends StatefulWidget {
 class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
   double itemHeight = 0;
   double itemWidth = 0;
-
+  List<Map<String, dynamic>> validatedValues = [];
   @override
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
@@ -99,6 +99,9 @@ class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
     try {
       Utils.showLoading(context);
       List<Map<String, dynamic>> values = [];
+      if (validatedValues!.isNotEmpty) {
+        values = validatedValues;
+      } else {
         for (GetEitCollectionNotificationBodyList element in widget.getEitCollectionNotificationBodyList!) {
           for (CollectionNotificationEit collectionElement in element.collectionNotification!) {
             values.add({
@@ -110,6 +113,8 @@ class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
             });
           }
         }
+      }
+
       ResubmitEITRequestResponse resubmitEITRequestResponse = await MyAttendanceApiClient().reSubmitEitTransaction(widget.workListData!.iTEMKEY!, widget.workListData!.nOTIFICATIONID, values);
       Utils.hideLoading(context);
       await Navigator.pushNamed(
@@ -124,8 +129,9 @@ class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
   }
 
   void performEditAction() {
-    //Open EIT Edit Screen
+    // ignore: avoid_annotating_with_dynamic
-
+    Navigator.pushNamed(context, AppRoutes.addDynamicInput, arguments: widget.dynamicParams).then((dynamic value) {
-    Navigator.pushNamed(context, AppRoutes.addDynamicInput, arguments: widget.dynamicParams);
+      validatedValues = value;
+    });
   }
 }