From 45272d251cf7239ea14cee2b5371b56ddbd4b5a0 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 6 Sep 2021 18:39:19 +0300 Subject: [PATCH] Updates & fixes --- .../service/appointment_rate_service.dart | 4 +++- .../BookAppointment/DentalComplaints.dart | 1 + .../components/SearchByClinic.dart | 23 +++++++++++++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/core/service/appointment_rate_service.dart b/lib/core/service/appointment_rate_service.dart index a0c2b208..021a680d 100644 --- a/lib/core/service/appointment_rate_service.dart +++ b/lib/core/service/appointment_rate_service.dart @@ -48,8 +48,10 @@ class AppointmentRateService extends BaseService { appointmentRate.doctorID = doctorID; appointmentRate.clinicID = clinicID; appointmentRate.note = note; + appointmentRate.createdBy = 2; + appointmentRate.editedBy = 2; - await baseAppClient.post(GET_APPOINTMENT_DETAILS_BY_NO, + await baseAppClient.post(NEW_RATE_APPOINTMENT_URL, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/pages/BookAppointment/DentalComplaints.dart b/lib/pages/BookAppointment/DentalComplaints.dart index 79b7758e..f083f3ae 100644 --- a/lib/pages/BookAppointment/DentalComplaints.dart +++ b/lib/pages/BookAppointment/DentalComplaints.dart @@ -53,6 +53,7 @@ class _DentalComplaintsState extends State { appBarTitle: "Symptoms", showNewAppBar: true, showNewAppBarTitle: true, + isShowDecPage: false, backgroundColor: CustomColors.appBackgroudGreyColor, body: Container( child: !hasDentalPlan diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index eef70269..3eab535c 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -173,7 +173,7 @@ class _SearchByClinicState extends State { ), ), Text( - "30", + projectViewModel.isLogin ? projectViewModel.user.age.toString() : "", style: TextStyle( fontSize: 15, letterSpacing: -0.59, @@ -251,6 +251,9 @@ class _SearchByClinicState extends State { height: 18, child: DropdownButtonHideUnderline( child: DropdownButton( + onTap: () { + print("Clicked"); + }, key: clinicDropdownKey, hint: new Text( TranslationBase.of(context).selectClinic, @@ -270,6 +273,9 @@ class _SearchByClinicState extends State { item.liveCareServiceID.toString(), child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(item.clinicDescription), + item.isLiveCareClinicAndOnline + ? SvgPicture.asset('assets/images/new-design/video_icon_green_right.svg', height: 12, width: 12, fit: BoxFit.cover) + : Container(), ]), ); }).toList(), @@ -448,8 +454,10 @@ class _SearchByClinicState extends State { page: LiveCareBookAppointment(clinicName: "Family Medicine", liveCareClinicID: dropdownValue.split("-")[2], liveCareServiceID: dropdownValue.split("-")[3]), ), ).then((value) { - print(value); - if (value == "false") dropdownValue = ""; + setState(() { + print(value); + if (value == "false") dropdownValue = null; + }); if (value == "livecare") { Navigator.push(context, FadePage(page: LiveCareHome())); } @@ -517,13 +525,20 @@ class _SearchByClinicState extends State { FadePage( page: DentalComplaints(searchInfo: searchInfo), ), - ); + ).then((value) { + setState(() { + dropdownValue = null; + }); + }); } Future navigateToSearchResults(context, List docList, List patientDoctorAppointmentListHospital) async { isProjectLoaded = false; Navigator.push(context, FadePage(page: SearchResults(isLiveCareAppointment: false, doctorsList: docList, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital))) .then((value) { + setState(() { + dropdownValue = null; + }); getProjectsList(); }); }