Merge branch 'development_haroon' into 'master'

Development haroon

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

android/app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="Mohemm"
+        android:allowBackup="false"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round">
         <activity

ios/Runner/Info.plist

@@ -45,7 +45,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This app requires photo library access to select image as document &amp; upload it.</string>
 	<key>NSMicrophoneUsageDescription</key>
-    <string>This app requires microphone access to for call.</string>
+	<string>This app requires microphone access to for call.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>
@@ -69,6 +69,10 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>com.apple.developer.nfc.readersession.formats</key>
+	<array>
+		<string>TAG</string>
+	</array>
 	<key>com.apple.developer.nfc.readersession.felica.systemcodes</key>
 	<array>
 		<string>0000</string>

lib/api/dashboard_api_client.dart

@@ -69,7 +69,7 @@ class DashboardApiClient {
     String url = "${ApiConsts.erpRest}GET_ACCRUAL_BALANCES";
     Map<String, dynamic> postParams = {"P_EFFECTIVE_DATE": effectiveDate};
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null && empID.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
     }
     return await ApiClient().postJsonForObject((json) {

lib/classes/utils.dart

@@ -121,7 +121,8 @@ class Utils {
           ),
         );
       } else {
-        showToast(errorMessage);
+        // showToast(errorMessage);
+        confirmDialog(cxt, errorMessage);
       }
     }
   }

lib/ui/leave_balance/add_leave_balance_screen.dart

@@ -160,7 +160,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
   Widget build(BuildContext context) {
     if (dynamicParams == null) {
       dynamicParams = ModalRoute.of(context)!.settings.arguments;
-      if (dynamicParams.isNotEmpty) {
+      if (dynamicParams!= null && dynamicParams.isNotEmpty) {
         AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
         selectedEmp = dynamicParams;
         getAbsenceAttendanceTypes();

lib/ui/leave_balance/leave_balance_screen.dart

@@ -57,7 +57,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
   Widget build(BuildContext context) {
     if (dynamicParams == null) {
       dynamicParams = ModalRoute.of(context)!.settings.arguments;
-      if (dynamicParams.isNotEmpty) {
+      if (dynamicParams!= null && dynamicParams.isNotEmpty) {
         AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
         selectedEmp = dynamicParams;
         getAbsenceTransactions();
@@ -75,7 +75,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
         physics: const BouncingScrollPhysics(),
         padding: const EdgeInsets.all(21),
         children: [
-          BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true),
+          BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp),
           12.height,
           absenceTransList == null
               ? const SizedBox()

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -621,7 +621,12 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
             ).paddingOnly(bottom: 12),
             itemBuilder: (_) => <PopupMenuItem<int>>[
                   if (model.rEADONLY != "Y")
-                    for (int i = 0; i < model.eSERVICESVS!.length; i++) PopupMenuItem<int>(child: Text(model.eSERVICESVS![i].vALUECOLUMNNAME!), value: i),
+                    for (int i = 0; i < model.eSERVICESVS!.length; i++) PopupMenuItem<int>(value: i, child: Column(
+                      children: [
+                        Text(model.eSERVICESVS![i].vALUECOLUMNNAME!),
+                        const PopupMenuDivider(),
+                      ],
+                    )),
                 ],
             onSelected: (int popipIndex) async {
               ESERVICESDV eservicesdv = ESERVICESDV(

lib/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart

@@ -91,7 +91,7 @@ class _DynamicListViewScreenState extends State<DynamicListViewScreen> {
       padding: const EdgeInsets.all(21),
       children: [
         //    HMG_TKT_NEW_EIT_SS Id used for ticket balance dashboard
-        if (isTicketRequest) ...[const BalancesDashboardWidget("Current Ticket Balance", false), 12.height],
+        if (isTicketRequest) ...[const BalancesDashboardWidget("Current Ticket Balance", false, ""), 12.height],
         getEITTransactionList == null
             ? const SizedBox()
             : (getEITTransactionList!.isEmpty

lib/ui/my_team/create_request.dart

@@ -65,14 +65,14 @@ class _CreateRequestState extends State<CreateRequest> {
     return menus;
   }
 
-  void  handleOnPress(context, Menus menu) {
+  void handleOnPress(context, Menus menu) {
-
     if (menu.menuEntry.menuEntryType == "FUNCTION") {
       if (menu.menuEntry.requestType == "EIT") {
-        Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(menu.menuEntry.prompt!, menu.menuEntry.functionName!));
+        Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(menu.menuEntry.prompt!, menu.menuEntry.functionName!, selectedEmp: getEmployeeSubordinates?.eMPLOYEENUMBER ?? ''));
       } else {}
     } else {
-      Navigator.pushNamed(context, AppRoutes.servicesMenuListScreen, arguments: ServicesMenuListScreenParams(menu.menuEntry.prompt!, menu.menuEntiesList, selectedEmp: getEmployeeSubordinates?.eMPLOYEENUMBER??''));
+      Navigator.pushNamed(context, AppRoutes.servicesMenuListScreen,
+          arguments: ServicesMenuListScreenParams(menu.menuEntry.prompt!, menu.menuEntiesList, selectedEmp: getEmployeeSubordinates?.eMPLOYEENUMBER ?? ''));
     }
     return;
   }

lib/ui/screens/announcements/announcement_details.dart

@@ -60,7 +60,7 @@ class _AnnouncementDetailsState extends State<AnnouncementDetails> {
                     ),
                   ),
                   Html(
-                    data: getAnnouncementDetailsObj?.bodyEN,
+                    data: AppState().isArabic(context) ? getAnnouncementDetailsObj?.bodyAR : getAnnouncementDetailsObj?.bodyEN,
                   ).paddingOnly(top: 12),
                 ],
               ).objectContainerView().paddingAll(21),

lib/ui/work_list/worklist_detail_screen.dart

@@ -233,9 +233,9 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                   ),
                   child: Row(
                     children: [
-                      (workListData!.iTEMTYPE == "HRSSA" || workListData!.iTEMTYPE == "STAMP") ? myTab(LocaleKeys.details.tr(), 0) : myTab(LocaleKeys.request.tr(), 0),
+                      myTab(LocaleKeys.info.tr(), 0),
-                      myTab(LocaleKeys.actions.tr(), 1),
+                      (workListData!.iTEMTYPE == "HRSSA" || workListData!.iTEMTYPE == "STAMP") ? myTab(LocaleKeys.details.tr(), 1) : myTab(LocaleKeys.request.tr(), 1),
-                      myTab(LocaleKeys.info.tr(), 2),
+                      myTab(LocaleKeys.actions.tr(), 2),
                       myTab(LocaleKeys.attachments.tr(), 3),
                     ],
                   ),
@@ -249,6 +249,19 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                     });
                   },
                   children: [
+                    InfoFragment(
+                      poHeaderList: getPoNotificationBody?.pOHeader ?? [],
+                      workListData: workListData,
+                      itemCreationHeader: getItemCreationNtfBody?.itemCreationHeader ?? [],
+                      getStampMsNotifications: getStampMsNotifications,
+                      getStampNsNotifications: getStampNsNotifications,
+                      getEitCollectionNotificationBodyList: getEitCollectionNotificationBodyList,
+                      getPhonesNotificationBodyList: getPhonesNotificationBodyList,
+                      getBasicDetNtfBodyList: getBasicDetNtfBodyList,
+                      getAbsenceCollectionNotificationBodyList: getAbsenceCollectionNotificationBodyList,
+                      getContactNotificationBodyList: getContactNotificationBodyList,
+                      getPrNotificationBodyList: getPrNotificationBody,
+                    ),
                     (workListData!.iTEMTYPE == "HRSSA" || workListData!.iTEMTYPE == "STAMP")
                         ? DetailFragment(workListData, memberInformationListModel)
                         : RequestFragment(
@@ -266,19 +279,6 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                                 voidCallback: reloadWorkList,
                               )
                         : showLoadingAnimation(),
-                    InfoFragment(
-                      poHeaderList: getPoNotificationBody?.pOHeader ?? [],
-                      workListData: workListData,
-                      itemCreationHeader: getItemCreationNtfBody?.itemCreationHeader ?? [],
-                      getStampMsNotifications: getStampMsNotifications,
-                      getStampNsNotifications: getStampNsNotifications,
-                      getEitCollectionNotificationBodyList: getEitCollectionNotificationBodyList,
-                      getPhonesNotificationBodyList: getPhonesNotificationBodyList,
-                      getBasicDetNtfBodyList: getBasicDetNtfBodyList,
-                      getAbsenceCollectionNotificationBodyList: getAbsenceCollectionNotificationBodyList,
-                      getContactNotificationBodyList: getContactNotificationBodyList,
-                      getPrNotificationBodyList: getPrNotificationBody,
-                    ),
                     isAttachmentLoaded
                         ? getAttachmentList.isEmpty
                             ? Utils.getNoDataWidget(context)

lib/widgets/balances_dashboard_widget.dart

@@ -31,8 +31,9 @@ class BalancesDashboardWidget extends StatefulWidget {
   final String title;
   final List<PieChartModel> chartModelList;
   final bool isLeaveBalance;
+  final String selectedEmp;
 
-  const BalancesDashboardWidget(this.title, this.isLeaveBalance, {Key? key, this.chartModelList = const []}) : super(key: key);
+  const BalancesDashboardWidget(this.title, this.isLeaveBalance, this.selectedEmp, {Key? key, this.chartModelList = const []}) : super(key: key);
 
   @override
   _BalancesDashboardWidgetState createState() {
@@ -62,8 +63,8 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
 
   void changeAccrualDate() async {
     try {
-      Utils.showLoading(context);
+      // Utils.showLoading(context);
-      List<GetAccrualBalancesList> accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy").format(accrualDateTime), empID: selectedEmp);
+      List<GetAccrualBalancesList> accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy").format(accrualDateTime), empID: widget.selectedEmp);
       if (accrualList.isNotEmpty) {
         if (widget.isLeaveBalance) {
           leaveBalanceAccrual = accrualList[0];
@@ -79,7 +80,7 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
           ];
         }
       }
-      Utils.hideLoading(context);
+      // Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
       Utils.hideLoading(context);

pubspec.yaml

@@ -98,6 +98,7 @@ dependencies:
 
   video_player: ^2.4.7
   just_audio: ^0.9.30
+  safe_device: ^1.1.2
 
 dev_dependencies:
   flutter_test: