Merge branch 'fatima' into 'master'

Fatima

See merge request Cloud_Solution/mohemm-flutter-app!51

lib/classes/consts.dart

@@ -1,7 +1,7 @@
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
-  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-  static String baseUrl = "https://hmgwebservices.com"; // Live server
+  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+  //static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";

lib/models/generic_response_model.dart

@@ -1283,7 +1283,7 @@ class GenericResponseModel {
     if (json['RespondRolesList'] != null) {
       respondRolesList = <String>[];
       json['RespondRolesList'].forEach((v) {
-        respondRolesList!.add(v);
+      //  respondRolesList!.add(v);
       });
     }
     resubmitAbsenceTransactionList = json['ResubmitAbsenceTransactionList'];

lib/ui/attendance/add_vacation_rule_screen.dart

@@ -98,7 +98,7 @@ class _AddVacationRuleScreenState extends State<AddVacationRuleScreen> {
   }
 
   void callCombineApis() async {
-    try {
+     try {
       Utils.showLoading(context);
       List results = await Future.wait([
         VacationRuleApiClient().getNotificationReassignMode(),

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -68,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 ?? "";
@@ -114,10 +114,10 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       Utils.showLoading(context);
       await LeaveBalanceApiClient().cancelHrTransaction(submitEITTransactionList.pTRANSACTIONID!);
       Utils.hideLoading(context);
-    } catch (ex) {
-      Utils.hideLoading(context);
-      Utils.handleException(ex, context, null);
-    }
+    // } catch (ex) {
+    //   Utils.hideLoading(context);
+    //   Utils.handleException(ex, context, null);
+    // }
   }
 
   String dESCFLEXCONTEXTCODE = "";
@@ -175,7 +175,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];
@@ -221,10 +221,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) {
@@ -398,7 +398,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
 
                 String? text = data?.pVALUECOLUMNNAME;
                 String? val = data?.pIDCOLUMNNAME;
-                if ((val ?? "").isEmpty && parentsList[i].IsRequired == "REQUIRED") {
+                if ((val ?? "").isEmpty && parentsList[i].isRequired == "REQUIRED") {
                   //alert(parentsList[i].Name +" Is required");
                   return [];
                 } else {}
@@ -420,7 +420,8 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
 
             String? text = data?.pVALUECOLUMNNAME;
             String? val = data?.pIDCOLUMNNAME;
-            if ((val ?? "").isEmpty && parentsList[i].IsRequired == "REQUIRED") {
+  ///
+            if ((val ?? "").isEmpty && parentsList[i].isRequired == "REQUIRED") {
               //alert(parentsList[i].Name +" Is required");
               return [];
             } else {}