diff --git a/lib/api/my_attendance_api_client.dart b/lib/api/my_attendance_api_client.dart
index c11885c..9bb16a8 100644
--- a/lib/api/my_attendance_api_client.dart
+++ b/lib/api/my_attendance_api_client.dart
@@ -22,8 +22,8 @@ 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('P_SELECTED_EMPLOYEE_NUMBER'.isNotEmpty){
+    //  postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
+    if (empID!.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
       // AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
       print(empID);
@@ -38,7 +38,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('P_SELECTED_EMPLOYEE_NUMBER'.isNotEmpty) {
+    if (empID!.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
     }
     return await ApiClient().postJsonForObject((json) {
@@ -47,21 +47,21 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
-  Future<List<ESERVICESVS>> getValueSetValues(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list,{ String? empID, String? parentValue}) async {
+  Future<List<ESERVICESVS>> getValueSetValues(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list, {String? empID, String? parentValue}) async {
     String url = "${ApiConsts.erpRest}GET_VALUE_SET_VALUES";
     Map<String, dynamic> postParams = {
       "P_SELECTED_RESP_ID": -999,
       "P_MENU_TYPE": "E",
       "P_PAGE_LIMIT": 1000,
       "P_PAGE_NUM": 1,
-       "P_PARENT_VALUE": empID!.isNotEmpty? parentValue : null,
+      "P_PARENT_VALUE": empID!.isNotEmpty ? parentValue : null,
       "P_SEGMENT_NAME": pSegmentName,
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
       "P_DESC_FLEX_NAME": pDescFlexName,
       "GetValueSetValuesTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if('P_SELECTED_EMPLOYEE_NUMBER'.isNotEmpty) {
+    if (empID.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
     }
     return await ApiClient().postJsonForObject((json) {
@@ -82,7 +82,7 @@ class MyAttendanceApiClient {
       "GetValueSetValuesTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if('P_SELECTED_EMPLOYEE_NUMBER'.isNotEmpty) {
+    if (empID!.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
     }
     return await ApiClient().postJsonForObject((json) {
@@ -91,7 +91,7 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
-  Future<GenericResponseModel?> validateEitTransaction(String pDescFlexContextCode, String pFunctionName, List<Map<String, dynamic>> list, { String? empID}) async {
+  Future<GenericResponseModel?> validateEitTransaction(String pDescFlexContextCode, String pFunctionName, List<Map<String, dynamic>> list, {String? empID}) async {
     String url = "${ApiConsts.erpRest}VALIDATE_EIT_TRANSACTION";
     Map<String, dynamic> postParams = {
       "P_SELECTED_RESP_ID": -999,
@@ -101,7 +101,7 @@ class MyAttendanceApiClient {
       "EITTransactionTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if('P_SELECTED_EMPLOYEE_NUMBER'.isNotEmpty) {
+    if (empID!.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
     }
     return await ApiClient().postJsonForObject((json) {
@@ -110,7 +110,7 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
-  Future<SubmitEITTransactionList> submitEitTransaction(String pDescFlexContextCode, String pFunctionName, List<Map<String, dynamic>> list) async {
+  Future<SubmitEITTransactionList> submitEitTransaction(String pDescFlexContextCode, String pFunctionName, List<Map<String, dynamic>> list, {String? empID}) async {
     String url = "${ApiConsts.erpRest}SUBMIT_EIT_TRANSACTION";
     Map<String, dynamic> postParams = {
       "P_SELECTED_RESP_ID": -999,
@@ -121,6 +121,9 @@ class MyAttendanceApiClient {
       "EITTransactionTBLModel": list,
     };
     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.submitEITTransactionList!; //ESERVICESDV.fromJson(responseData.getDefaultValueList!.toJson());
@@ -129,12 +132,7 @@ class MyAttendanceApiClient {
 
   Future<ResubmitEITRequestResponse> reSubmitEitTransaction(String itemKey, var notifID, List<Map<String, dynamic>> list) async {
     String url = "${ApiConsts.erpRest}RESUBMIT_EIT_TRANSACTION";
-    Map<String, dynamic> postParams = {
-      "P_NOTIFICATION_ID": notifID,
-      "P_ITEM_KEY": itemKey,
-      "P_EMAIL_ADDRESS": AppState().memberInformationList!.eMPLOYEEEMAILADDRESS,
-      "EITTransactionTBL": list
-    };
+    Map<String, dynamic> postParams = {"P_NOTIFICATION_ID": notifID, "P_ITEM_KEY": itemKey, "P_EMAIL_ADDRESS": AppState().memberInformationList!.eMPLOYEEEMAILADDRESS, "EITTransactionTBL": list};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);
diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
index 6cda072..ad7ad50 100644
--- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
+++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
@@ -92,8 +92,9 @@ 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 ??'');
-      SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
+      genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp ?? '');
+      SubmitEITTransactionList submitEITTransactionList =
+          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'));
@@ -112,23 +113,27 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   Future calGetValueSetValues(GetEITDFFStructureList structureList) async {
     try {
       Utils.showLoading(context);
-      String segmentId = structureList.cHILDSEGMENTSVS!;
-      if (dESCFLEXCONTEXTCODE.isEmpty) dESCFLEXCONTEXTCODE = structureList.dESCFLEXCONTEXTCODE!;
-      List<GetEITDFFStructureList> filteredList = getEitDffStructureList?.where((element) => element.cHILDSEGMENTSVSSplited!.contains(segmentId)).toList() ?? [];
-       List<Map<String, dynamic>> values = filteredList
-          .map((e) => GetSetValuesRequestModel(
-                  sEGMENTNAME: e.sEGMENTNAME, vALUECOLUMNNAME: e.eSERVICESDV!.pVALUECOLUMNNAME, dESCRIPTION: "", iDCOLUMNNAME: e.eSERVICESDV!.pIDCOLUMNNAME, fLEXVALUESETNAME: e.fLEXVALUESETNAME)
-              .toJson())
-          .toList();
-      List<ESERVICESVS> eServicesResponseModel = await MyAttendanceApiClient().getValueSetValues(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!,
-          values, empID:dynamicParams!.selectedEmp ??'', parentValue: structureList.eSERVICESDV!.pVALUECOLUMNNAME );
-      List<GetEITDFFStructureList> abc = genericResponseModel?.getEITDFFStructureList ?? [];
-      getEitDffStructureList = abc;
-      int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == structureList.cHILDSEGMENTSVS);
-      getEitDffStructureList![index].eSERVICESVS!.clear();
-      if (eServicesResponseModel.isNotEmpty) getEitDffStructureList![index].eSERVICESVS!.addAll(eServicesResponseModel);
-      //   getEitDffStructureList = genericResponseModel?.getEITDFFStructureList ?? [];
-      //getEitDffStructureList = getEitDffStructureList!.where((element) => element.dISPLAYFLAG != "N").toList();
+      for (int i = 0; i < (structureList.cHILDSEGMENTSVSSplited?.length ?? 0); i++) {
+        String segmentId = structureList.cHILDSEGMENTSVSSplited![i];
+
+        if (dESCFLEXCONTEXTCODE.isEmpty) dESCFLEXCONTEXTCODE = structureList.dESCFLEXCONTEXTCODE!;
+        List<GetEITDFFStructureList> filteredList = getEitDffStructureList?.where((element) => element.cHILDSEGMENTSVSSplited!.contains(segmentId)).toList() ?? [];
+        List<Map<String, dynamic>> values = filteredList
+            .map((e) => GetSetValuesRequestModel(
+                    sEGMENTNAME: e.sEGMENTNAME, vALUECOLUMNNAME: e.eSERVICESDV!.pVALUECOLUMNNAME, dESCRIPTION: "", iDCOLUMNNAME: e.eSERVICESDV!.pIDCOLUMNNAME, fLEXVALUESETNAME: e.fLEXVALUESETNAME)
+                .toJson())
+            .toList();
+        List<ESERVICESVS> eServicesResponseModel = await MyAttendanceApiClient().getValueSetValues(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!, values,
+            empID: dynamicParams!.selectedEmp ?? '', parentValue: structureList.eSERVICESDV!.pVALUECOLUMNNAME);
+        List<GetEITDFFStructureList> abc = genericResponseModel?.getEITDFFStructureList ?? [];
+        getEitDffStructureList = abc;
+        int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == segmentId);
+        getEitDffStructureList![index].eSERVICESVS!.clear();
+        if (eServicesResponseModel.isNotEmpty) getEitDffStructureList![index].eSERVICESVS!.addAll(eServicesResponseModel);
+        //   getEitDffStructureList = genericResponseModel?.getEITDFFStructureList ?? [];
+        //getEitDffStructureList = getEitDffStructureList!.where((element) => element.dISPLAYFLAG != "N").toList();
+      }
+      await Future.delayed(const Duration(seconds: 1));
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -394,7 +399,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   Widget build(BuildContext context) {
     if (dynamicParams == null) {
       dynamicParams = ModalRoute.of(context)!.settings.arguments as DynamicListViewParams;
-      if(dynamicParams!.selectedEmp.isNotEmpty){
+      if (dynamicParams!.selectedEmp.isNotEmpty) {
         AppState().postParamsJson['P_SELECTED_EMPLOYEE_NUMBER'] = dynamicParams!.selectedEmp;
       }
       getTransactionsStructure();