From 492b6b5e34056aef345ba1c3556616fccceecc2d Mon Sep 17 00:00:00 2001
From: Sultan khan <>
Date: Tue, 29 Nov 2022 16:46:48 +0300
Subject: [PATCH] basic details issue fixed

---
 .../dynamic_input_basic_details_screen.dart        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart b/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart
index 444b83e..749599c 100644
--- a/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart
+++ b/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart
@@ -74,9 +74,9 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
         getBasicDetColsStructureList?.forEach((GetBasicDetColsStructureList element) {
           element.userBasicDetail =
               dynamicParams!.getEmployeeBasicDetailsList!.singleWhere((GetEmployeeBasicDetailsList userDetail) => userDetail.aPPLICATIONCOLUMNNAME == element.aPPLICATIONCOLUMNNAME);
-          if (element.objectValuesList != null) {
-            ObjectValuesList dropDownListValue = element.objectValuesList!.singleWhere((ObjectValuesList dropdown) => dropdown.cODE == element.userBasicDetail!.vARCHAR2VALUE);
-            element.userBasicDetail!.sEGMENTVALUEDSP = dropDownListValue.mEANING;
+          if (element.objectValuesList != null && element.userBasicDetail?.vARCHAR2VALUE != '') {
+            ObjectValuesList dropDownListValue = element.objectValuesList!.singleWhere((ObjectValuesList dropdown) => dropdown.cODE == element.userBasicDetail?.vARCHAR2VALUE);
+            element.userBasicDetail?.sEGMENTVALUEDSP = dropDownListValue.mEANING;
           }
         });
       } else {
@@ -93,9 +93,9 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
         getBasicDetColsStructureList?.forEach((GetBasicDetColsStructureList element) {
           element.userBasicDetail =
               dynamicParams!.getEmployeeBasicDetailsList!.singleWhere((GetEmployeeBasicDetailsList userDetail) => userDetail.aPPLICATIONCOLUMNNAME == element.aPPLICATIONCOLUMNNAME);
-          if (element.objectValuesList != null) {
+          if (element.objectValuesList != null && element.userBasicDetail!.vARCHAR2VALUE != '') {
             ObjectValuesList dropDownListValue = element.objectValuesList!.singleWhere((ObjectValuesList dropdown) => dropdown.cODE == element.userBasicDetail!.vARCHAR2VALUE);
-            element.userBasicDetail!.sEGMENTVALUEDSP = dropDownListValue.mEANING;
+            element.userBasicDetail?.sEGMENTVALUEDSP = dropDownListValue.mEANING;
           }
         });
       }
@@ -262,7 +262,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
         return PopupMenuButton(
           child: DynamicTextFieldWidget(
             (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""),
-            getBasicDetColsStructureList![index].userBasicDetail!.sEGMENTVALUEDSP ?? "",
+            getBasicDetColsStructureList![index].userBasicDetail?.sEGMENTVALUEDSP ?? "",
             isEnable: false,
             isPopup: true,
           ).paddingOnly(bottom: 12),
@@ -363,7 +363,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
       Utils.showLoading(context);
       int numberValue = 0;
       List<Map<String, dynamic>> values = getBasicDetDffStructureList!.map((e) {
-        String tempVar = e.userBasicDetail!.vARCHAR2VALUE ?? "";
+        String tempVar = e.userBasicDetail?.vARCHAR2VALUE ?? "";
 
         if (e.fORMATTYPE == "X") {
           // for date format type, date format is changed