Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into flutter_upgrade_with_timesheet_changes

* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Update to stores VersionID 10.1
  updates

lib/api/dashboard_api_client.dart

@@ -251,12 +251,12 @@ class DashboardApiClient {
     );
   }
 
-  Future<dynamic> getBookingSSOFinalRedirection({required String token}) async {
+  Future<dynamic> getBookingSSOFinalRedirection({required String token, required String refreshToken}) async {
     // token =
     //     "eyJhbGciOiJSUzI1NiIsImtpZCI6IjhjZTE2OWM0YjIwYjQ2ZWM5YTQyOTU3Y2ZhODUzNzQ1IiwidHlwIjoiSldUIn0.eyJ0ZW5hbnRfaWQiOiJhOWY0ZDFhMDU5NmQ0YWVhOGY4MzA5OTJlYzRiZGFjMSIsImVpZCI6IjExNzkzMCIsImh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDUvMDUvaWRlbnRpdHkvY2xhaW1zL3NpZCI6Ijk2MDI0OGM1NzA3YzQ3MmFhYTEzM2I1N2ZhODE1ZmVhIiwibGFuZ3VhZ2UiOiJVUyIsImh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDUvMDUvaWRlbnRpdHkvY2xhaW1zL2VtYWlsYWRkcmVzcyI6IjExNzkzMEBobWcuY29tIiwiZXhwIjoxNzgyNDc1NzY5LCJpc3MiOiJodHRwczovL3Nzby11YXQuaG1nLmNvbSIsImF1ZCI6ImE5ZjRkMWEwNTk2ZDRhZWE4ZjgzMDk5MmVjNGJkYWMxIn0.rJcLVsG8D0XECyLERCTD2uqGeWyvp-OBVGE9uL2qKrX4etFUHgdFt_5kYF6edFTtGy-0PIZadHDmv7e-IOhVWHm5HVMClaukiXoRXR8cDN8XA1wfme3Kd-U5PXN-IRh49AyRTzLO0rYNPvH81ScosWGlsFSkOvA-0hJNa2adHdtvgNvB8wJshSU5p7sAmF8mjdDY6aInG19etu2iEuUDwHHA4ZY_ts4hboHo8fE392hFaYGonExoD7bpW5RMx5xKWeRCmWpG_PK8Aw_z1jGzdB9PANus4pteRGuln1J-kmo2lQC9pVrSyZATAKp1HfgfyZ_vUhaHEfM69cMWaCslJQ";
     http.MultipartRequest request = http.MultipartRequest('POST', Uri.parse('https://www.paxes.com/sso/hmg'));
     // http.MultipartRequest request = http.MultipartRequest('POST', Uri.parse('https://ek.techmaster.in/SSO/HMG'));
-    request.fields.addAll(<String, String>{'JWTToken': token});
+    request.fields.addAll(<String, String>{'JWTToken': token, 'RefreshToken': refreshToken});
     http.StreamedResponse response = await request.send();
     if (response.statusCode == 302) {
       String res = await response.stream.bytesToString();

lib/app_state/app_state.dart

@@ -90,7 +90,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.0, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.1, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;

lib/classes/consts.dart

@@ -9,12 +9,12 @@ class ApiConsts {
  //  static String baseUrl = "https://webservices.hmg.com"; // PreProd
  //  static String baseUrl = "https://hmgwebservices.com"; // Live server
 
-  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
   static String ssoBaseUrl = "https://sso.hmg.com"; // New Live server
   //
   // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
   // static String baseUrl = "http://10.20.200.111:1010/";
-  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
   //static String eLearningBaseUrl = "https://elearning.hmg.com/moodle_dev/api/"; // Elearning server UAT
   static String eLearningBaseUrl = "https://elearning.hmg.com/moodle/api/"; // Elearning server live
   static String enSATLiveURL = "https://ensat.hmg.com/auth/autologin"; // ENSAT server live

lib/provider/dashboard_provider_model.dart

@@ -136,7 +136,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.mowadhafhi.tr(), AppRoutes.mowadhafhi),
       // DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.etqanOVR.tr(), AppRoutes.etqanOvr),
       DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.keen.tr(), AppRoutes.etqanOvr),
-      // DrawerMenuItem("assets/images/drawer/car_parking_icon.svg", LocaleKeys.parkingQr.tr(), AppRoutes.parkingQr),
+      DrawerMenuItem("assets/images/drawer/car_parking_icon.svg", LocaleKeys.parkingQr.tr(), AppRoutes.parkingQr),
       DrawerMenuItem("assets/images/drawer/pending_trasactions.svg", LocaleKeys.pendingTransactions.tr(), AppRoutes.pendingTransactions),
       DrawerMenuItem("assets/images/drawer/courses.svg", "courses".tr(), AppRoutes.courses),
       // DrawerMenuItem("assets/images/drawer/drawer_marathon.svg", LocaleKeys.brainMarathon.tr(), AppRoutes.marathonIntroScreen),
@@ -394,9 +394,9 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     }
   }
 
-  Future<dynamic> fetchURLRedirection({required String token}) async {
+  Future<dynamic> fetchURLRedirection({required String token, required String refreshToken}) async {
     try {
-      dynamic res = await DashboardApiClient().getBookingSSOFinalRedirection(token: token);
+      dynamic res = await DashboardApiClient().getBookingSSOFinalRedirection(token: token, refreshToken: refreshToken);
       logger.d("SSO URL: $res");
       return res;
     } catch (ex) {

lib/ui/landing/widget/menus_widget.dart

@@ -133,7 +133,7 @@ class MenusWidget extends StatelessWidget {
                   if (pro.ticketBookingResponse != null && pro.ticketBookingResponse!.success) {
                     SSOAuthModel? ssoToken = await pro.fetchSSOAuthRedirection(clientID: pro.ticketBookingResponse!.clientId);
                     if (ssoToken != null) {
-                      dynamic url = await pro.fetchURLRedirection(token: ssoToken.data!.accessToken!);
+                      dynamic url = await pro.fetchURLRedirection(token: ssoToken.data!.accessToken!, refreshToken: ssoToken.data!.refreshToken!);
                       await pro.fetchTicketAccuralBalance(context, DateTime.now());
                       pro.ticketHistoryTransactionList = await EITApiClient().getEITTransactions("HMG_TICKET_ITENARY_HR_EIT_SS", isCompleteList: true);
 

lib/ui/landing/widget/services_widget.dart

@@ -264,7 +264,7 @@ class ServicesWidget extends StatelessWidget {
           Utils.showLoading(context);
           SSOAuthModel? ssoToken = await pro.fetchSSOAuthRedirection(clientID: pro.ticketBookingResponse!.clientId);
           if (ssoToken != null) {
-            dynamic url = await pro.fetchURLRedirection(token: ssoToken.data!.accessToken!);
+            dynamic url = await pro.fetchURLRedirection(token: ssoToken.data!.accessToken!, refreshToken: ssoToken.data!.refreshToken!);
             await pro.fetchTicketAccuralBalance(context, DateTime.now());
             pro.ticketHistoryTransactionList = await EITApiClient().getEITTransactions("HMG_TICKET_ITENARY_HR_EIT_SS", isCompleteList: true);
 

lib/ui/parking_qr/parking_qr.dart

@@ -94,6 +94,7 @@ class _RequestDetailsState extends State<ParkingQrScreen> {
 
   void getTicketDetails() async {
     try {
+      qrData = GetEmployeeParking();
       Utils.showLoading(context);
       qrData = await DashboardApiClient().getEmployeeParkingQrCode();
       Utils.hideLoading(context);

lib/ui/work_list/itg_fragments/approval_level_fragment.dart

@@ -83,7 +83,8 @@ class ApprovalLevelfragment extends StatelessWidget {
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        history.name!.toText16(),
+                        (history.name ?? history.approvalLevel ?? "").toText16(),
+                        // history.name!.toText16(),
                         if ((history.notes ?? "").isNotEmpty) history.notes!.toText12(color: MyColors.grey57Color),
                         4.height,
                         Row(