From bff7020b7846f755842d81755d93a3c75331bb71 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Mon, 13 Sep 2021 11:57:55 +0300 Subject: [PATCH 1/2] PAP-939: fixes --- .../New_E_Referral/new_e_referral_step_one_page.dart | 4 +++- .../E-Referral/search_for_referrals_page.dart | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart index 5a3271f2..3a58ccb2 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart @@ -279,12 +279,13 @@ class MobileNumberTextFiled extends StatelessWidget { const MobileNumberTextFiled({ Key key, this.controller, - this.code + this.code, this.onChange }) : super(key: key); final TextEditingController controller; final String code; + final Function onChange; @override Widget build(BuildContext context) { @@ -313,6 +314,7 @@ class MobileNumberTextFiled extends StatelessWidget { margin: EdgeInsets.all(5), child: TextField( controller: controller, + onChanged: onChange, keyboardType: TextInputType.phone, decoration: InputDecoration( border: InputBorder.none, hintText: '5xxxxxxxx'), diff --git a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart index 0b75705d..906108d4 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart @@ -47,6 +47,7 @@ class _SearchForReferralsPageState extends State { onModelReady: (model) => model.getAllCities(), builder: (_, model, widget) => AppScaffold( isShowAppBar: false, + baseViewModel: model, body: SingleChildScrollView( physics: ScrollPhysics(), child: Container( @@ -86,6 +87,11 @@ class _SearchForReferralsPageState extends State { ? "Enter Patient Identification No" : "Enter Referral Number", controller: _searchTextController, + onChanged: (_){ + setState(() { + + }); + }, ), SizedBox( height: 12, @@ -113,6 +119,12 @@ class _SearchForReferralsPageState extends State { ), MobileNumberTextFiled( controller: _mobileTextController, + onChange: (_){ + setState(() { + + }); + }, + code: _selectedCountry == null ? "11" : _selectedCountry["code"], From bb372210e02b2cf6b70d3dbab041bae69d019746 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Mon, 13 Sep 2021 12:05:01 +0300 Subject: [PATCH 2/2] PAP-938: fix Referral sent --- .../new_e_referral_step_three_page.dart | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart index a823c154..3f92823d 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart @@ -6,6 +6,8 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/bottom_options/BottomSheet.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -409,16 +411,17 @@ class _NewEReferralStepThreePageState extends State { 15; this.widget.createEReferralRequestModel.preferredBranchName = "Arryan Hospital"; - - // this.widget.createEReferralRequestModel.fullName= ""; this.widget.createEReferralRequestModel.otherRelationship = ""; - // this.widget.createEReferralRequestModel.; - // this.widget.createEReferralRequestModel. preferredBranchName= "Arryan Hospital"; - // this.widget.createEReferralRequestModel. preferredBranchName= "Arryan Hospital"; await model .createEReferral(this.widget.createEReferralRequestModel); + if(model.state == ViewState.ErrorLocal) { + Utils.showErrorToast(model.error); + } else{ + AppToast.showSuccessToast(message: "Referral sent successfully"); + + } }, loading: model.state == ViewState.BusyLocal, disabled: medicalReportImages.length == 0,