From 1858be18b747b4d1e6111959014c7c1a41ed73bf Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 19 Oct 2021 12:07:46 +0300 Subject: [PATCH] Feedback Status fixes --- .../service/feedback/feedback_service.dart | 19 +++++++++++++++++-- lib/pages/feedback/status_feedback_page.dart | 11 +++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/lib/core/service/feedback/feedback_service.dart b/lib/core/service/feedback/feedback_service.dart index 37c0c7be..67ebc641 100644 --- a/lib/core/service/feedback/feedback_service.dart +++ b/lib/core/service/feedback/feedback_service.dart @@ -83,9 +83,24 @@ class FeedbackService extends BaseService { Future searchFeedback(String countryCode, String phoneNumber, int type, String idNumber) async { hasError = false; Map body = new Map(); - body['IdentificationNo'] = idNumber; + if (type == 1) { + body['IdentificationNo'] = 0; + body['PatientID'] = num.tryParse(idNumber); + body['ItemID'] = 0; + } else if (type == 2) { + body['IdentificationNo'] = idNumber; + body['PatientID'] = 0; + body['ItemID'] = 0; + } else { + body['IdentificationNo'] = 0; + body['PatientID'] = 0; + body['ItemID'] = idNumber; + } + + body['PatientOutSA'] = countryCode.contains("966") ? 0 : 1; + body['MobileNo'] = countryCode + Utils.getPhoneNumberWithoutZero(phoneNumber); - body['Searching_type'] = "$type"; + body['Searching_type'] = type; if (BASE_URL.contains('uat')) { body['ForDemo'] = true; } diff --git a/lib/pages/feedback/status_feedback_page.dart b/lib/pages/feedback/status_feedback_page.dart index 6a4eb87e..a717178a 100644 --- a/lib/pages/feedback/status_feedback_page.dart +++ b/lib/pages/feedback/status_feedback_page.dart @@ -33,7 +33,11 @@ class _StatusFeedbackPageState extends State { Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); return BaseView( - onModelReady: (model) => model.getCOC(), + allowAny: true, + onModelReady: (model) { + model.cOCItemList.clear(); + if (projectViewModel.isLogin) model.getCOC(); + }, builder: (_, model, widget) => AppScaffold( baseViewModel: model, isShowDecPage: false, @@ -160,6 +164,7 @@ class _StatusFeedbackPageState extends State { countryCode = value; }); }), + if (model.cOCItemList.length > 0) listData(model.cOCItemList, projectViewModel.isArabic, false), ], ), ), @@ -178,9 +183,7 @@ class _StatusFeedbackPageState extends State { Future.delayed(Duration(seconds: 1), () { AppToast.showErrorToast(message: model.error); }); - } else { - listData(model.cOCItemList, projectViewModel.isArabic, false); - } + } else {} }); }, disabledColor: Colors.grey,