leave balance issues fixed-2.

lib/api/leave_balance_api_client.dart

@@ -143,9 +143,9 @@ class LeaveBalanceApiClient {
 
   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, "P_SELECTED_RESP_ID": pSelectedResopID, "P_COMMENTS": comments, "P_MENU_TYPE": "E", 'P_SELECTED_EMPLOYEE_NUMBER': empID};
+    Map<String, dynamic> postParams = {"P_TRANSACTION_ID": pTransactionID, "P_SELECTED_RESP_ID": pSelectedResopID, "P_COMMENTS": comments, "P_MENU_TYPE": "E"};
     postParams.addAll(AppState().postParamsJson);
-
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
       return responseData.startAbsenceApprovalProccess!;

lib/api/worklist/worklist_api_client.dart

@@ -157,7 +157,7 @@ class WorkListApiClient {
       "P_PAGE_NUM": 1,
     };
     postParams.addAll(AppState().postParamsJson);
-    postParams["P_SELECTED_EMPLOYEE_NUMBER"] = selectedEmployeeNumber;
+    if (selectedEmployeeNumber != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = selectedEmployeeNumber;
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
       return responseData.memberInformationList![0];

lib/ui/leave_balance/add_leave_balance_screen.dart

@@ -142,7 +142,8 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
 
       Utils.hideLoading(context);
 
-      var res = await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen, arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submit.pTRANSACTIONID!, "", "add_leave_balance"));
+      var res = await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
+          arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submit.pTRANSACTIONID!, "", "add_leave_balance", selectedEmployeeID: selectedID));
       if (res != null && res == true) {
         Utils.showLoading(context);
       }
@@ -278,7 +279,7 @@ class _AddLeaveBalanceScreenState extends State<AddLeaveBalanceScreen> {
             validateFieldData()
                 ? null
                 : () {
-                    validateAbsenceTransaction(selectedEmp!.isEmpty ? null : selectedEmp);
+                    validateAbsenceTransaction(selectedEmp);
                   },
           ).insideContainer
         ],

lib/ui/misc/request_submit_screen.dart

@@ -31,13 +31,13 @@ class RequestSubmitScreenParams {
   int transactionId;
   String pItemId;
   String approvalFlag;
+  String? selectedEmployeeID;
 
-  RequestSubmitScreenParams(this.title, this.transactionId, this.pItemId, this.approvalFlag);
+  RequestSubmitScreenParams(this.title, this.transactionId, this.pItemId, this.approvalFlag, {this.selectedEmployeeID});
 }
 
 class RequestSubmitScreen extends StatefulWidget {
-  final String selectedEmp;
+  RequestSubmitScreen({Key? key}) : super(key: key);
-  RequestSubmitScreen({this.selectedEmp ='',Key? key}) : super(key: key);
 
   @override
   _RequestSubmitScreenState createState() {
@@ -64,7 +64,6 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
     try {
       Utils.showLoading(context);
       approverList = await MyAttendanceApiClient().getApproversList("SSHRMS", params!.transactionId);
-
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -123,12 +122,7 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
           params!.transactionId,
         );
       } else if (params!.approvalFlag == 'add_leave_balance') {
-        await LeaveBalanceApiClient().startAbsenceApprovalProcess(
+        await LeaveBalanceApiClient().startAbsenceApprovalProcess(params!.transactionId, comments.text, -999, empID: params!.selectedEmployeeID);
-          params!.transactionId,
-          comments.text,
-          -999,
-          empID: widget.selectedEmp
-        );
       } else if (params!.approvalFlag == 'eit') {
         await MyAttendanceApiClient().startEitApprovalProcess(
           "SUBMIT",

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -43,7 +43,6 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   void getTransactionsStructure() async {
     try {
       Utils.showLoading(context);
-
       genericResponseModel = await MyAttendanceApiClient().getEitDffStructure(dynamicParams!.dynamicId, dynamicParams!.selectedEmp);
       dESCFLEXCONTEXTCODE = genericResponseModel!.pDESCFLEXCONTEXTCODE ?? "";
       descFlexConTextTitle = genericResponseModel!.pDESCFLEXCONTEXTNAME ?? "";
@@ -91,9 +90,8 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_EXTRA_INFO_ID", nUMBERVALUE: -1, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
       values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_OBJECT_VERSION_NUMBER", nUMBERVALUE: 0, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
 
-      genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp ?? '');
+      genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp);
-      SubmitEITTransactionList submitEITTransactionList =
+      SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp);
-          await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp ?? '');
       Utils.hideLoading(context);
       await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
           arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit'));
@@ -130,7 +128,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
             .toList();
 
         List<ESERVICESVS> eServicesResponseModel = await MyAttendanceApiClient().getValueSetValues(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!, values,
-            empID: dynamicParams!.selectedEmp ?? '', parentValue: structureList.eSERVICESDV!.pVALUECOLUMNNAME);
+            empID: dynamicParams!.selectedEmp, parentValue: structureList.eSERVICESDV!.pVALUECOLUMNNAME);
         List<GetEITDFFStructureList> abc = genericResponseModel?.getEITDFFStructureList ?? [];
         getEitDffStructureList = abc;
         int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == segmentId);

lib/ui/my_team/employee_details.dart

@@ -69,9 +69,10 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
     return Scaffold(
       extendBody: true,
       backgroundColor: MyColors.lightGreyEFColor,
-        body: Stack(children: [
+      body: Stack(
-          getEmployeeSubordinates!.eMPLOYEEIMAGE != null ?
+        children: [
-          Container(
+          getEmployeeSubordinates!.eMPLOYEEIMAGE != null
+              ? Container(
                   height: 200,
                   margin: EdgeInsets.only(top: 30),
                   decoration: BoxDecoration(image: DecorationImage(image: MemoryImage(Utils.dataFromBase64String(getEmployeeSubordinates!.eMPLOYEEIMAGE!)), fit: BoxFit.cover)),
@@ -81,7 +82,8 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
                       decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)),
                     ),
                   ),
-          ) : Container(
+                )
+              : Container(
                   decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)),
                 ),
           SingleChildScrollView(
@@ -95,15 +97,13 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
-                      IconButton(
+                      CircleAvatar(
-                        onPressed: () {
+                        radius: 18,
+                        backgroundColor: Colors.black.withOpacity(.21),
+                        child: const Icon(Icons.arrow_back_ios_rounded, color: Colors.white, size: 18).paddingOnly(right: 4),
+                      ).onPress(() {
                         Navigator.pop(context);
-                        },
+                      }),
-                        icon: Icon(
-                          Icons.arrow_back_ios,
-                          color: Colors.white,
-                        ),
-                      ),
                     ],
                   ),
                 ),
@@ -111,7 +111,9 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
               ],
             ),
           )
-        ]));
+        ],
+      ),
+    );
   }
 
   Widget myTeamInfo() {
@@ -202,16 +204,8 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
   }
 
   Widget ProfileImage() => getEmployeeSubordinates?.eMPLOYEEIMAGE == null
-      ? SvgPicture.asset(
+      ? SvgPicture.asset("assets/images/user.svg", height: 68, width: 68)
-          "assets/images/user.svg",
+      : CircleAvatar(radius: 68, backgroundImage: MemoryImage(Utils.getPostBytes(getEmployeeSubordinates?.eMPLOYEEIMAGE)), backgroundColor: Colors.black);
-          height: 68,
-          width: 68,
-        )
-      : CircleAvatar(
-          radius: 68,
-          backgroundImage: MemoryImage(Utils.getPostBytes(getEmployeeSubordinates?.eMPLOYEEIMAGE)),
-          backgroundColor: Colors.black,
-        );
 
   void setMenu() {
     menu = [
@@ -260,7 +254,8 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
                 ? SvgPicture.asset(
                     "assets/images/user.svg",
                     height: 68,
-          width: 68,)
+                    width: 68,
+                  )
                 : CircleAvatar(
                     radius: 68,
                     backgroundImage: MemoryImage(Utils.dataFromBase64String(getEmployeeSubordinates!.eMPLOYEEIMAGE!)),