bug fix

lib/api/my_attendance_api_client.dart

@@ -70,7 +70,7 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
-  Future<ESERVICESDV> getDefaultValue(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list, String? empID) async {
+  Future<ESERVICESDV> getDefaultValue(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list, {String? empID}) async {
     String url = "${ApiConsts.erpRest}GET_DEFAULT_VALUE";
     Map<String, dynamic> postParams = {
       "P_SELECTED_RESP_ID": -999,
@@ -82,7 +82,7 @@ class MyAttendanceApiClient {
       "GetValueSetValuesTBL": list,
     };
     postParams.addAll(AppState().postParamsJson);
-    if (empID!.isNotEmpty) {
+    if (empID != null && empID!.isNotEmpty) {
       postParams['P_SELECTED_EMPLOYEE_NUMBER'] = empID;
     }
     return await ApiClient().postJsonForObject((json) {

lib/classes/utils.dart

@@ -9,6 +9,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:fluttertoast/fluttertoast.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/date_uitl.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/exceptions/api_exception.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@@ -20,6 +21,7 @@ import 'package:mohem_flutter_app/widgets/loading_dialog.dart';
 import 'package:nfc_manager/nfc_manager.dart';
 import 'package:nfc_manager/platform_tags.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+
 // ignore_for_file: avoid_annotating_with_dynamic
 
 class Utils {
@@ -298,6 +300,10 @@ class Utils {
     return formattedDate;
   }
 
+  static String formatDateDefault(String date) {
+    return DateFormat('yyyy-MM-dd').format(DateFormat('dd-MMM-yyyy').parseLoose(date));
+  }
+
   static Future<DateTime> selectDate(BuildContext context, DateTime selectedDate) async {
     if (!Platform.isIOS) {
       await showCupertinoModalPopup(
@@ -327,7 +333,6 @@ class Utils {
   }
 
   static void readNFc({required Function(String) onRead}) {
-
     NfcManager.instance.startSession(onDiscovered: (NfcTag tag) async {
       print(tag.data);
       var f;

lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart

@@ -50,6 +50,18 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       descFlexConTextTitle = genericResponseModel!.pDESCFLEXCONTEXTNAME ?? "";
       getEitDffStructureList = genericResponseModel?.getEITDFFStructureList ?? [];
       //getEitDffStructureList = getEitDffStructureList!.where((element) => element.dISPLAYFLAG != "N").toList();
+      if (dynamicParams!.collectionNotificationList != null && dynamicParams!.collectionNotificationList!.isNotEmpty) {
+        getEitDffStructureList!.forEach((element) {
+          dynamicParams!.collectionNotificationList!.forEach((element2) {
+            if (element.sEGMENTNAME == element2.segmentName) {
+              element.fieldAnswer = element2.varchar2Value;
+              element.eSERVICESDV ??= ESERVICESDV();
+              element.eSERVICESDV!.pIDCOLUMNNAME = element2.varchar2Value;
+            }
+          });
+        });
+      }
+
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -114,15 +126,22 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
     try {
       Utils.showLoading(context);
       for (int i = 0; i < (structureList.cHILDSEGMENTSVSSplited?.length ?? 0); i++) {
+        List<Map<String, dynamic>> values = [];
         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
+
+        if (filteredList.isEmpty && structureList.cHILDSEGMENTSVSSplited!.isNotEmpty) {
+          segmentId = structureList.cHILDSEGMENTSVSSplited![0];
+          filteredList = getEitDffStructureList?.where((element) => element.cHILDSEGMENTSVSSplited!.contains(segmentId)).toList() ?? [];
+        }
+        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 ?? [];
@@ -162,9 +181,28 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
 
         List<Map<String, dynamic>> getSetList = getDefaultValuesIonicLogic(parent);
         if (getSetList.isNotEmpty) {
-          ESERVICESDV defaultValue = await MyAttendanceApiClient().getDefaultValue(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!, getSetList, dynamicParams!.selectedEmp);
+          ESERVICESDV defaultValue =
+              await MyAttendanceApiClient().getDefaultValue(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!, getSetList, empID: dynamicParams!.selectedEmp);
           int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == segmentId);
           getEitDffStructureList![index].eSERVICESDV = defaultValue;
+          GetEITDFFStructureList defaultValueCheck = getEitDffStructureList!.where((GetEITDFFStructureList element) => element.sEGMENTNAME == segmentId).toList().first;
+
+          if (defaultValueCheck.cHILDSEGMENTSDVSplited!.isNotEmpty && defaultValueCheck.rEADONLY == 'Y') {
+            getDefaultValues(defaultValueCheck);
+            Utils.hideLoading(context);
+
+            // GetEITDFFStructureList? parent = getEitDffStructureList!.firstWhere((element) => element.sEGMENTNAME == segmentId);
+            // List<Map<String, dynamic>> getSetList = getDefaultValuesIonicLogic(parent);
+            // ESERVICESDV defaultValue = await MyAttendanceApiClient().getDefaultValue(segmentId, defaultValueCheck.dESCFLEXCONTEXTCODE!, defaultValueCheck.dESCFLEXNAME!, getSetList);
+            // int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == segmentId);
+            // getEitDffStructureList![index].eSERVICESDV = defaultValue;
+          } else if (defaultValueCheck.cHILDSEGMENTSVSSplited!.isNotEmpty && defaultValueCheck.rEADONLY == 'Y') {
+            calGetValueSetValues(defaultValueCheck);
+            Utils.hideLoading(context);
+          }
+        } else if (values.isNotEmpty) {
+          ESERVICESDV defaultValue = await MyAttendanceApiClient().getDefaultValue(segmentId, structureList.dESCFLEXCONTEXTCODE!, structureList.dESCFLEXNAME!, values);
+          int index = getEitDffStructureList!.indexWhere((element) => element.sEGMENTNAME == segmentId);
         }
       }
       await Future.delayed(const Duration(seconds: 1));
@@ -305,7 +343,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
                 idColName = val;
 
                 if (getEitDffStructureList![j].fORMATTYPE == "X") {
-                  idColName = Utils.formatDateNew(idColName!);
+                  idColName = Utils.formatDateDefault(idColName!);
                   // commenting to test
                   // DateTime date = DateFormat('yyyy-MM-dd').parse(idColName!);
                   // idColName = DateFormat('yyyy-MM-dd HH:mm:ss').format(date);

lib/ui/profile/personal_info.dart

@@ -43,7 +43,7 @@ class PersonalInfo extends StatelessWidget {
             LocaleKeys.Payroll.tr().toText13(color: MyColors.lightGrayColor),
             (memberInformationList.pAYROLLNAME ?? "").toText16(),
           ],
-        ).objectContainerView(center: false).paddingAll(21),
+        ).objectContainerView().paddingAll(21),
       ),
     );
   }