From c83f0c11994aa5f93259d91431fbf06ac5c89230 Mon Sep 17 00:00:00 2001
From: Fatimah Alshammari <fatimah.alshammari@cloudsolution-sa.com>
Date: Tue, 8 Nov 2022 08:13:05 +0300
Subject: [PATCH] fix issues

---
 lib/api/profile_api_client.dart                        |  2 +-
 lib/models/get_employee_address_model.dart             |  2 +-
 lib/models/profile/get_address_dff_structure_list.dart |  6 +++---
 .../dynamic_screens/dynamic_input_screen.dart          | 10 +++++-----
 .../dynamic_screens/dynamic_input_address_screen.dart  |  5 ++---
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/api/profile_api_client.dart b/lib/api/profile_api_client.dart
index d7ceba0..210d179 100644
--- a/lib/api/profile_api_client.dart
+++ b/lib/api/profile_api_client.dart
@@ -293,7 +293,7 @@ class ProfileApiClient {
       "P_COUNTRY_CODE": countryCode, //"SA",
       "P_DESC_FLEX_CONTEXT_CODE": "SA",
       "P_FUNCTION_NAME": pFunctionName,
-      "P_ACTION": correctOrNew == 1 ? 'CORRECT' : 'NEW',
+      "P_ACTION": correctOrNew == 1 ? 'CORRECT' : 'CHANGE',
       "P_EFFECTIVE_DATE": effectiveDate,
 
       //"EITTransactionTBL": list,
diff --git a/lib/models/get_employee_address_model.dart b/lib/models/get_employee_address_model.dart
index 8531ced..71c5885 100644
--- a/lib/models/get_employee_address_model.dart
+++ b/lib/models/get_employee_address_model.dart
@@ -5,7 +5,7 @@
   String? dATATYPE;
   String? dATEVALUE;
   String? dISPLAYFLAG;
-  Null? nUMBERVALUE;
+  dynamic? nUMBERVALUE;
   String? sEGMENTPROMPT;
   int? sEGMENTSEQNUM;
   String? sEGMENTVALUEDSP;
diff --git a/lib/models/profile/get_address_dff_structure_list.dart b/lib/models/profile/get_address_dff_structure_list.dart
index 786e683..61f6b5e 100644
--- a/lib/models/profile/get_address_dff_structure_list.dart
+++ b/lib/models/profile/get_address_dff_structure_list.dart
@@ -5,7 +5,7 @@ class GetAddressDffStructureList {
   String? aLPHANUMERICALLOWEDFLAG;
   String? aPPLICATIONCOLUMNNAME;
   String? cHILDSEGMENTSVS;
-  Null? cHILDSEGMENTSVSSplited;
+  dynamic? cHILDSEGMENTSVSSplited;
   String? dEFAULTTYPE;
   String? dEFAULTVALUE;
   String? dESCFLEXCONTEXTCODE;
@@ -27,9 +27,9 @@ class GetAddressDffStructureList {
   String? nUMBERPRECISION;
   String? nUMERICMODEENABLEDFLAG;
   String? pARENTSEGMENTSDV;
-  List<Null>? pARENTSEGMENTSDVSplited;
+  List<dynamic>? pARENTSEGMENTSDVSplited;
   String? pARENTSEGMENTSVS;
-  List<Null>? pARENTSEGMENTSVSSplitedVS;
+  List<dynamic>? pARENTSEGMENTSVSSplitedVS;
   String? rEADONLY;
   String? rEQUIREDFLAG;
   String? sEGMENTNAME;
diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
index c1b8a43..0a6c9d4 100644
--- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
+++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
@@ -136,7 +136,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   }
 
   Future getDefaultValues(GetEITDFFStructureList structureList) async {
-   // try {
+    try {
       Utils.showLoading(context);
       for (int i = 0; i < (structureList.cHILDSEGMENTSDVSplited?.length ?? 0); i++) {
         String segmentId = structureList.cHILDSEGMENTSDVSplited![i];
@@ -163,10 +163,10 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       await Future.delayed(const Duration(seconds: 1));
       Utils.hideLoading(context);
       setState(() {});
-    // } catch (ex) {
-    //   Utils.hideLoading(context);
-    //   Utils.handleException(ex, context, null);
-    // }
+    } catch (ex) {
+      Utils.hideLoading(context);
+      Utils.handleException(ex, context, null);
+    }
   }
 
   // List<Map<String, dynamic>> calGetValueSetValuesIonicLogic(GetEITDFFStructureList structureElement) {
diff --git a/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart b/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
index cc8e861..ecc2426 100644
--- a/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
+++ b/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
@@ -266,16 +266,15 @@ class _DynamicInputScreenState extends State<DynamicInputScreenAddress> {
         if (e.fORMATTYPE == "X") {
           // for date format type, date format is changed
           tempVar = e.eSERVICESDV?.pVALUECOLUMNNAME ?? "";
-
           if (tempVar.isNotEmpty) {
             DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
-            tempVar = DateFormat('dd/MMM/yyy').format(date);
+            tempVar = DateFormat('dd-MMM-yyy').format(date);
             if (e.aPPLICATIONCOLUMNNAME == null) {
               effectiveDate = tempVar;
             }
           }
         } else if (e.eSERVICESVS?.isNotEmpty ?? false) {
-          tempVar = e.getEmployeeAddressList!.vARCHAR2VALUE!;
+          tempVar = e.getEmployeeAddressList!.vARCHAR2VALUE ?? "";
           if (e.aPPLICATIONCOLUMNNAME == null) {
             countryCode = tempVar;
           }