fix issues

assets/langs/ar-SA.json

@@ -424,6 +424,9 @@
   "typeCurrentPasswordBelow": "اكتب كلمة المرور الحاليه",
   "currentPassword": "كلمة المرور الحاليه",
   "concurrentReports": "التقارير المتزامنه",
+  "EnterNewAddressMoved" : "أدخل عنوان جديد إذا كنت قد انتقلت",
+  "CorrectAddress": "تصحيح أو تعديل هذا العنوان",
+  "SelectChangeWantToMake": " حدد نوع التغيير الذي تريد القيام به.",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

assets/langs/en-US.json

@@ -424,6 +424,9 @@
   "typeCurrentPasswordBelow": "Type Your Current password below",
   "currentPassword": "Current password",
   "concurrentReports": "Concurrent Reports",
+  "EnterNewAddressMoved" : "Enter a new address if you have moved",
+  "CorrectAddress": "Correct or amend this address",
+  "SelectChangeWantToMake": "Select the type of change you want to make",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/classes/consts.dart

@@ -2,8 +2,8 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 
 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://uat.hmgwebservices.com"; // UAT server
-   static String baseUrl = "https://hmgwebservices.com"; // Live 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/generated/codegen_loader.g.dart

@@ -440,6 +440,9 @@ class CodegenLoader extends AssetLoader{
   "typeCurrentPasswordBelow": "اكتب كلمة المرور الحاليه",
   "currentPassword": "كلمة المرور الحاليه",
   "concurrentReports": "التقارير المتزامنه",
+  "EnterNewAddressMoved": "أدخل عنوان جديد إذا كنت قد انتقلت",
+  "CorrectAddress": "تصحيح أو تعديل هذا العنوان",
+  "SelectChangeWantToMake": " حدد نوع التغيير الذي تريد القيام به.",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -516,7 +519,10 @@ class CodegenLoader extends AssetLoader{
   "codeExpire": "انتهت صلاحية رمز التحقق",
   "typeheretoreply": "اكتب هنا للرد",
   "favorite": "مفضلتي",
-  "searchfromchat": "البحث من الدردشة"
+  "searchfromchat": "البحث من الدردشة",
+  "yourAnswerCorrect": "إجابتك صحيحة",
+  "youMissedTheQuestion": "فاتك !! أنت خارج اللعبة. لكن يمكنك المتابعة.",
+  "wrongAnswer": "إجابة خاطئة! أنت خارج اللعبة. لكن يمكنك المتابعة."
 };
 static const Map<String,dynamic> en_US = {
   "mohemm": "Mohemm",
@@ -944,6 +950,9 @@ static const Map<String,dynamic> en_US = {
   "typeCurrentPasswordBelow": "Type Your Current password below",
   "currentPassword": "Current password",
   "concurrentReports": "Concurrent Reports",
+  "EnterNewAddressMoved": "Enter a new address if you have moved",
+  "CorrectAddress": "Correct or amend this address",
+  "SelectChangeWantToMake": "Select the type of change you want to make",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -1020,7 +1029,10 @@ static const Map<String,dynamic> en_US = {
   "allQuestionsCorrect": "You have answered all questions correct",
   "typeheretoreply": "Type here to reply",
   "favorite": "My Favorites",
-  "searchfromchat": "Search from chat"
+  "searchfromchat": "Search from chat",
+  "yourAnswerCorrect": "Your answer is correct",
+  "youMissedTheQuestion": "You Missed !! You are out of the game. But you can follow up.",
+  "wrongAnswer": "Wrong Answer! You are out of the game. But you can follow up."
 };
 static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
 }

lib/generated/locale_keys.g.dart

@@ -425,6 +425,9 @@ abstract class  LocaleKeys {
   static const typeCurrentPasswordBelow = 'typeCurrentPasswordBelow';
   static const currentPassword = 'currentPassword';
   static const concurrentReports = 'concurrentReports';
+  static const EnterNewAddressMoved = 'EnterNewAddressMoved';
+  static const CorrectAddress = 'CorrectAddress';
+  static const SelectChangeWantToMake = 'SelectChangeWantToMake';
   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/ui/leave_balance/add_leave_balance_screen.dart

@@ -96,7 +96,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
   }
 
   void validateAbsenceTransaction() async {
-    try {
+    // try {
       Utils.showLoading(context);
       Map<String, String?> dffDataMap = {};
       for (int i = 1; i <= 20; i++) {
@@ -145,10 +145,10 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
       }
       await LeaveBalanceApiClient().cancelHrTransaction(submit.pTRANSACTIONID!);
       Utils.hideLoading(context);
-    } catch (ex) {
+    // } catch (ex) {
-      Utils.hideLoading(context);
+    //   Utils.hideLoading(context);
-      Utils.handleException(ex, context, null);
+    //   Utils.handleException(ex, context, null);
-    }
+    // }
   }
 
   @override

lib/ui/misc/request_submit_screen.dart

@@ -164,17 +164,17 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
 
   @override
   Widget build(BuildContext context) {
-    if (dynamicParams == null) {
+    // if (dynamicParams == null) {
-      dynamicParams = ModalRoute
+    //   dynamicParams = ModalRoute
-          .of(context)!
+    //       .of(context)!
-          .settings
+    //       .settings
-          .arguments;
+    //       .arguments;
-      if (dynamicParams.isNotEmpty) {
+    //   if (dynamicParams.isNotEmpty) {
-        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
+    //     AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
-        selectedEmp =dynamicParams;
+    //     selectedEmp =dynamicParams;
-        submitRequest();
+    //     submitRequest();
-      }
+    //   }
-    }
+    // }
     if (params == null) {
       params = ModalRoute.of(context)!.settings.arguments as RequestSubmitScreenParams;
       getApproverList();

lib/ui/profile/contact_details.dart

@@ -155,13 +155,13 @@ class _ContactDetailsState extends State<ContactDetails> {
 
   void addUpdateAddress() {
     Widget cancelButton = TextButton(
-      child: Text("Cancel"),
+      child: Text(LocaleKeys.cancel.tr()),
       onPressed: () {
         Navigator.pop(context);
       },
     );
     Widget continueButton = TextButton(
-      child: Text("Next"),
+      child: Text(LocaleKeys.next.tr()),
       onPressed: () {
         continueDynamicForms();
       },
@@ -169,7 +169,7 @@ class _ContactDetailsState extends State<ContactDetails> {
     StatefulBuilder alert = StatefulBuilder(builder: (context, setState) {
       return AlertDialog(
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10.0))),
-        title: Text("Confirm"),
+        title: Text(LocaleKeys.confirm.tr()),
         content: Builder(builder: (context) {
           // Get available height and width of the build area of this widget. Make a choice depending on the size.
           var height = MediaQuery.of(context).size.height * .5;
@@ -177,14 +177,14 @@ class _ContactDetailsState extends State<ContactDetails> {
               height: height,
               child: Column(children: [
                 Text(
-                  "Select the type of change you want to make.",
+                  LocaleKeys.SelectChangeWantToMake.tr(),
                   style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
                 ),
                 Divider(),
                 Column(
                   children: [
                     ListTile(
-                      title: Text("Correct or amend this address"),
+                      title: Text(LocaleKeys.CorrectAddress.tr()),
                       leading: Radio(
                         value: 1,
                         groupValue: correctOrNew,
@@ -197,7 +197,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                       ),
                     ),
                     ListTile(
-                      title: Text("Enter a new address if you have moved"),
+                      title: Text(LocaleKeys.EnterNewAddressMoved.tr()),
                       leading: Radio(
                         value: 2,
                         groupValue: correctOrNew,