fix issues

lib/api/dashboard_api_client.dart

@@ -65,10 +65,13 @@ class DashboardApiClient {
     }, url, postParams);
   }
 
-  Future<List<GetAccrualBalancesList>> getAccrualBalances(String effectiveDate) async {
+  Future<List<GetAccrualBalancesList>> getAccrualBalances(String effectiveDate, {String? empID}) async {
     String url = "${ApiConsts.erpRest}GET_ACCRUAL_BALANCES";
     Map<String, dynamic> postParams = {"P_EFFECTIVE_DATE": effectiveDate};
     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.getAccrualBalancesList ?? [];

lib/api/leave_balance_api_client.dart

@@ -17,27 +17,33 @@ class LeaveBalanceApiClient {
 
   factory LeaveBalanceApiClient() => _instance;
 
-  Future<List<GetAbsenceTransactionList>> getAbsenceTransactions(int pSelectedResopID) 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) {
+      postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
+    }
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.getAbsenceTransactionList ?? [];
     }, url, postParams);
   }
 
-  Future<List<GetAbsenceAttendanceTypesList>> getAbsenceAttendanceTypes() async {
+  Future<List<GetAbsenceAttendanceTypesList>> getAbsenceAttendanceTypes({String? empID}) async {
     String url = "${ApiConsts.erpRest}GET_ABSENCE_ATTENDANCE_TYPES";
     Map<String, dynamic> postParams = {};
     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.getAbsenceAttendanceTypesList ?? [];
     }, url, postParams);
   }
 
-  Future<CalculateAbsenceDuration> calculateAbsenceDuration(int pAbsenceAttendanceTypeID, String pDateStart, String pDateEnd, int pSelectedResopID) async {
+  Future<CalculateAbsenceDuration> calculateAbsenceDuration(int pAbsenceAttendanceTypeID, String pDateStart, String pDateEnd, int pSelectedResopID, {String? empID}) async {
     String url = "${ApiConsts.erpRest}CALCULATE_ABSENCE_DURATION";
     Map<String, dynamic> postParams = {
       "P_ABSENCE_ATTENDANCE_TYPE_ID": pAbsenceAttendanceTypeID,
@@ -49,16 +55,22 @@ class LeaveBalanceApiClient {
       "P_TIME_START": null,
     };
     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.calculateAbsenceDuration!;
     }, url, postParams);
   }
 
-  Future<List<GetAbsenceDffStructureList>> getAbsenceDffStructure(String pDescFlexContextCode, String pFunctionName, int pSelectedResopID) async {
+  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};
     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.getAbsenceDffStructureList ?? [];
@@ -67,7 +79,7 @@ class LeaveBalanceApiClient {
 
   Future<GenericResponseModel> validateAbsenceTransaction(
       String pDescFlexContextCode, String pFunctionName, int pAbsenceAttendanceTypeID, String pReplacementUserName, String pDateStart, String pDateEnd, int pSelectedResopID, Map<String, String?> data,
-      {String comments = ""}) async {
+      {String comments = "", String? empID}) async {
     String url = "${ApiConsts.erpRest}VALIDATE_ABSENCE_TRANSACTION";
     Map<String, dynamic> postParams = {
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
@@ -86,6 +98,9 @@ class LeaveBalanceApiClient {
     };
     postParams.addAll(data);
     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;
@@ -94,7 +109,7 @@ class LeaveBalanceApiClient {
 
   Future<SumbitAbsenceTransactionList> submitAbsenceTransaction(
       String pDescFlexContextCode, String pFunctionName, int pAbsenceAttendanceTypeID, String pReplacementUserName, String pDateStart, String pDateEnd, int pSelectedResopID, Map<String, String?> data,
-      {String comments = ""}) async {
+      {String comments = "", String? empID}) async {
     String url = "${ApiConsts.erpRest}SUBMIT_ABSENCE_TRANSACTION";
     Map<String, dynamic> postParams = {
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
@@ -113,6 +128,9 @@ class LeaveBalanceApiClient {
     };
     postParams.addAll(data);
     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.sumbitAbsenceTransactionList!;
@@ -129,7 +147,7 @@ class LeaveBalanceApiClient {
     }, url, postParams);
   }
 
-  Future<StartAbsenceApprovalProccess> startAbsenceApprovalProcess(int pTransactionID, String comments, int pSelectedResopID) 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 = {
       "P_TRANSACTION_ID": pTransactionID,
@@ -138,6 +156,9 @@ class LeaveBalanceApiClient {
       "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/classes/consts.dart

@@ -1,7 +1,7 @@
 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/ui/leave_balance/add_leave_balance_screen.dart

@@ -4,6 +4,7 @@ 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';
@@ -24,7 +25,8 @@ 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 {
-  AddLeaveBalanceScreen({Key? key}) : super(key: key);
+  final String selectedEmp;
+  AddLeaveBalanceScreen({this.selectedEmp ='',Key? key}) : super(key: key);
 
   @override
   _AddLeaveBalanceScreenState createState() {
@@ -43,6 +45,8 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
   String comment = "";
   ReplacementList? selectedReplacementEmployee;
 
+  dynamic dynamicParams;
+  String selectedEmp ="";
   DateTime selectedDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day);
 
   @override
@@ -54,7 +58,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
   void getAbsenceAttendanceTypes() async {
     try {
       Utils.showLoading(context);
-      absenceList = await LeaveBalanceApiClient().getAbsenceAttendanceTypes();
+      absenceList = await LeaveBalanceApiClient().getAbsenceAttendanceTypes(empID: selectedEmp);
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -67,7 +71,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
     try {
       Utils.showLoading(context);
       getabsenceDffStructureList.clear();
-      getabsenceDffStructureList = await LeaveBalanceApiClient().getAbsenceDffStructure(selectedAbsenceType!.dESCFLEXCONTEXTCODE!, "HR_LOA_SS", -999);
+      getabsenceDffStructureList = await LeaveBalanceApiClient().getAbsenceDffStructure(selectedAbsenceType!.dESCFLEXCONTEXTCODE!, "HR_LOA_SS", -999, empID: selectedEmp);
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -80,7 +84,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
     try {
       Utils.showLoading(context);
       CalculateAbsenceDuration duration = await LeaveBalanceApiClient()
-          .calculateAbsenceDuration(selectedAbsenceType!.aBSENCEATTENDANCETYPEID!, Utils.getMonthNamedFormat(startDateTime!), Utils.getMonthNamedFormat(endDateTime!), -999);
+          .calculateAbsenceDuration(selectedAbsenceType!.aBSENCEATTENDANCETYPEID!, Utils.getMonthNamedFormat(startDateTime!), Utils.getMonthNamedFormat(endDateTime!), -999, empID: selectedEmp);
 
       totalDays = duration.pABSENCEDAYS?.toInt();
       Utils.hideLoading(context);
@@ -119,7 +123,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
               DateUtil.getFormattedDate(endDateTime!, "MM/dd/yyyy"),
               -999,
               dffDataMap,
-              comments: comment);
+              comments: comment,empID: selectedEmp );
 
       SumbitAbsenceTransactionList submit = await LeaveBalanceApiClient().submitAbsenceTransaction(
           selectedAbsenceType!.dESCFLEXCONTEXTCODE!,
@@ -130,7 +134,8 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
           DateUtil.getFormattedDate(endDateTime!, "MM/dd/yyyy"),
           -999,
           dffDataMap,
-          comments: comment);
+          comments: comment,
+          empID: selectedEmp);
 
       Utils.hideLoading(context);
 
@@ -151,6 +156,18 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
 
   @override
   Widget build(BuildContext context) {
+    if (dynamicParams == null) {
+      dynamicParams = ModalRoute
+          .of(context)!
+          .settings
+          .arguments;
+      if (dynamicParams.isNotEmpty) {
+        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
+        selectedEmp =dynamicParams;
+        getAbsenceAttendanceTypes();
+
+      }
+    }
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: AppBarWidget(

lib/ui/leave_balance/leave_balance_screen.dart

@@ -1,6 +1,7 @@
 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';
@@ -8,12 +9,14 @@ import 'package:mohem_flutter_app/extensions/int_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/leave_balance/get_absence_transaction_list_model.dart';
+import 'package:mohem_flutter_app/ui/my_attendance/services_menu_list_screen.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 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 {
-  LeaveBalance({Key? key}) : super(key: key);
+  final String selectedEmp;
+  LeaveBalance({this.selectedEmp ='', Key? key}) : super(key: key);
 
   @override
   _LeaveBalanceState createState() {
@@ -25,12 +28,13 @@ class _LeaveBalanceState extends State<LeaveBalance> {
   List<GetAbsenceTransactionList>? absenceTransList;
 
   DateTime accrualDateTime = DateTime.now();
-
+  dynamic dynamicParams;
+  String selectedEmp ="";
   @override
   void initState() {
     super.initState();
 
-    getAbsenceTransactions();
+
   }
 
   @override
@@ -39,9 +43,9 @@ class _LeaveBalanceState extends State<LeaveBalance> {
   }
 
   void getAbsenceTransactions() async {
-    try {
+     try {
       Utils.showLoading(context);
-      absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999);
+      absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999, empID: selectedEmp);
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -52,6 +56,19 @@ class _LeaveBalanceState extends State<LeaveBalance> {
 
   @override
   Widget build(BuildContext context) {
+    if (dynamicParams == null) {
+      dynamicParams = ModalRoute
+          .of(context)!
+          .settings
+          .arguments;
+      if (dynamicParams.isNotEmpty) {
+        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
+        selectedEmp =dynamicParams;
+        getAbsenceTransactions();
+        // setState(() {});
+
+      }
+    }
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: AppBarWidget(
@@ -62,7 +79,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,),
           12.height,
           absenceTransList == null
               ? const SizedBox()
@@ -111,7 +128,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
         ),
         child: const Icon(Icons.add, color: Colors.white, size: 30),
       ).onPress(() {
-        Navigator.pushNamed(context, AppRoutes.addLeaveBalance);
+        Navigator.pushNamed(context, AppRoutes.addLeaveBalance, arguments: selectedEmp ??'');
       }),
     );
   }

lib/ui/misc/request_submit_screen.dart

@@ -8,6 +8,7 @@ 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/api/profile_api_client.dart';
 import 'package:mohem_flutter_app/api/termination_dff_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';
@@ -48,6 +49,8 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
 
   List<GetApprovesList> approverList = [];
   List<File> attachmentFiles = [];
+  dynamic dynamicParams;
+  String selectedEmp ="";
 
   @override
   void initState() {
@@ -121,6 +124,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
           params!.transactionId,
           comments.text,
           -999,
+          empID: selectedEmp
         );
       } else if (params!.approvalFlag == 'eit') {
         await MyAttendanceApiClient().startEitApprovalProcess(
@@ -155,6 +159,17 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
 
   @override
   Widget build(BuildContext context) {
+    if (dynamicParams == null) {
+      dynamicParams = ModalRoute
+          .of(context)!
+          .settings
+          .arguments;
+      if (dynamicParams.isNotEmpty) {
+        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
+        selectedEmp =dynamicParams;
+        submitRequest();
+      }
+    }
     if (params == null) {
       params = ModalRoute.of(context)!.settings.arguments as RequestSubmitScreenParams;
       getApproverList();

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -595,7 +595,9 @@ 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>(
+                      padding: EdgeInsets.all(10),
+                        child: Text(model.eSERVICESVS![i].vALUECOLUMNNAME!), value: i),
                 ],
             onSelected: (int popipIndex) async {
               ESERVICESDV eservicesdv = ESERVICESDV(

lib/ui/my_attendance/services_menu_list_screen.dart

@@ -54,7 +54,7 @@ class ServicesMenuListScreen extends StatelessWidget {
                         }
                         return;
                       } else if (servicesMenuData.list[index].requestType == "ABSENCE") {
-                        Navigator.pushNamed(context, AppRoutes.leaveBalance);
+                        Navigator.pushNamed(context, AppRoutes.leaveBalance, arguments: servicesMenuData?.selectedEmp ??'');
                         return;
                       }
                       if (servicesMenuData.list[index].requestType == "EIT") {

lib/ui/my_team/create_request.dart

@@ -69,7 +69,7 @@ class _CreateRequestState extends State<CreateRequest> {
 
     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??''));

lib/widgets/balances_dashboard_widget.dart

@@ -45,6 +45,8 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
   late DateTime accrualDateTime;
   GetAccrualBalancesList? leaveBalanceAccrual;
   List<GetAccrualBalancesList>? ticketBalanceAccrualList;
+  dynamic dynamicParams;
+  String selectedEmp ="";
 
   @override
   void initState() {
@@ -60,7 +62,7 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
   void changeAccrualDate() async {
     try {
       Utils.showLoading(context);
-      List<GetAccrualBalancesList> accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy").format(accrualDateTime));
+      List<GetAccrualBalancesList> accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy").format(accrualDateTime),empID: selectedEmp);
       if (accrualList.isNotEmpty) {
         if (widget.isLeaveBalance) {
           leaveBalanceAccrual = accrualList[0];
@@ -86,6 +88,17 @@ class _BalancesDashboardWidgetState extends State<BalancesDashboardWidget> {
 
   @override
   Widget build(BuildContext context) {
+    if (dynamicParams == null) {
+      dynamicParams = ModalRoute
+          .of(context)!
+          .settings
+          .arguments;
+      if (dynamicParams.isNotEmpty) {
+        AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams;
+        selectedEmp =dynamicParams;
+        changeAccrualDate();
+      }
+    }
     if (leaveBalanceAccrual == null && widget.isLeaveBalance) {
       leaveBalanceAccrual = Provider.of<DashboardProviderModel>(context, listen: false).leaveBalanceAccrual;
       chartModelList = [