fix issues

assets/langs/ar-SA.json

@@ -279,7 +279,7 @@
   "enterNewInfo": " أدخل معلومات جديدة بسبب تغيير حقيقي في التفاصيل الحالية (على سبيل المثال بسبب تغيير في الحالة الاجتماعية",
   "endDate": "تاريخ الانتهاء",
   "removeThisMember": "هل انت متأكد تريد ازالة هذا العضو؟",
-  "updateThisMember ": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
+  "wantUpdateThisMember ": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
   "addNewFamilyMember": "اضافة عضو جديد",
   "addRow": "اضافة صف جديد",
   "pleaseSelect": "الرجاء اختيار",
@@ -407,6 +407,15 @@
   "rateUI": ".1 كيف تريد تقييم التطبيق",
   "submitSurvey":"ارسال الاستبيان",
   "typeHere": "اكتب هنا",
+  "currentBalance": "الرصيد الحالي",
+  "currentLeaveBalance" : "رصيد الاجازات الحالي",
+  "calculatedDays": "الايام المحسوبه",
+  "totalDays": "مجموع الأيام",
+  "usedBalance": "المستخدم",
+  "infants":"رضيع",
+  "child":"طفل",
+  "adult": "بالغ",
+  "updateMember": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

assets/langs/en-US.json

@@ -276,7 +276,7 @@
   "enterNewInfo": "Enter new Information because of a real change to the current details (e.g because of a change in marital status)",
   "endDate": "*End Date",
   "removeThisMember": "Are You Sure You Want to Remove this Member?",
-  "updateThisMember": "Are You Sure You Want to Update this Member?",
+  "wantUpdateThisMember": "Are You Sure You Want to Update this Member?",
   "addNewFamilyMember": "Add New Family Member",
   "addRow": "Add new row",
   "pleaseSelect": "Please Select *",
@@ -407,6 +407,15 @@
   "rateUI": "1. How would you rate this UI?",
   "submitSurvey":"Submit Survey",
   "typeHere": "Type here",
+  "currentBalance": "Current Balance",
+  "currentLeaveBalance" : "Current Leave Balance",
+  "calculatedDays": "Calculated Days",
+  "totalDays": "Total Days",
+  "usedBalance": "Used",
+  "infants":"Infants",
+  "child":"Child",
+  "adult": "Adult",
+  "updateMember": "Are You Sure You Want to Update this Member?",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/codegen_loader.g.dart

@@ -27,6 +27,7 @@ class CodegenLoader extends AssetLoader{
   "lastLoginDetails": "تفاصيل تسجيل الدخول الأخير:",
   "verificationType": "نوع التحقق:",
   "pleaseVerify": "ارجوك تحقق",
+  "pleaseVerifyForBio": "الرجاء التحقق من تسجيل الدخول باستخدام أحد هذه الخيارات",
   "verifyThroughFace": "تحقق من خلال الوجه",
   "verifyThroughFingerprint": "تحقق من خلال بصمة الإصبع",
   "verifyThroughSMS": "تحقق من خلال الرسائل القصيرة",
@@ -294,7 +295,7 @@ class CodegenLoader extends AssetLoader{
   "enterNewInfo": " أدخل معلومات جديدة بسبب تغيير حقيقي في التفاصيل الحالية (على سبيل المثال بسبب تغيير في الحالة الاجتماعية",
   "endDate": "تاريخ الانتهاء",
   "removeThisMember": "هل انت متأكد تريد ازالة هذا العضو؟",
-  "updateThisMember ": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
+  "wantUpdateThisMember ": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
   "addNewFamilyMember": "اضافة عضو جديد",
   "addRow": "اضافة صف جديد",
   "pleaseSelect": "الرجاء اختيار",
@@ -420,8 +421,17 @@ class CodegenLoader extends AssetLoader{
   "addFavoriteList": "هل تريد اضافة {name} لقائمة المفضله",
   "feedbackUserExperience": "هذا للحصول على تعليقات حول تجربة المستخدم",
   "rateUI": ".1 كيف تريد تقييم التطبيق",
-  "Submit Survey": "ارسال الاستبيان",
+  "submitSurvey": "ارسال الاستبيان",
   "typeHere": "اكتب هنا",
+  "currentBalance": "الرصيد الحالي",
+  "currentLeaveBalance": "رصيد الاجازات الحالي",
+  "calculatedDays": "الايام المحسوبه",
+  "totalDays": "مجموع الأيام",
+  "usedBalance": "المستخدم",
+  "infants": "رضيع",
+  "child": "طفل",
+  "adult": "بالغ",
+  "updateMember": "هل انت متأكد تريد تحديث بيانات هذا العضو؟",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -469,6 +479,7 @@ static const Map<String,dynamic> en_US = {
   "lastLoginDetails": "Last Login Details:",
   "verificationType": "Verification Type:",
   "pleaseVerify": "Please Verify",
+  "pleaseVerifyForBio": "Please verify login with one of the following options",
   "verifyThroughFace": "Verify Through Face",
   "verifyThroughFingerprint": "Verify Through Fingerprint",
   "verifyThroughSMS": "Verify Through SMS",
@@ -733,7 +744,7 @@ static const Map<String,dynamic> en_US = {
   "enterNewInfo": "Enter new Information because of a real change to the current details (e.g because of a change in marital status)",
   "endDate": "*End Date",
   "removeThisMember": "Are You Sure You Want to Remove this Member?",
-  "updateThisMember": "Are You Sure You Want to Update this Member?",
+  "wantUpdateThisMember": "Are You Sure You Want to Update this Member?",
   "addNewFamilyMember": "Add New Family Member",
   "addRow": "Add new row",
   "pleaseSelect": "Please Select *",
@@ -862,8 +873,17 @@ static const Map<String,dynamic> en_US = {
   "addFavoriteList": "Do you want to add {name} in your favorite list",
   "feedbackUserExperience": "This is to get the feedback about the user experience",
   "rateUI": "1. How would you rate this UI?",
-  "Submit Survey": "Submit Survey",
+  "submitSurvey": "Submit Survey",
   "typeHere": "Type here",
+  "currentBalance": "Current Balance",
+  "currentLeaveBalance": "Current Leave Balance",
+  "calculatedDays": "Calculated Days",
+  "totalDays": "Total Days",
+  "usedBalance": "Used",
+  "infants": "Infants",
+  "child": "Child",
+  "adult": "Adult",
+  "updateMember": "Are You Sure You Want to Update this Member?",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/locale_keys.g.dart

@@ -280,7 +280,7 @@ abstract class  LocaleKeys {
   static const enterNewInfo = 'enterNewInfo';
   static const endDate = 'endDate';
   static const removeThisMember = 'removeThisMember';
-  static const updateThisMember  = 'updateThisMember ';
+  static const wantUpdateThisMember  = 'wantUpdateThisMember ';
   static const addNewFamilyMember = 'addNewFamilyMember';
   static const addRow = 'addRow';
   static const pleaseSelect = 'pleaseSelect';
@@ -408,6 +408,15 @@ abstract class  LocaleKeys {
   static const rateUI = 'rateUI';
   static const submitSurvey = 'submitSurvey';
   static const typeHere = 'typeHere';
+  static const currentBalance = 'currentBalance';
+  static const currentLeaveBalance = 'currentLeaveBalance';
+  static const calculatedDays = 'calculatedDays';
+  static const totalDays = 'totalDays';
+  static const usedBalance = 'usedBalance';
+  static const infants = 'infants';
+  static const child = 'child';
+  static const adult = 'adult';
+  static const updateMember = 'updateMember';
   static const profile_reset_password_label = 'profile.reset_password.label';
   static const profile_reset_password_username = 'profile.reset_password.username';
   static const profile_reset_password_password = 'profile.reset_password.password';

lib/models/generic_response_model.dart

@@ -795,9 +795,28 @@ class GenericResponseModel {
         getContactColsStructureList!.add(GetContactColsStructureList.fromJson(v));
       });
     }
-    getContactColsStructureList = json['GetContactColsStructureList'];
+
-    getContactDetailsList = json['GetContactDetailsList'];
+    if (json['GetContactColsStructureList'] != null) {
-    getContactDffStructureList = json['GetContactDffStructureList'];
+      getContactColsStructureList = [];
+      json['GetContactColsStructureList'].forEach((v) {
+        getContactColsStructureList!.add(GetContactColsStructureList.fromJson(v));
+      });
+    }
+
+    if (json['GetContactDetailsList'] != null) {
+      getContactDetailsList = [];
+      json['GetContactDetailsList'].forEach((v) {
+        getContactDetailsList!.add(GetContactDetailsList.fromJson(v));
+      });
+    }
+    if (json['GetContactDffStructureList'] != null) {
+      getContactDffStructureList = [];
+      json['GetContactDffStructureList'].forEach((v) {
+        getContactDffStructureList!.add(GetContactDffStructureList.fromJson(v));
+      });
+    }
+   // getContactDetailsList = json['GetContactDetailsList'];
+   // getContactDffStructureList = json['GetContactDffStructureList'];
     getContactNotificationBodyList = json["GetContactNotificationBodyList"] == null ? null : GetContactNotificationBodyList.fromJson(json["GetContactNotificationBodyList"]);
 
     if (json['GetCountriesList'] != null) {

lib/ui/leave_balance/add_leave_balance_screen.dart

@@ -205,7 +205,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
               ),
               12.height,
               DynamicTextFieldWidget(
-                "Total Days",
+                LocaleKeys.totalDays.tr(),
                 totalDays?.toString() ?? "Calculated days",
                 isInputTypeNum: true,
                 isEnable: false,

lib/ui/leave_balance/leave_balance_screen.dart

@@ -62,7 +62,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
         physics: const BouncingScrollPhysics(),
         padding: const EdgeInsets.all(21),
         children: [
-          const BalancesDashboardWidget("Current Leave Balance", true),
+           BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true),
           12.height,
           absenceTransList == null
               ? const SizedBox()

lib/ui/my_team/team_members.dart

@@ -73,7 +73,7 @@ class _TeamMembersState extends State<TeamMembers> {
                   var phoneNumber = Uri.parse('tel:${getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER}');
                  return InkWell(
                   onTap: () async {
-               //  Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSubordinatesList[index]);
+                 Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSubordinatesList[index]);
                 },
                   child: Row(
                   crossAxisAlignment: CrossAxisAlignment.start,

lib/ui/profile/add_update_family_member.dart

@@ -48,7 +48,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
   }
 
   void callAddAndUpdateFamilyMember() async {
-    try {
+     try {
       Utils.showLoading(context);
       getBasicDetDffStructureList = await ProfileApiClient().getBasicDetDffStructure();
       getContactColsStructureList = await ProfileApiClient().getContactColsStructureList(args['actionType']);
@@ -199,8 +199,8 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
             });
       } else {
         return DynamicTextFieldWidget(
-          (model!.sEGMENTPROMPT ?? "") + (model!.rEQUIREDFLAG == "Y" ? "*" : ""),
+          (model!.sEGMENTPROMPT ?? "") + (model!.rEQUIREDFLAG == "Y" ? "*" : "") ,
-          model!.getContactDetailsList!.sEGMENTVALUEDSP ?? "",
+          ( model!.getContactDetailsList!.sEGMENTVALUEDSP ?? "")+ (model!.aPPLICATIONCOLUMNNAME == "NATIONAL_IDENTIFIER" ? "1-1111-1111-1" : ""),
           onChange: (text) {
             model!.getContactDetailsList!.sEGMENTVALUEDSP = text;
           },
@@ -357,7 +357,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
 
 
   void submitUpdateForm() async {
-    try {
+     try {
       List<Map<String, dynamic>> values1 = getBasicDetDffStructureList!.map((e) {
         String? dateVal = '';
         String? vatcherVal = '';
@@ -418,12 +418,7 @@ class _AddUpdateFamilyMemberState extends State<AddUpdateFamilyMember> {
       }).toList();
       List<Map<String, dynamic>> valuesFinal = [...values1, ...values2, ...values3];
       Utils.showLoading(context);
-      if (args['actionType'] == "ADD") {
+        submitContactTransactionList = await ProfileApiClient().submitContactTransactionAddAndUpdate(args['actionType'],  args['relationID'] ?? 0, valuesFinal);
-        var relationID = null;
-        submitContactTransactionList = await ProfileApiClient().submitContactTransactionAddAndUpdate(args['actionType'], relationID, valuesFinal);
-      } else if (args['actionType'] == "UPDATE") {
-        submitContactTransactionList = await ProfileApiClient().submitContactTransactionAddAndUpdate(args['actionType'], args['relationID'], valuesFinal);
-      }
       var transactionId = submitContactTransactionList!.pTRANSACTIONID;
       var itemKey = submitContactTransactionList!.pITEMKEY;
       Utils.hideLoading(context);

lib/ui/profile/family_members.dart

@@ -98,7 +98,7 @@ class _FamilyMembersState extends State<FamilyMembers> {
                                             recognizer: TapGestureRecognizer()
                                               ..onTap = () async {
                                            relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
-                                           menuEntries.updateButton == 'Y'? showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr()):null;
+                                           menuEntries.updateButton == 'Y'? showUpdateAlertDialog(context, relationId!.toInt(), 2, "UPDATE"):null;
                                             }
                                           )
                                         ],
@@ -161,7 +161,7 @@ class _FamilyMembersState extends State<FamilyMembers> {
       title: Text(
         LocaleKeys.confirm.tr(),
       ),
-      content: Text(LocaleKeys.updateThisMember.tr()),
+      content: Text(LocaleKeys.updateMember.tr()),
       actions: [
         cancelButton,
         continueButton,

lib/widgets/balances_dashboard_widget.dart

@@ -8,6 +8,7 @@ import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/dashboard/get_accrual_balances_list_model.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
 import 'package:pie_chart/pie_chart.dart';
@@ -64,14 +65,14 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
         if (widget.isLeaveBalance) {
           leaveBalanceAccrual = accrualList[0];
           chartModelList = [
-            PieChartModel("Current Balance", leaveBalanceAccrual?.accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
+            PieChartModel(LocaleKeys.currentBalance.tr(), leaveBalanceAccrual?.accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
-            PieChartModel("Used", leaveBalanceAccrual?.accrualUsedEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
+            PieChartModel(LocaleKeys.usedBalance.tr(), leaveBalanceAccrual?.accrualUsedEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
           ];
         } else {
           chartModelList = [
-            PieChartModel("Adult", accrualList[1].accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
+            PieChartModel(LocaleKeys.adult.tr(), accrualList[1].accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
-            PieChartModel("Child", accrualList[2].accrualNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
+            PieChartModel(LocaleKeys.child.tr(), accrualList[2].accrualNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
-            PieChartModel("infants", accrualList[3].accrualNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
+            PieChartModel(LocaleKeys.infants.tr(), accrualList[3].accrualNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
           ];
         }
       }
@@ -88,8 +89,8 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
     if (leaveBalanceAccrual == null && widget.isLeaveBalance) {
       leaveBalanceAccrual = Provider.of<DashboardProviderModel>(context, listen: false).leaveBalanceAccrual;
       chartModelList = [
-        PieChartModel("Current Balance", leaveBalanceAccrual?.accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
+        PieChartModel(LocaleKeys.currentBalance.tr(), leaveBalanceAccrual?.accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
-        PieChartModel("Used", leaveBalanceAccrual?.accrualUsedEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
+        PieChartModel(LocaleKeys.usedBalance.tr(), leaveBalanceAccrual?.accrualUsedEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
       ];
     }
 
@@ -97,9 +98,9 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
       ticketBalanceAccrualList = Provider.of<DashboardProviderModel>(context, listen: false).accrualList ?? [];
       if (ticketBalanceAccrualList!.isNotEmpty) {
         chartModelList = [
-          PieChartModel("Adult", ticketBalanceAccrualList![1].accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
+          PieChartModel(LocaleKeys.adult.tr(), ticketBalanceAccrualList![1].accrualNetEntitlement ?? 0, MyColors.textMixColor, titleAppend: ""),
-          PieChartModel("Child", ticketBalanceAccrualList![2].accrualNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
+          PieChartModel(LocaleKeys.child.tr(), ticketBalanceAccrualList![2].accrualNetEntitlement?.toDouble() ?? 0, MyColors.backgroundBlackColor, titleAppend: ""),
-          PieChartModel("infants", ticketBalanceAccrualList![3].accrualNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
+          PieChartModel(LocaleKeys.infants.tr(), ticketBalanceAccrualList![3].accrualNetEntitlement?.toDouble() ?? 0, MyColors.pinkColor, titleAppend: ""),
         ];
       }
     }