leave balance issues fixed.

lib/api/dashboard_api_client.dart

@@ -1,12 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:http/http.dart';
 import 'package:mohem_flutter_app/api/api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
 import 'package:mohem_flutter_app/classes/date_uitl.dart';
-import 'package:mohem_flutter_app/models/chat/chat_count_conversation_model.dart';
 import 'package:mohem_flutter_app/models/dashboard/get_accrual_balances_list_model.dart';
 import 'package:mohem_flutter_app/models/dashboard/get_attendance_tracking_list_model.dart';
 import 'package:mohem_flutter_app/models/dashboard/itg_forms_model.dart';
@@ -14,7 +12,6 @@ import 'package:mohem_flutter_app/models/dashboard/list_menu.dart';
 import 'package:mohem_flutter_app/models/generic_response_model.dart';
 import 'package:mohem_flutter_app/models/itg/itg_main_response.dart';
 import 'package:mohem_flutter_app/models/itg/itg_response_model.dart';
-
 import 'package:uuid/uuid.dart';
 
 class DashboardApiClient {
@@ -47,7 +44,6 @@ class DashboardApiClient {
   Future<GenericResponseModel?> getCOCNotifications() async {
     String url = "${ApiConsts.cocRest}Mohemm_ITG_ReviewerAdmin_Pending_Tasks";
     Map<String, dynamic> postParams = {"Date": DateUtil.getISODateFormat(DateTime.now()), "EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER};
-
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
@@ -69,9 +65,7 @@ class DashboardApiClient {
     String url = "${ApiConsts.erpRest}GET_ACCRUAL_BALANCES";
     Map<String, dynamic> postParams = {"P_EFFECTIVE_DATE": effectiveDate};
     postParams.addAll(AppState().postParamsJson);
-    if (empID != null && empID.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
       return responseData.getAccrualBalancesList ?? [];
@@ -205,8 +199,6 @@ class DashboardApiClient {
     }, url, postParams);
   }
 
-
-
 // Future setAdvertisementViewed(String masterID, int advertisementId) async {
 //   String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed";
 //

lib/api/leave_balance_api_client.dart

@@ -17,13 +17,11 @@ class LeaveBalanceApiClient {
 
   factory LeaveBalanceApiClient() => _instance;
 
-  Future<List<GetAbsenceTransactionList>> getAbsenceTransactions(int pSelectedResopID, {String? empID}) async {
+  Future<List<GetAbsenceTransactionList>> getAbsenceTransactions(int pSelectedResopID, String? empID) async {
     String url = "${ApiConsts.erpRest}GET_ABSENCE_TRANSACTIONS";
     Map<String, dynamic> postParams = {"P_PAGE_LIMIT": 50, "P_PAGE_NUM": 1, "P_MENU_TYPE": "E", "P_SELECTED_RESP_ID": pSelectedResopID};
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.getAbsenceTransactionList ?? [];
@@ -34,9 +32,8 @@ class LeaveBalanceApiClient {
     String url = "${ApiConsts.erpRest}GET_ABSENCE_ATTENDANCE_TYPES";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
+
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.getAbsenceAttendanceTypesList ?? [];
@@ -52,12 +49,10 @@ class LeaveBalanceApiClient {
       "P_SELECTED_RESP_ID": pSelectedResopID,
       "P_MENU_TYPE": "E",
       "P_TIME_END": null,
-      "P_TIME_START": null,
+      "P_TIME_START": null
     };
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.calculateAbsenceDuration!;
@@ -66,11 +61,14 @@ class LeaveBalanceApiClient {
 
   Future<List<GetAbsenceDffStructureList>> getAbsenceDffStructure(String pDescFlexContextCode, String pFunctionName, int pSelectedResopID, {String? empID}) async {
     String url = "${ApiConsts.erpRest}GET_ABSENCE_DFF_STRUCTURE";
-    Map<String, dynamic> postParams = {"P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode, "P_FUNCTION_NAME": pFunctionName, "P_MENU_TYPE": "E", "P_SELECTED_RESP_ID": pSelectedResopID};
+    Map<String, dynamic> postParams = {
+      "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
+      "P_FUNCTION_NAME": pFunctionName,
+      "P_MENU_TYPE": "E",
+      "P_SELECTED_RESP_ID": pSelectedResopID,
+    };
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.getAbsenceDffStructureList ?? [];
@@ -94,13 +92,11 @@ class LeaveBalanceApiClient {
       "P_SELECTED_RESP_ID": pSelectedResopID,
       "P_MENU_TYPE": "E",
       "P_TIME_END": null,
-      "P_TIME_START": null,
+      "P_TIME_START": null
     };
     postParams.addAll(data);
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData;
@@ -124,13 +120,11 @@ class LeaveBalanceApiClient {
       "P_SELECTED_RESP_ID": pSelectedResopID,
       "P_MENU_TYPE": "E",
       "P_TIME_END": null,
-      "P_TIME_START": null,
+      "P_TIME_START": null
     };
     postParams.addAll(data);
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.sumbitAbsenceTransactionList!;
@@ -147,18 +141,11 @@ class LeaveBalanceApiClient {
     }, url, postParams);
   }
 
-  Future<StartAbsenceApprovalProccess> startAbsenceApprovalProcess(int pTransactionID, String comments, int pSelectedResopID,{String? empID}) async {
+  Future<StartAbsenceApprovalProccess> startAbsenceApprovalProcess(int pTransactionID, String comments, int pSelectedResopID, {String? empID}) async {
     String url = "${ApiConsts.erpRest}START_ABSENCE_APPROVAL_PROCESS";
-    Map<String, dynamic> postParams = {
+    Map<String, dynamic> postParams = {"P_TRANSACTION_ID": pTransactionID, "P_SELECTED_RESP_ID": pSelectedResopID, "P_COMMENTS": comments, "P_MENU_TYPE": "E", 'P_SELECTED_EMPLOYEE_NUMBER': empID};
-      "P_TRANSACTION_ID": pTransactionID,
-      "P_SELECTED_RESP_ID": pSelectedResopID,
-      "P_COMMENTS": comments,
-      "P_MENU_TYPE": "E",
-    };
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.startAbsenceApprovalProccess!;

lib/api/my_attendance_api_client.dart

@@ -22,11 +22,7 @@ class MyAttendanceApiClient {
     String url = "${ApiConsts.erpRest}GET_EIT_TRANSACTIONS";
     Map<String, dynamic> postParams = {"P_PAGE_LIMIT": 50, "P_PAGE_NUM": 1, "P_SELECTED_RESP_ID": -999, "P_MENU_TYPE": "E", "P_FUNCTION_NAME": pFunctionName};
     postParams.addAll(AppState().postParamsJson);
-    //  postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-    if (empID!.isNotEmpty) {
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-      // AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.getEITTransactionList ?? [];
@@ -37,9 +33,7 @@ class MyAttendanceApiClient {
     String url = "${ApiConsts.erpRest}GET_EIT_DFF_STRUCTURE";
     Map<String, dynamic> postParams = {"P_SELECTED_RESP_ID": -999, "P_MENU_TYPE": "E", "P_FUNCTION_NAME": pFunctionName};
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData;
@@ -53,16 +47,14 @@ class MyAttendanceApiClient {
       "P_MENU_TYPE": "E",
       "P_PAGE_LIMIT": 1000,
       "P_PAGE_NUM": 1,
-      "P_PARENT_VALUE": empID!.isNotEmpty ? parentValue : null,
+      "P_PARENT_VALUE": empID != null ? parentValue : null,
       "P_SEGMENT_NAME": pSegmentName,
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
       "P_DESC_FLEX_NAME": pDescFlexName,
       "GetValueSetValuesTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if (empID.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.getValueSetValuesList ?? [];
@@ -81,9 +73,7 @@ class MyAttendanceApiClient {
       "GetValueSetValuesTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if (empID != null && empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return ESERVICESDV.fromJson(responseData.getDefaultValueList!.toJson());
@@ -100,9 +90,7 @@ class MyAttendanceApiClient {
       "EITTransactionTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData; //ESERVICESDV.fromJson(responseData.getDefaultValueList!.toJson());
@@ -120,9 +108,7 @@ class MyAttendanceApiClient {
       "EITTransactionTBLModel": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
-    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
       return responseData.submitEITTransactionList!; //ESERVICESDV.fromJson(responseData.getDefaultValueList!.toJson());

lib/classes/consts.dart

@@ -3,8 +3,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://erptstapp.srca.org.sa"; // SRCA 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/ui/leave_balance/add_leave_balance_screen.dart

@@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/leave_balance_api_client.dart';
-import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/date_uitl.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
@@ -25,8 +24,7 @@ import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
 
 class AddLeaveBalanceScreen extends StatefulWidget {
-  final String selectedEmp;
+  AddLeaveBalanceScreen({Key? key}) : super(key: key);
-  AddLeaveBalanceScreen({this.selectedEmp = '', Key? key}) : super(key: key);
 
   @override
   _AddLeaveBalanceScreenState createState() {
@@ -44,15 +42,21 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
   int? totalDays;
   String comment = "";
   ReplacementList? selectedReplacementEmployee;
-  dynamic dynamicParams;
+  String? selectedEmp;
-  String selectedEmp = "";
 
   DateTime selectedDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day);
 
   @override
   void initState() {
     super.initState();
-    //getAbsenceAttendanceTypes();
+
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      var dynamicParam = ModalRoute.of(context)!.settings.arguments;
+      if (dynamicParam != null) {
+        selectedEmp = dynamicParam.toString();
+      }
+      getAbsenceAttendanceTypes();
+    });
   }
 
   void getAbsenceAttendanceTypes() async {
@@ -85,7 +89,6 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
       Utils.showLoading(context);
       CalculateAbsenceDuration duration = await LeaveBalanceApiClient()
           .calculateAbsenceDuration(selectedAbsenceType!.aBSENCEATTENDANCETYPEID!, Utils.getMonthNamedFormat(startDateTime!), Utils.getMonthNamedFormat(endDateTime!), -999, empID: selectedEmp);
-
       totalDays = duration.pABSENCEDAYS?.toInt();
       Utils.hideLoading(context);
       setState(() {});
@@ -95,7 +98,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
     }
   }
 
-  void validateAbsenceTransaction(selectedID) async {
+  void validateAbsenceTransaction(String? selectedID) async {
     try {
       Utils.showLoading(context);
       Map<String, String?> dffDataMap = {};
@@ -123,7 +126,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
           -999,
           dffDataMap,
           comments: comment,
-        empID: selectedEmp);
+          empID: selectedID);
 
       SumbitAbsenceTransactionList submit = await LeaveBalanceApiClient().submitAbsenceTransaction(
           selectedAbsenceType!.dESCFLEXCONTEXTCODE!,
@@ -135,7 +138,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
           -999,
           dffDataMap,
           comments: comment,
-        empID: selectedEmp);
+          empID: selectedID);
 
       Utils.hideLoading(context);
 
@@ -158,16 +161,6 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
 
   @override
   Widget build(BuildContext context) {
-    if (dynamicParams == null) {
-      dynamicParams = ModalRoute.of(context)!.settings.arguments;
-      if (dynamicParams!= null && dynamicParams.isNotEmpty) {
-        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
-        selectedEmp = dynamicParams;
-        getAbsenceAttendanceTypes();
-      } else {
-        getAbsenceAttendanceTypes();
-      }
-    }
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: AppBarWidget(
@@ -187,13 +180,13 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
                   isPopup: true,
                 ),
                 itemBuilder: (_) => <PopupMenuItem<int>>[
-                  for (int i = 0; i < absenceList.length; i++) PopupMenuItem<int>(value: i, child: Text(absenceList[i].aBSENCEATTENDANCETYPENAME!)),
+                  for (int i = 0; i < (absenceList?.length ?? 0); i++) PopupMenuItem<int>(value: i, child: Text(absenceList![i].aBSENCEATTENDANCETYPENAME!)),
                 ],
                 onSelected: (int popupIndex) {
-                  if (selectedAbsenceType == absenceList[popupIndex]) {
+                  if (selectedAbsenceType == absenceList![popupIndex]) {
                     return;
                   }
-                  selectedAbsenceType = absenceList[popupIndex];
+                  selectedAbsenceType = absenceList![popupIndex];
                   setState(() {});
                   getAbsenceDffStructure();
                 },
@@ -285,7 +278,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
             validateFieldData()
                 ? null
                 : () {
-                    validateAbsenceTransaction(selectedEmp);
+                    validateAbsenceTransaction(selectedEmp!.isEmpty ? null : selectedEmp);
                   },
           ).insideContainer
         ],

lib/ui/leave_balance/leave_balance_screen.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/leave_balance_api_client.dart';
-import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
@@ -14,8 +13,7 @@ import 'package:mohem_flutter_app/widgets/balances_dashboard_widget.dart';
 import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart';
 
 class LeaveBalance extends StatefulWidget {
-  final String selectedEmp;
+  LeaveBalance({Key? key}) : super(key: key);
-  LeaveBalance({this.selectedEmp = '', Key? key}) : super(key: key);
 
   @override
   _LeaveBalanceState createState() {
@@ -27,13 +25,18 @@ class _LeaveBalanceState extends State<LeaveBalance> {
   List<GetAbsenceTransactionList>? absenceTransList;
 
   DateTime accrualDateTime = DateTime.now();
-  dynamic dynamicParams;
+  String? employeeId;
-  String selectedEmp = "";
 
   @override
   void initState() {
     super.initState();
-    absenceTransList = [];
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      var dynamicParam = ModalRoute.of(context)!.settings.arguments;
+      if (dynamicParam != null) {
+        employeeId = dynamicParam.toString();
+      }
+      getAbsenceTransactions();
+    });
   }
 
   @override
@@ -44,7 +47,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
   void getAbsenceTransactions() async {
     try {
       Utils.showLoading(context);
-      absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999, empID: selectedEmp);
+      absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999, employeeId);
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -55,33 +58,23 @@ class _LeaveBalanceState extends State<LeaveBalance> {
 
   @override
   Widget build(BuildContext context) {
-    if (dynamicParams == null) {
-      dynamicParams = ModalRoute.of(context)!.settings.arguments;
-      if (dynamicParams!= null && dynamicParams.isNotEmpty) {
-        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
-        selectedEmp = dynamicParams;
-        getAbsenceTransactions();
-      } else {
-        getAbsenceTransactions();
-      }
-    }
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: AppBarWidget(
         context,
         title: LocaleKeys.leaveBalance.tr(),
       ),
-      body: ListView(
+      body: absenceTransList == null
+          ? const SizedBox()
+          : (absenceTransList!.isEmpty
+              ? Utils.getNoDataWidget(context).paddingOnly(top: 50)
+              : ListView(
                   physics: const BouncingScrollPhysics(),
                   padding: const EdgeInsets.all(21),
                   children: [
-          BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp),
+                    BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp: employeeId),
                     12.height,
-          absenceTransList == null
+                    ListView.separated(
-              ? const SizedBox()
-              : (absenceTransList!.isEmpty
-                  ? Utils.getNoDataWidget(context).paddingOnly(top: 50)
-                  : ListView.separated(
                         physics: const NeverScrollableScrollPhysics(),
                         shrinkWrap: true,
                         padding: EdgeInsets.zero,
@@ -109,9 +102,9 @@ class _LeaveBalanceState extends State<LeaveBalance> {
                               ],
                             ).objectContainerView(),
                         separatorBuilder: (cxt, index) => 12.height,
-                      itemCount: absenceTransList!.length)),
+                        itemCount: absenceTransList!.length),
                   ],
-      ),
+                )),
       floatingActionButton: Container(
         height: 54,
         width: 54,
@@ -124,7 +117,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
         ),
         child: const Icon(Icons.add, color: Colors.white, size: 30),
       ).onPress(() {
-        Navigator.pushNamed(context, AppRoutes.addLeaveBalance, arguments: selectedEmp ?? '');
+        Navigator.pushNamed(context, AppRoutes.addLeaveBalance, arguments: employeeId);
       }),
     );
   }

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -5,7 +5,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/leave_balance_api_client.dart';
 import 'package:mohem_flutter_app/api/my_attendance_api_client.dart';
-import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@@ -431,9 +430,6 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   Widget build(BuildContext context) {
     if (dynamicParams == null) {
       dynamicParams = ModalRoute.of(context)!.settings.arguments as DynamicListViewParams;
-      if (dynamicParams!.selectedEmp.isNotEmpty) {
-        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams!.selectedEmp;
-      }
       getTransactionsStructure();
     }
     return Scaffold(
@@ -627,7 +623,10 @@ 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>(value: i, child: Column(
+                    for (int i = 0; i < model.eSERVICESVS!.length; i++)
+                      PopupMenuItem<int>(
+                          value: i,
+                          child: Column(
                             children: [
                               Text(model.eSERVICESVS![i].vALUECOLUMNNAME!),
                               const PopupMenuDivider(),

lib/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart

@@ -21,10 +21,10 @@ class DynamicListViewParams {
   bool isUpdate;
 
   List<CollectionNotificationEit>? collectionNotificationList;
-  final String selectedEmp;
+  final String? selectedEmp;
 
   DynamicListViewParams(this.title, this.dynamicId,
-      {this.selectedEmp = '', this.uRL = 'GET_EIT_DFF_STRUCTURE', this.requestID = '', this.colsURL = '', this.isUpdate = false, this.collectionNotificationList});
+      {this.selectedEmp, this.uRL = 'GET_EIT_DFF_STRUCTURE', this.requestID = '', this.colsURL = '', this.isUpdate = false, this.collectionNotificationList});
 }
 
 class DynamicListViewScreen extends StatefulWidget {
@@ -54,7 +54,6 @@ class _DynamicListViewScreenState extends State<DynamicListViewScreen> {
       getEITTransactionList?.forEach((element) {
         element.collectionTransaction = element.collectionTransaction?.where((elemen) => elemen.dISPLAYFLAG == "Y").toList() ?? [];
       });
-
       getEITTransactionList = getEITTransactionList?.where((element) => element.collectionTransaction?.isNotEmpty ?? false).toList() ?? [];
       Utils.hideLoading(context);
       setState(() {});
@@ -94,7 +93,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, showLoading: false), 12.height],
         getEITTransactionList == null
             ? const SizedBox()
             : (getEITTransactionList!.isEmpty

lib/ui/my_attendance/services_menu_list_screen.dart

@@ -17,9 +17,9 @@ import 'package:provider/provider.dart';
 class ServicesMenuListScreenParams {
   final String title;
   final List<GetMenuEntriesList> list;
-  final String selectedEmp;
+  final String? selectedEmp;
   GetEmployeeSubordinatesList? getEmployeeSubordinates;
-  ServicesMenuListScreenParams(this.title, this.list, {this.selectedEmp =''});
+  ServicesMenuListScreenParams(this.title, this.list, {this.selectedEmp});
 }
 
 class ServicesMenuListScreen extends StatelessWidget {
@@ -54,11 +54,12 @@ class ServicesMenuListScreen extends StatelessWidget {
                         }
                         return;
                       } else if (servicesMenuData.list[index].requestType == "ABSENCE") {
-                        Navigator.pushNamed(context, AppRoutes.leaveBalance, arguments: servicesMenuData?.selectedEmp ??'');
+                        Navigator.pushNamed(context, AppRoutes.leaveBalance, arguments: servicesMenuData.selectedEmp);
                         return;
                       }
                       if (servicesMenuData.list[index].requestType == "EIT") {
-                        Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!, selectedEmp: servicesMenuData.selectedEmp));
+                        Navigator.pushNamed(context, AppRoutes.dynamicScreen,
+                            arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!, selectedEmp: servicesMenuData.selectedEmp));
                       } else {
                         if (servicesMenuData.list[index].requestType == "TERMINATION") {
                           Navigator.pushNamed(context, AppRoutes.endEmploymentScreen,

lib/ui/my_team/create_request.dart

@@ -68,7 +68,8 @@ class _CreateRequestState extends State<CreateRequest> {
   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!, selectedEmp: getEmployeeSubordinates?.eMPLOYEENUMBER ?? ''));
+        Navigator.pushNamed(context, AppRoutes.dynamicScreen,
+            arguments: DynamicListViewParams(menu.menuEntry.prompt!, menu.menuEntry.functionName!, selectedEmp: getEmployeeSubordinates?.eMPLOYEENUMBER ?? ''));
       } else {}
     } else {
       Navigator.pushNamed(context, AppRoutes.servicesMenuListScreen,

lib/widgets/balances_dashboard_widget.dart

@@ -31,9 +31,10 @@ class BalancesDashboardWidget extends StatefulWidget {
   final String title;
   final List<PieChartModel> chartModelList;
   final bool isLeaveBalance;
-  final String selectedEmp;
+  final String? selectedEmp;
+  final bool showLoading;
 
-  const BalancesDashboardWidget(this.title, this.isLeaveBalance, this.selectedEmp, {Key? key, this.chartModelList = const []}) : super(key: key);
+  const BalancesDashboardWidget(this.title, this.isLeaveBalance, {Key? key, this.selectedEmp, this.showLoading = true, this.chartModelList = const []}) : super(key: key);
 
   @override
   _BalancesDashboardWidgetState createState() {
@@ -46,14 +47,12 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
   late DateTime accrualDateTime;
   GetAccrualBalancesList? leaveBalanceAccrual;
   List<GetAccrualBalancesList>? ticketBalanceAccrualList;
-  dynamic dynamicParams;
-  String selectedEmp = "";
 
   @override
   void initState() {
     super.initState();
     accrualDateTime = DateTime.now();
-    changeAccrualDate();
+    changeAccrualDate(widget.showLoading);
   }
 
   @override
@@ -61,9 +60,9 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
     super.dispose();
   }
 
-  void changeAccrualDate() async {
+  void changeAccrualDate(bool showLoading) async {
     try {
-      // Utils.showLoading(context);
+      if (showLoading) Utils.showLoading(context);
       List<GetAccrualBalancesList> accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy").format(accrualDateTime), empID: widget.selectedEmp);
       if (accrualList.isNotEmpty) {
         if (widget.isLeaveBalance) {
@@ -80,10 +79,10 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
           ];
         }
       }
-      // Utils.hideLoading(context);
+      if (showLoading) Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
-      Utils.hideLoading(context);
+      if (showLoading) Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
     }
   }
@@ -125,7 +124,7 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
               DateTime selectedDate = await Utils.selectDate(context, accrualDateTime);
               if (selectedDate != accrualDateTime) {
                 accrualDateTime = selectedDate;
-                changeAccrualDate();
+                changeAccrualDate(true);
               }
             }),
           ],