Address info issue fixed

lib/api/worklist/worklist_api_client.dart

@@ -26,6 +26,7 @@ import 'package:mohem_flutter_app/models/update_user_item_type_list.dart';
 import 'package:mohem_flutter_app/models/worklist/GetRFCEmployeeList.dart';
 import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/eit_otification_body_model.dart';
+import 'package:mohem_flutter_app/models/worklist/hr/get_address_notification_body_list.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_basic_det_ntf_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_contact_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_phones_notification_body_list_model.dart';
@@ -509,6 +510,20 @@ class WorkListApiClient {
     }, url, postParams);
   }
 
+  Future<List<GetAddressNotificationBodyList>?> getAddressNotificationBodyList(int? notificationId) async {
+    String url = "${ApiConsts.erpRest}GET_ADDRESS_NOTIFICATION_BODY";
+    Map<String, dynamic> postParams = {
+      "P_NOTIFICATION_ID": notificationId,
+      "P_PAGE_LIMIT": 100,
+      "P_PAGE_NUM": 1,
+    };
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+      return responseData.getAddressNotificationBodyList;
+    }, url, postParams);
+  }
+
   Future<List<GetFavoriteReplacements>?> getFavoriteReplacementWithoutImage() async {
     String url = "${ApiConsts.erpRest}Mohemm_GetFavoriteReplacementsWithoutImage";
     Map<String, dynamic> postParams = {};

lib/models/generic_response_model.dart

@@ -102,6 +102,7 @@ import 'package:mohem_flutter_app/models/validate_eit_transaction_list_model.dar
 import 'package:mohem_flutter_app/models/worklist/GetRFCEmployeeList.dart';
 import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/eit_otification_body_model.dart';
+import 'package:mohem_flutter_app/models/worklist/hr/get_address_notification_body_list.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_basic_det_ntf_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_contact_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_phones_notification_body_list_model.dart';
@@ -163,12 +164,12 @@ class GenericResponseModel {
   List<String>? getAbsenceAttachmentsList;
   List<GetAbsenceAttendanceTypesList>? getAbsenceAttendanceTypesList;
   List<GetAbsenceCollectionNotificationBodyList>? getAbsenceCollectionNotificationBodyList;
+  List<GetAddressNotificationBodyList>? getAddressNotificationBodyList;
   List<GetAbsenceDffStructureList>? getAbsenceDffStructureList;
   List<GetAbsenceTransactionList>? getAbsenceTransactionList;
   List<GetAccrualBalancesList>? getAccrualBalancesList;
   List<GetActionHistoryList>? getActionHistoryList;
   List<GetAddressDffStructureList>? getAddressDffStructureList;
-  List<String>? getAddressNotificationBodyList;
   List<GetApprovesList>? getApprovesList;
   List<GetAttachementList>? getAttachementList;
   GetAttendanceTracking? getAttendanceTrackingList;
@@ -717,6 +718,13 @@ class GenericResponseModel {
       });
     }
 
+    if (json['GetAddressNotificationBodyList'] != null) {
+      getAddressNotificationBodyList = <GetAddressNotificationBodyList>[];
+      json['GetAddressNotificationBodyList'].forEach((v) {
+        getAddressNotificationBodyList!.add(GetAddressNotificationBodyList.fromJson(v));
+      });
+    }
+
     if (json['GetAbsenceDffStructureList'] != null) {
       getAbsenceDffStructureList = <GetAbsenceDffStructureList>[];
       json['GetAbsenceDffStructureList'].forEach((v) {
@@ -746,7 +754,7 @@ class GenericResponseModel {
         getAddressDffStructureList!.add(GetAddressDffStructureList.fromJson(v));
       });
     }
-    getAddressNotificationBodyList = json['GetAddressNotificationBodyList'];
+    // getAddressNotificationBodyList = json['GetAddressNotificationBodyList'];
 
     if (json['GetApprovesList'] != null) {
       getApprovesList = <GetApprovesList>[];

lib/models/worklist/hr/get_address_notification_body_list.dart

@@ -0,0 +1,28 @@
+class GetAddressNotificationBodyList {
+  String? pREVSEGMENTVALUEDSP;
+  String? sEGMENTPROMPT;
+  String? sEGMENTVALUEDSP;
+  String? uPDATEDFLAG;
+
+  GetAddressNotificationBodyList(
+      {this.pREVSEGMENTVALUEDSP,
+        this.sEGMENTPROMPT,
+        this.sEGMENTVALUEDSP,
+        this.uPDATEDFLAG});
+
+  GetAddressNotificationBodyList.fromJson(Map<String, dynamic> json) {
+    pREVSEGMENTVALUEDSP = json['PREV_SEGMENT_VALUE_DSP'];
+    sEGMENTPROMPT = json['SEGMENT_PROMPT'];
+    sEGMENTVALUEDSP = json['SEGMENT_VALUE_DSP'];
+    uPDATEDFLAG = json['UPDATED_FLAG'];
+  }
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> data = new Map<String, dynamic>();
+    data['PREV_SEGMENT_VALUE_DSP'] = this.pREVSEGMENTVALUEDSP;
+    data['SEGMENT_PROMPT'] = this.sEGMENTPROMPT;
+    data['SEGMENT_VALUE_DSP'] = this.sEGMENTVALUEDSP;
+    data['UPDATED_FLAG'] = this.uPDATEDFLAG;
+    return data;
+  }
+}

lib/ui/login/login_screen.dart

@@ -58,9 +58,9 @@ class _LoginScreenState extends State<LoginScreen> {
   void initState() {
     super.initState();
     // checkFirebaseToken();
-    if (kReleaseMode) {
+    // if (kReleaseMode) {
-      checkDeviceSafety();
+    //   checkDeviceSafety();
-    }
+    // }
   }
 
   void checkDeviceSafety() async {

lib/ui/work_list/worklist_detail_screen.dart

@@ -25,6 +25,7 @@ import 'package:mohem_flutter_app/models/member_information_list_model.dart';
 import 'package:mohem_flutter_app/models/notification_get_respond_attributes_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/GetRFCEmployeeList.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/eit_otification_body_model.dart';
+import 'package:mohem_flutter_app/models/worklist/hr/get_address_notification_body_list.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_basic_det_ntf_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_contact_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_phones_notification_body_list_model.dart';
@@ -78,6 +79,8 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
   List<GetBasicDetNtfBodyList>? getBasicDetNtfBodyList = [];
   List<GetAbsenceCollectionNotificationBodyList>? getAbsenceCollectionNotificationBodyList = [];
   GetContactNotificationBodyList? getContactNotificationBodyList;
+  List<GetAddressNotificationBodyList>? getAddressNotificationBodyList = [];
+
 
   GenericResponseModel? getBasicNTFBody;
   GenericResponseModel? getICBody;
@@ -118,6 +121,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
     getBasicDetNtfBodyList!.clear();
     getAbsenceCollectionNotificationBodyList!.clear();
     getContactNotificationBodyList = null;
+    getAddressNotificationBodyList!.clear();
 
     if (workListData!.iTEMTYPE == "HRSSA" || workListData!.iTEMTYPE == "STAMP") {
       getUserInformation();
@@ -139,6 +143,8 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
         getAbsenceNotificationBody();
       } else if (workListData!.rEQUESTTYPE == "CONTACT") {
         getContactNotificationBody();
+      } else if (workListData!.rEQUESTTYPE == "ADDRESS") {
+        getAddressNotificationBody();
       }
       // getBasicNTFBody = await WorkListApiClient().getBasicDetNTFBody(workListData!.nOTIFICATIONID!, -999);
       // getAbsenceCollectionNotifications = await WorkListApiClient().getAbsenceNotificationBody(workListData!.nOTIFICATIONID!, -999);
@@ -271,6 +277,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                       getEitCollectionNotificationBodyList: getEitCollectionNotificationBodyList,
                       getPhonesNotificationBodyList: getPhonesNotificationBodyList,
                       getBasicDetNtfBodyList: getBasicDetNtfBodyList,
+                      getAddressNotificationBodyList: getAddressNotificationBodyList,
                       getAbsenceCollectionNotificationBodyList: getAbsenceCollectionNotificationBodyList,
                       getContactNotificationBodyList: getContactNotificationBodyList,
                       getPrNotificationBodyList: getPrNotificationBody,
@@ -841,6 +848,23 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
     }
   }
 
+  void getAddressNotificationBody() async {
+    try {
+      if (apiCallCount == 0) Utils.showLoading(context);
+      apiCallCount++;
+      getAddressNotificationBodyList = await WorkListApiClient().getAddressNotificationBodyList(workListData!.nOTIFICATIONID);
+      apiCallCount--;
+      if (apiCallCount == 0) {
+        Utils.hideLoading(context);
+        setState(() {});
+      }
+    } catch (ex) {
+      apiCallCount--;
+      Utils.hideLoading(context);
+      Utils.handleException(ex, context, null);
+    }
+  }
+
   void getStampNotificationBody() async {
     try {
       if (apiCallCount == 0) Utils.showLoading(context);

lib/ui/work_list/worklist_fragments/info_fragments.dart

@@ -13,6 +13,7 @@ import 'package:mohem_flutter_app/models/get_pr_notification_body_list_model.dar
 import 'package:mohem_flutter_app/models/get_stamp_ms_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/get_stamp_ns_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/eit_otification_body_model.dart';
+import 'package:mohem_flutter_app/models/worklist/hr/get_address_notification_body_list.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_basic_det_ntf_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_contact_notification_body_list_model.dart';
 import 'package:mohem_flutter_app/models/worklist/hr/get_phones_notification_body_list_model.dart';
@@ -31,6 +32,7 @@ class InfoFragment extends StatelessWidget {
   List<GetAbsenceCollectionNotificationBodyList>? getAbsenceCollectionNotificationBodyList;
   GetContactNotificationBodyList? getContactNotificationBodyList;
   GetPrNotificationBodyList? getPrNotificationBodyList;
+  List<GetAddressNotificationBodyList>? getAddressNotificationBodyList = [];
 
   InfoFragment(
       {this.workListData,
@@ -43,7 +45,8 @@ class InfoFragment extends StatelessWidget {
       this.getBasicDetNtfBodyList,
       this.getAbsenceCollectionNotificationBodyList,
       this.getContactNotificationBodyList,
-      this.getPrNotificationBodyList});
+      this.getPrNotificationBodyList,
+      this.getAddressNotificationBodyList});
 
   double itemHeight = 0;
   double itemWidth = 0;
@@ -89,6 +92,7 @@ class InfoFragment extends StatelessWidget {
       if (getBasicDetNtfBodyList?.isNotEmpty ?? false) getBasicDetNtfBodyListWidget(getBasicDetNtfBodyList ?? []).objectContainerView(title: "Basic Information"),
       if (getAbsenceCollectionNotificationBodyList?.isNotEmpty ?? false) getAbsenceCollectionNotificationBodyListWidget(getAbsenceCollectionNotificationBodyList ?? []),
       if (getContactNotificationBodyList != null) getContactNotificationBodyListWidget(getContactNotificationBodyList ?? GetContactNotificationBodyList()).objectContainerView(),
+      if (getAddressNotificationBodyList?.isNotEmpty ?? false) getAddressNotificationBodyListWidget(getAddressNotificationBodyList!),
     ];
     return Container(
       width: double.infinity,
@@ -465,6 +469,36 @@ class InfoFragment extends StatelessWidget {
     );
   }
 
+  Widget getAddressNotificationBodyListWidget(List<GetAddressNotificationBodyList> getAddressNotificationBodyList) {
+    bool isOdd = false;
+    try {
+      if (getAddressNotificationBodyList.length % 2 != 0) {
+        isOdd = true;
+        getAddressNotificationBodyList.add(GetAddressNotificationBodyList(sEGMENTPROMPT: "--", sEGMENTVALUEDSP: "--"));
+      }
+    } catch (e) {}
+
+    return GridView.builder(
+      itemCount: getAddressNotificationBodyList!.length,
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      itemBuilder: (context, index) => ItemDetailViewGridItem(
+        index,
+        getAddressNotificationBodyList[index].sEGMENTPROMPT,
+        getAddressNotificationBodyList[index].sEGMENTVALUEDSP,
+        isNeedToShowEmptyDivider: (getAddressNotificationBodyList.length == index + 1)
+            ? isOdd
+                ? true
+                : false
+            : false,
+      ),
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: 2,
+        childAspectRatio: (itemWidth / itemHeight),
+      ),
+    ).objectContainerView();
+  }
+
   List<Widget> getPRHeaderValues() {
     List<Widget> pRHeaders = [];
     getPrNotificationBodyList!.pRHeader!.forEach((element) {
@@ -478,7 +512,7 @@ class InfoFragment extends StatelessWidget {
     try {
       if (data.contactNotificationBody!.length % 2 != 0) {
         isOdd = true;
-        data.contactNotificationBody!.add(new ContactNotificationBody());
+        data.contactNotificationBody!.add(ContactNotificationBody(segmentPrompt: "--", segmentValueDsp: "--"));
       }
     } catch (e) {}
 

lib/widgets/dynamic_forms/dynamic_textfield_widget.dart

@@ -68,11 +68,7 @@ class DynamicTextFieldWidget extends StatelessWidget {
                     enabled: isEnable,
                     scrollPadding: EdgeInsets.zero,
                     readOnly: isReadOnly,
-                    keyboardType: (isInputTypeNum)
+                    keyboardType: (isInputTypeNum) ? (isInputTypeNumSigned ? const TextInputType.numberWithOptions(signed: true, decimal: true) : TextInputType.numberWithOptions(signed: true, decimal: true)) : TextInputType.text,
-                        ? isInputTypeNumSigned
-                            ? const TextInputType.numberWithOptions(signed: true)
-                            : TextInputType.number
-                        : TextInputType.text,
                     textInputAction: TextInputAction.done,
                     //controller: controller,
                     maxLines: lines,