Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan

lib/ui/profile/basic_details.dart

@@ -1,12 +1,14 @@
 import 'package:easy_localization/src/public_ext.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/profile_api_client.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/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart';
+import 'package:mohem_flutter_app/models/member_information_list_model.dart';
 import 'package:mohem_flutter_app/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
@@ -27,10 +29,11 @@ class _BasicDetailsState extends State<BasicDetails> {
   String? employeeNo = "";
   int correctOrNew = 1;
   List<GetEmployeeBasicDetailsList> getEmployeeBasicDetailsList = [];
-
+  late MemberInformationListModel memberInformationList;
   @override
   void initState() {
     super.initState();
+    memberInformationList = AppState().memberInformationList!;
     getEmployeeBasicDetails();
     basicDetails();
   }

lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart

@@ -65,16 +65,25 @@ class _DynamicInputScreenState extends State<DynamicInputScreenProfile> {
       Utils.showLoading(context);
       genericResponseModel = await ProfileApiClient().getDffStructure("BASIC_DETAILS", dynamicParams!.uRL, dynamicParams!.requestID);
       getBasicDetDffStructureList = genericResponseModel?.getBasicDetDffStructureList ?? [];
+      genericResponseModel = await ProfileApiClient().getColStructure(dynamicParams!.dynamicId, 'GET_BASIC_DET_COLS_STRUCTURE', dynamicParams!.requestID);
+      getBasicDetColsStructureList = genericResponseModel?.getBasicDetColsStructureList ?? [];
 
+      if (dynamicParams!.correctOrNew == 1) {
         getBasicDetDffStructureList?.forEach((element) {
           element.userBasicDetail = dynamicParams!.getEmployeeBasicDetailsList!.singleWhere((userDetail) => userDetail.aPPLICATIONCOLUMNNAME == element.aPPLICATIONCOLUMNNAME);
         });
-
-      genericResponseModel = await ProfileApiClient().getColStructure(dynamicParams!.dynamicId, 'GET_BASIC_DET_COLS_STRUCTURE', dynamicParams!.requestID);
-      getBasicDetColsStructureList = genericResponseModel?.getBasicDetColsStructureList ?? [];
         getBasicDetColsStructureList?.forEach((element) {
           element.userBasicDetail = dynamicParams!.getEmployeeBasicDetailsList!.singleWhere((userDetail) => userDetail.aPPLICATIONCOLUMNNAME == element.aPPLICATIONCOLUMNNAME);
         });
+      } else {
+        getBasicDetDffStructureList?.forEach((element) {
+          element.userBasicDetail = new GetEmployeeBasicDetailsList();
+        });
+        getBasicDetColsStructureList?.forEach((element) {
+          element.userBasicDetail = GetEmployeeBasicDetailsList();
+        });
+      }
+
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {

lib/ui/profile/personal_info.dart

@@ -106,7 +106,10 @@ class _PesonalInfoState extends State<PesonalInfo> {
           BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3),
         ],
       ),
-      child: DefaultButton(LocaleKeys.update.tr(), () async {}).insideContainer,
+      child: DefaultButton(
+        LocaleKeys.update.tr(),
+        () async {},
+      ).insideContainer,
     );
   }
 }