profle dynamic forms

lib/api/profile_api_client.dart

@@ -11,6 +11,7 @@ import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart';
 import 'package:mohem_flutter_app/models/get_employee_phones_model.dart';
 import 'package:mohem_flutter_app/models/profile/phone_number_types_modek.dart';
 import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
+import 'package:mohem_flutter_app/models/start_eit_approval_process_model.dart';
 import 'api_client.dart';
 
 class ProfileApiClient {
@@ -135,11 +136,36 @@ class ProfileApiClient {
 
   Future<SubmitPhonesTransactionList> submitPhoneNumbers(List<GetEmployeePhonesList> empList) async {
     String url = "${ApiConsts.erpRest}SUBMIT_PHONES_TRANSACTION";
-    Map<String, dynamic> postParams = {"P_MENU_TYPE": "E", "P_SELECTED_RESP_ID": -999, "P_FUNCTION_NAME": "HR_PERINFO_SS", "P_MBL_PHONES_TBL": empList};
+    Map<String, dynamic> postParams = {
+      "P_MENU_TYPE": "E",
+      "P_SELECTED_RESP_ID": -999,
+      "P_FUNCTION_NAME": "HR_PERINFO_SS",
+      "P_MBL_PHONES_TBL": empList.map((element) {
+        return element.toJson();
+      }).toList()
+    };
+
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+      return SubmitPhonesTransactionList.fromJson(responseData.submitPhonesTransactionList ?? {});
+    }, url, postParams);
+  }
+
+  Future<StartEitApprovalProcess?> startPhoneApprovalProcess(String action, String comments, String itemKey, int transactionId) async {
+    String url = "${ApiConsts.erpRest}START_PHONES_APPROVAL_PROCESS";
+    Map<String, dynamic> postParams = {
+      "P_SELECTED_RESP_ID": -999,
+      "P_MENU_TYPE": "E",
+      "P_ACTION_MODE": action,
+      "P_COMMENTS": comments,
+      "P_ITEM_KEY": itemKey,
+      "P_TRANSACTION_ID": transactionId,
+    };
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
-      return responseData.submitPhonesTransactionList ?? SubmitPhonesTransactionList();
+      return responseData.startEitApprovalProcess;
     }, url, postParams);
   }
 }

lib/models/generic_response_model.dart

@@ -277,7 +277,7 @@ class GenericResponseModel {
   String? submitContactTransactionList;
   SubmitEITTransactionList? submitEITTransactionList;
   String? submitHrTransactionList;
-  SubmitPhonesTransactionList? submitPhonesTransactionList;
+  Map<String, dynamic>? submitPhonesTransactionList;
   String? submitSITTransactionList;
   String? submitTermTransactionList;
   List<SubordinatesLeavesList>? subordinatesOnLeavesList;

lib/ui/misc/request_submit_screen.dart

@@ -5,6 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.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/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
@@ -25,8 +26,8 @@ class RequestSubmitScreenParams {
   String title;
   int transactionId;
   String pItemId;
-
+  String approvalFlag;
-  RequestSubmitScreenParams(this.title, this.transactionId, this.pItemId);
+  RequestSubmitScreenParams(this.title, this.transactionId, this.pItemId, this.approvalFlag);
 }
 
 class RequestSubmitScreen extends StatefulWidget {
@@ -83,12 +84,23 @@ class _RequestSubmitScreenState extends State<RequestSubmitScreen> {
         });
       }
       await MyAttendanceApiClient().addAttachment(list);
-      await MyAttendanceApiClient().startEitApprovalProcess(
+
-        "SUBMIT",
+      if (params!.approvalFlag == 'phone_numbers') {
-        comments.text,
+        await ProfileApiClient().startPhoneApprovalProcess(
-        params!.pItemId,
+          "SUBMIT",
-        params!.transactionId,
+          comments.text,
-      );
+          params!.pItemId,
+          params!.transactionId,
+        );
+      } else {
+        await MyAttendanceApiClient().startEitApprovalProcess(
+          "SUBMIT",
+          comments.text,
+          params!.pItemId,
+          params!.transactionId,
+        );
+      }
+
       Utils.hideLoading(context);
       Utils.showToast(LocaleKeys.yourRequestHasBeenSubmittedForApprovals.tr(), longDuration: true);
       Navigator.of(context).popUntil((route) {

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -79,7 +79,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
       SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
       Utils.hideLoading(context);
-      Navigator.pushNamed(context, AppRoutes.requestSubmitScreen, arguments: RequestSubmitScreenParams("title", submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!));
+      Navigator.pushNamed(context, AppRoutes.requestSubmitScreen, arguments: RequestSubmitScreenParams("title", submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit'));
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);

lib/ui/my_attendance/my_attendance_screen.dart

@@ -32,13 +32,14 @@ class MyAttendanceScreen extends StatelessWidget {
               ? LocaleKeys.noDataAvailable.tr().toText16().center
               : Column(
                   children: [
-                    itemView(
+                    //commenting this because missing wipe coming as duplicate in the screen
-                      "assets/images/pdf.svg",
+                    // itemView(
-                      LocaleKeys.missingSwipes.tr(),
+                    //   "assets/images/pdf.svg",
-                    ).onPress(() {
+                    //   LocaleKeys.missingSwipes.tr(),
-                      Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(LocaleKeys.missingSwipes.tr(), "HMG_OTL_MISSING_SWIPE_EIT_SS"));
+                    // ).onPress(() {
-                    }),
+                    //   Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(LocaleKeys.missingSwipes.tr(), "HMG_OTL_MISSING_SWIPE_EIT_SS"));
-                    12.height,
+                    // }),
+                    //  12.height,
                     ListView.separated(
                             padding: const EdgeInsets.all(21),
                             itemBuilder: (cxt, index) => itemView(

lib/ui/profile/basic_details.dart

@@ -74,29 +74,13 @@ class _BasicDetailsState extends State<BasicDetails> {
           context,
           title: LocaleKeys.profile_basicDetails.tr(),
         ),
-        // appBar: AppBar(
-        //   backgroundColor: MyColors.white,
-        //   leading: Row(
-        //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        //     children: [
-        //       IconButton(
-        //         icon: const Icon(
-        //           Icons.arrow_back_ios,
-        //           color: MyColors.backgroundBlackColor,
-        //         ),
-        //         onPressed: () => Navigator.pop(context),
-        //       ),
-        //       "Basic Details".toText24(isBold: true, color: MyColors.blackColor),
-        //     ],
-        //   ),
-        // ),
         backgroundColor: MyColors.backgroundColor,
         bottomSheet: footer(),
         body: Column(
           children: [
             Container(
               width: double.infinity,
-              margin: EdgeInsets.only(top: 20, left: 21, right: 21,bottom: 20),
+              margin: EdgeInsets.only(top: 20, left: 21, right: 21, bottom: 20),
               padding: EdgeInsets.only(left: 14, right: 14, top: 13, bottom: 5),
               height: 280,
               decoration: BoxDecoration(

lib/ui/profile/contact_details.dart

@@ -84,7 +84,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                 left: 26,
                 right: 26,
               ),
-              padding: EdgeInsets.only(left: 14, right: 14, top: 5, bottom: 20),
+              padding: EdgeInsets.all(15),
 
               ///height: 200,
               decoration: BoxDecoration(
@@ -99,7 +99,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                 color: Colors.white,
                 borderRadius: BorderRadius.circular(10.0),
               ),
-              child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+              child: Stack(children: [
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
@@ -122,17 +122,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                               "${e.pHONENUMBER}".toText16(isBold: true, color: MyColors.blackColor),
                             ]))
                         .toList())
-              ])
+              ])),
-
-              // [
-              //   "${getEmployeePhonesList[0].pHONETYPEMEANING}".toText13(color: MyColors.lightGrayColor),
-              //   "${getEmployeePhonesList[0].pHONENUMBER}".toText16(isBold: true, color: MyColors.blackColor),
-              //   SizedBox(
-              //     height: 20,),
-              //   "${getEmployeePhonesList[1].pHONETYPEMEANING}".toText13(color: MyColors.lightGrayColor),
-              //   "${getEmployeePhonesList[1].pHONENUMBER}".toText16(isBold: true, color: MyColors.blackColor),
-              // ]
-              ),
           Container(
               width: double.infinity,
               margin: EdgeInsets.only(
@@ -140,8 +130,8 @@ class _ContactDetailsState extends State<ContactDetails> {
                 left: 26,
                 right: 26,
               ),
-              padding: EdgeInsets.only(left: 14, right: 14, top: 5, bottom: 20),
+              padding: EdgeInsets.all(15),
-              height: 400,
+              // height: 400,
               decoration: BoxDecoration(
                 boxShadow: [
                   BoxShadow(
@@ -154,7 +144,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                 color: Colors.white,
                 borderRadius: BorderRadius.circular(10.0),
               ),
-              child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+              child: Stack(children: [
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
@@ -179,36 +169,6 @@ class _ContactDetailsState extends State<ContactDetails> {
                             ]))
                         .toList())
               ]))
-          // "${getEmployeeAddressList[0].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
-          // "${getEmployeeAddressList[0].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
-          // SizedBox(
-          //   height: 20,
-          // ),
-          // "${getEmployeeAddressList[2].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
-          // "${getEmployeeAddressList[2].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
-          // SizedBox(
-          //   height: 20,
-          // ),
-          // "${getEmployeeAddressList[3].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
-          // "${getEmployeeAddressList[3].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
-          // SizedBox(
-          //   height: 20,
-          // ),
-          // "${getEmployeeAddressList[4].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
-          // "${getEmployeeAddressList[4].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
-          // SizedBox(
-          //   height: 20,
-          // ),
-          // "${getEmployeeAddressList[5].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
-          // "${getEmployeeAddressList[5].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
-          // SizedBox(
-          //   height: 20,
-          // ),
-          // "${getEmployeeAddressList[6].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
-          // "${getEmployeeAddressList[6].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
-          //]),
-          //),
-          //],
         ])));
   }
 

lib/ui/profile/dynamic_screens/dynamic_input_profile_screen.dart

@@ -1,23 +1,25 @@
 import 'dart:io';
 
-
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.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/classes/utils.dart';
+import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_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/dyanmic_forms/get_set_values_request_model.dart';
+import 'package:mohem_flutter_app/models/dyanmic_forms/validate_eit_transaction_model.dart';
 import 'package:mohem_flutter_app/models/generic_response_model.dart';
 import 'package:mohem_flutter_app/models/get_eit_dff_structure_list_model.dart';
 import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart';
 import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart';
 import 'package:mohem_flutter_app/models/profile/basic_details_cols_structions.dart';
 import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
+import 'package:mohem_flutter_app/ui/misc/request_submit_screen.dart';
 import 'package:mohem_flutter_app/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
@@ -31,7 +33,6 @@ class DynamicProfileParams {
   String colsURL;
   List<GetEmployeeBasicDetailsList>? getEmployeeBasicDetailsList;
 
-
   DynamicProfileParams(this.title, this.dynamicId,
       {this.uRL = 'GET_EIT_DFF_STRUCTURE', this.requestID = '', this.colsURL = '', this.getEmployeeBasicDetailsList = const <GetEmployeeBasicDetailsList>[]});
 }
@@ -51,6 +52,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
   List<GetBasicDetColsStructureList>? getBasicDetColsStructureList;
   DynamicProfileParams? dynamicParams;
 
+  String dESCFLEXCONTEXTCODE = "";
   @override
   void initState() {
     super.initState();
@@ -153,11 +155,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
           // 12.height,
           DefaultButton(
             LocaleKeys.next.tr(),
-            (getBasicDetDffStructureList ?? []).isEmpty
+            (getBasicDetDffStructureList ?? []).isEmpty ? null : () => {validateTransaction()},
-                ? null
-                : () => {
-                      //Navigator.of(context).pushNamed(LOGIN_TYPE)
-                    },
           ).insideContainer,
         ],
       ),
@@ -194,7 +192,6 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
         isReadOnly: model.rEADONLY == "Y",
         onChange: (text) {
           getBasicDetDffStructureList![index].userBasicDetail!.sEGMENTVALUEDSP = text;
-
         },
       ).paddingOnly(bottom: 12);
     } else if (model.fORMATTYPE == "X") {
@@ -326,4 +323,47 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
     }
     return time;
   }
+
+  void validateTransaction() async {
+    try {
+      Utils.showLoading(context);
+      List<Map<String, dynamic>> values = getBasicDetDffStructureList!.map((e) {
+        String tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
+        if (e.fORMATTYPE == "X") {
+          // for date format type, date format is changed
+          tempVar = e.eSERVICESDV?.pVALUECOLUMNNAME ?? "";
+          if (tempVar.isNotEmpty) {
+            DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
+            tempVar = DateFormat('yyyy/MM/dd HH:mm:ss').format(date);
+          }
+        }
+        return ValidateEitTransactionModel(dATEVALUE: null, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: tempVar.toString()).toJson();
+      }).toList();
+
+      values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_ACTION", nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: "NEW_ROW").toJson());
+      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());
+      List<Map<String, dynamic>> valuesCols = getBasicDetColsStructureList!.map((e) {
+        String tempVar = e.userBasicDetail!.vARCHAR2VALUE ?? "";
+        if (e.dATATYPE == "DATE") {
+          // for date format type, date format is changed
+          tempVar = e.userBasicDetail!.dATEVALUE ?? "";
+          if (tempVar.isNotEmpty) {
+            DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
+            tempVar = DateFormat('yyyy/MM/dd HH:mm:ss').format(date);
+          }
+        }
+        return ValidateEitTransactionModel(dATEVALUE: tempVar, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: tempVar.toString()).toJson();
+      }).toList();
+      List<Map<String, dynamic>> transactionValues = new List.from(values)..addAll(valuesCols);
+      print(transactionValues);
+      //genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
+      // SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
+      Utils.hideLoading(context);
+      // Navigator.pushNamed(context, AppRoutes.requestSubmitScreen, arguments: RequestSubmitScreenParams("title", submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit'));
+    } catch (ex) {
+      Utils.hideLoading(context);
+      Utils.handleException(ex, context, null);
+    }
+  }
 }

lib/ui/profile/phone_numbers.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/profile_api_client.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';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
@@ -14,6 +15,7 @@ import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart';
 import 'package:mohem_flutter_app/models/get_employee_phones_model.dart';
 import 'package:mohem_flutter_app/models/profile/phone_number_types_modek.dart';
 import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
+import 'package:mohem_flutter_app/ui/misc/request_submit_screen.dart';
 import 'package:mohem_flutter_app/ui/profile/profile.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
@@ -174,15 +176,19 @@ class _PhoneNumbersState extends State<PhoneNumbers> {
     Utils.showLoading(context);
     setUpdateStatus();
     submitPhoneNumbers = await ProfileApiClient().submitPhoneNumbers(widget.getEmployeePhonesList);
-    setState(() {});
-    Utils.hideLoading(context);
 
-    print(widget.getEmployeePhonesList);
+    Utils.hideLoading(context);
+    Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
+        arguments: RequestSubmitScreenParams(LocaleKeys.profile_contactDetails.tr(), submitPhoneNumbers.pTRANSACTIONID!, submitPhoneNumbers.pITEMKEY!, 'phone_numbers'));
   }
 
   void setUpdateStatus() {
     widget.getEmployeePhonesList.forEach((element) {
-      if (element.aCTION == null) element.aCTION = 'UPDATE_ROW';
+      if (element.aCTION == null) {
+        element.aCTION = 'UPDATE_ROW';
+        element.dATEFROM = '';
+        element.dATETO = '';
+      }
     });
   }
 

lib/ui/screens/profile/profile_screen.dart

@@ -27,7 +27,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
   @override
   void initState() {
     super.initState();
+
     memberInformationList = AppState().memberInformationList!;
+
+    setState(() {});
     //getEmployeeBasicDetails();
   }