Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev

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,

lib/models/generic_response_model.dart

@@ -1291,7 +1291,7 @@ class GenericResponseModel {
     startEitApprovalProcess = json['StartEitApprovalProcess'] != null ? StartEitApprovalProcess.fromJson(json['StartEitApprovalProcess']) : null;
     startHrApprovalProcessList = json['StartHrApprovalProcessList'];
 
-    startPhonesApprovalProcessList = json['StartPhonesApprovalProcessList'] != null ? StartPhoneApprovalProcess.fromJson(json['startPhonesApprovalProcessList']) : null;
+    startPhonesApprovalProcessList = json['StartPhonesApprovalProcessList'] != null ? StartPhoneApprovalProcess.fromJson(json['StartPhonesApprovalProcessList']) : null;
     startSitApprovalProcess = json['StartSitApprovalProcess'];
 
     startTermApprovalProcessList = json['StartTermApprovalProcessList'] != null ? StartTermApprovalProcessList.fromJson(json['StartTermApprovalProcessList']) : null;

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;

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;

lib/ui/misc/request_submit_screen.dart

@@ -68,7 +68,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
   }
 
   void submitRequest() async {
-    try {
+   // try {
       Utils.showLoading(context);
       List<Map<String, dynamic>> list = [];
       if (attachmentFiles.isNotEmpty) {
@@ -97,7 +97,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
         );
       } else if (params!.approvalFlag == 'address') {
         await ProfileApiClient().startAddressApprovalProcess(
-          "SUBMIT",
+          LocaleKeys.submit.tr(),
           comments.text,
           params!.pItemId,
           params!.transactionId,
@@ -111,7 +111,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
         );
       } else if (params!.approvalFlag == 'basicDetails') {
         await ProfileApiClient().startBasicDetailsApprovalProcess(
-          "SUBMIT",
+          LocaleKeys.submit.tr(),
           comments.text,
           params!.pItemId,
           params!.transactionId,
@@ -131,6 +131,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
         );
       }else if (params!.approvalFlag == 'endEmployment') {
         await TerminationDffApiClient().startTermApprovalProcess(
+           // "SUBMIT",
           LocaleKeys.submit.tr(),
           comments.text,
           params!.pItemId,
@@ -142,10 +143,10 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
       Utils.showToast(LocaleKeys.yourRequestHasBeenSubmittedForApprovals.tr(), longDuration: true);
       Navigator.of(context).popUntil((route) => route.settings.name == AppRoutes.dashboard);
       Navigator.pushNamed(context, AppRoutes.workList);
-    } catch (ex) {
-      Utils.hideLoading(context);
-      Utils.handleException(ex, context, null);
-    }
+    // } catch (ex) {
+    //   Utils.hideLoading(context);
+    //   Utils.handleException(ex, context, null);
+    // }
   }
 
   @override

lib/ui/my_team/employee_details.dart

@@ -256,19 +256,29 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
         child: Column(
           children: [
             Text(LocaleKeys.addFavoriteList).tr(namedArgs: {'name': '${getEmployeeSubordinates!.eMPLOYEENAME}'}),
-            Image.memory(
-              Utils.getPostBytes(
-                getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
-              ),
-              errorBuilder: (BuildContext context, error, stackTrace) {
-                return SvgPicture.asset(
-                  "assets/images/user.svg", height: 50, width: 50,
-                );
-              },
-              width: 50,
-              height: 50,
-              fit: BoxFit.cover,
-            ).circle(50).paddingOnly(top: 21),
+            getEmployeeSubordinates!.eMPLOYEEIMAGE  == null
+            ? SvgPicture.asset(
+          "assets/images/user.svg",
+          height: 68,
+          width: 68,)
+            : CircleAvatar(
+          radius: 68,
+          backgroundImage: MemoryImage(Utils.dataFromBase64String(getEmployeeSubordinates!.eMPLOYEEIMAGE!)),
+          backgroundColor: Colors.black,
+        ),
+            // Image.memory(
+            //   Utils.getPostBytes(
+            //     getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
+            //   ),
+            //   errorBuilder: (BuildContext context, error, stackTrace) {
+            //     return SvgPicture.asset(
+            //       "assets/images/user.svg", height: 50, width: 50,
+            //     );
+            //   },
+            //   width: 50,
+            //   height: 50,
+            //   fit: BoxFit.cover,
+            // ).circle(50).paddingOnly(top: 21),
           ],
         ),
       ),

lib/ui/profile/contact_details.dart

@@ -129,7 +129,12 @@ class _ContactDetailsState extends State<ContactDetails> {
                     separatorBuilder: (cxt, index) => 12.height,
                     itemCount: getEmployeeAddressList.length),
                 if (menuEntriesAddress.updateButton == 'Y')
-                  Positioned(
+                  AppState().isArabic(context)? Positioned(
+                    top: 1,
+                    left: 1,
+                    child: const Icon(Icons.edit_location_alt_outlined, size: 20).onPress(addUpdateAddress),
+                  )
+                      :Positioned(
                     top: 1,
                     right: 1,
                     child: const Icon(Icons.edit_location_alt_outlined, size: 20).onPress(addUpdateAddress),

lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart

@@ -266,7 +266,6 @@ 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);
@@ -275,7 +274,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenAddress> {
             }
           }
         } else if (e.eSERVICESVS?.isNotEmpty ?? false) {
-          e.getEmployeeAddressList!.vARCHAR2VALUE != null ? tempVar = e.getEmployeeAddressList!.vARCHAR2VALUE! : tempVar = "";
+          tempVar = e.getEmployeeAddressList!.vARCHAR2VALUE ?? "";
           if (e.aPPLICATIONCOLUMNNAME == null) {
             countryCode = tempVar;
           }