return from leave done.

lib/api/api_client.dart

@@ -89,7 +89,7 @@ class ApiClient {
       return factoryConstructor(jsonData);
     } else {
       APIError? apiError;
-      apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorMessage']);
+      apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage']);
       throw APIException(APIException.BAD_REQUEST, error: apiError);
     }
     // } catch (ex) {

lib/api/my_attendance_api_client.dart

@@ -83,8 +83,12 @@ class MyAttendanceApiClient {
       "P_MENU_TYPE": "E",
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
       "P_FUNCTION_NAME": pFunctionName,
-      "EITTransactionTBL": list,
+    //  "EITTransactionTBL": list,
     };
+    print(postParams);
+    postParams["EITTransactionTBL"] =list;
+
+
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -44,6 +44,8 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
     try {
       Utils.showLoading(context);
       genericResponseModel = await MyAttendanceApiClient().getEitDffStructure(dynamicParams!.dynamicId);
+      dESCFLEXCONTEXTCODE = genericResponseModel!.pDESCFLEXCONTEXTCODE ?? "";
+      descFlexConTextTitle = genericResponseModel!.pDESCFLEXCONTEXTNAME ?? "";
       getEitDffStructureList = genericResponseModel?.getEITDFFStructureList ?? [];
       //getEitDffStructureList = getEitDffStructureList!.where((element) => element.dISPLAYFLAG != "N").toList();
       Utils.hideLoading(context);
@@ -79,7 +81,8 @@ 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(descFlexConTextTitle, submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!));
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
@@ -87,12 +90,13 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   }
 
   String dESCFLEXCONTEXTCODE = "";
+  String descFlexConTextTitle = "";
 
   void calGetValueSetValues(GetEITDFFStructureList structureList) async {
     try {
       Utils.showLoading(context);
       String segmentId = structureList.cHILDSEGMENTSVS!;
-      dESCFLEXCONTEXTCODE = structureList.dESCFLEXCONTEXTCODE!;
+      if (dESCFLEXCONTEXTCODE.isEmpty) dESCFLEXCONTEXTCODE = structureList.dESCFLEXCONTEXTCODE!;
 
       List<GetEITDFFStructureList> filteredList = getEitDffStructureList?.where((element) => element.cHILDSEGMENTSVS == segmentId).toList() ?? [];
       List<Map<String, dynamic>> values = filteredList
@@ -202,6 +206,10 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
             isReadOnly: model.rEADONLY == "Y",
             onChange: (text) {
               model.fieldAnswer = text;
+              if (model.eSERVICESDV == null) {
+                model.eSERVICESDV = ESERVICESDV();
+              }
+              model.eSERVICESDV!.pIDCOLUMNNAME = text;
             },
           ).paddingOnly(bottom: 12);
         } else if (model.fORMATTYPE == "N") {
@@ -212,6 +220,10 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
             isInputTypeNum: true,
             onChange: (text) {
               model.fieldAnswer = text;
+              if (model.eSERVICESDV == null) {
+                model.eSERVICESDV = ESERVICESDV();
+              }
+              model.eSERVICESDV!.pIDCOLUMNNAME = text;
             },
           ).paddingOnly(bottom: 12);
         } else if (model.fORMATTYPE == "X") {
@@ -239,12 +251,21 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
               }
               DateTime date = await _selectDate(context);
               DateTime date1 = DateTime(date.year, date.month, date.day);
-              getEitDffStructureList![index].fieldAnswer = date.toString();
+              // getEitDffStructureList![index].fieldAnswer = date.toString();
-              ESERVICESDV eservicesdv = ESERVICESDV(
+              ESERVICESDV eservicesdv;
+              if (getEitDffStructureList![index].isDefaultTypeIsCDPS) {
+                eservicesdv = ESERVICESDV(
+                    pIDCOLUMNNAME: DateFormat('yyyy/MM/dd HH:MM:SS').format(date1),
+                    pRETURNMSG: "null",
+                    pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE,
+                    pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy/MM/dd HH:MM:SS').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date));
+              } else {
+                eservicesdv = ESERVICESDV(
                     pIDCOLUMNNAME: DateFormat('yyyy-MM-dd').format(date1),
                     pRETURNMSG: "null",
                     pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE,
                     pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd hh:mm:ss').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date));
+              }
               getEitDffStructureList![index].eSERVICESDV = eservicesdv;
               setState(() {});
               if (model.cHILDSEGMENTSDVSplited?.isNotEmpty ?? false) {
@@ -270,23 +291,39 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
             onTap: () async {
               if ((getEitDffStructureList![index].eSERVICESDV?.pVALUECOLUMNNAME != null)) {
                 if (getEitDffStructureList![index].isDefaultTypeIsCDPS) {
-                  selectedDate = DateFormat("yyyy-MM-dd").parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!.replaceAll('/"', '').replaceAll(" 00:00:00", ""));
+                  String tempDate = getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!;
+                  if (tempDate.contains("00:00:00")) {
+                    tempDate = tempDate.replaceAll("00:00:00", '').trim();
+                  }
+                  selectedDate = DateFormat("yyyy/MM/dd").parse(tempDate);
                 } else {
                   selectedDate = DateTime.parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!);
                 }
               }
               DateTime date = await _selectDate(context);
               DateTime date1 = DateTime(date.year, date.month, date.day);
-              getEitDffStructureList![index].fieldAnswer = date.toString();
+              // getEitDffStructureList![index].fieldAnswer = date.toString();
-              ESERVICESDV eservicesdv = ESERVICESDV(
+              ESERVICESDV eservicesdv;
+              if (getEitDffStructureList![index].isDefaultTypeIsCDPS) {
+                eservicesdv = ESERVICESDV(
+                    pIDCOLUMNNAME: DateFormat('yyyy/MM/dd HH:MM:SS').format(date1),
+                    pRETURNMSG: "null",
+                    pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE,
+                    pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd HH:MM:SS').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date));
+              } else {
+                eservicesdv = ESERVICESDV(
                     pIDCOLUMNNAME: DateFormat('yyyy-MM-dd').format(date1),
                     pRETURNMSG: "null",
                     pRETURNSTATUS: getEitDffStructureList![index].dEFAULTVALUE,
                     pVALUECOLUMNNAME: getEitDffStructureList![index].isDefaultTypeIsCDPS ? DateFormat('yyyy-MM-dd hh:mm:ss').format(date) : DateFormat('yyyy-MM-ddThh:mm:ss.s').format(date));
+              }
+
               getEitDffStructureList![index].eSERVICESDV = eservicesdv;
               setState(() {});
               if (model.cHILDSEGMENTSDVSplited?.isNotEmpty ?? false) {
+                if (getEitDffStructureList![index].isDefaultTypeIsCDPS) {
                   calGetValueSetValues(model);
+                } else {}
               }
             },
           ).paddingOnly(bottom: 12);