diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 21c81820..6e58d1af 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1599,8 +1599,8 @@ const Map localizedValues = { "RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"}, "PatientInfo": {"en": "Patient Info", "ar": "معلومات المراجع"}, "OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"}, - "inPrgress": {"en": "In Progress", "ar": "جاري الاختيار"}, - "locked": {"en": "Locked", "ar": "غير مفعل"}, + "inPrgress": {"en": "Active", "ar": "نشط"}, + "locked": {"en": "Inactive", "ar": "غير نشط"}, "personalInfo": {"en": "Personal Information", "ar": "معلومات شخصية"}, "cmcTitle": {"en": "Comprehensive", "ar": "خدمة"}, "cmcSubtitle": {"en": "Medical Checkup", "ar": "الفحص الشامل"}, diff --git a/lib/pages/BookAppointment/components/search_by_hospital_name.dart b/lib/pages/BookAppointment/components/search_by_hospital_name.dart index 01e9711c..8f7b295f 100644 --- a/lib/pages/BookAppointment/components/search_by_hospital_name.dart +++ b/lib/pages/BookAppointment/components/search_by_hospital_name.dart @@ -57,7 +57,15 @@ class _SearchByHospitalState extends State { new LocationUtils(isShowConfirmDialog: true, context: context); } - // @override + @override + void deactivate() { + super.deactivate(); + } + + @override + void reassemble() { + super.reassemble(); + } // @override // void didChangeDependencies() { // WidgetsBinding.instance.addPostFrameCallback((_) { // getProjectsList(); diff --git a/lib/pages/BookAppointment/search_result/ResultByDoctors.dart b/lib/pages/BookAppointment/search_result/ResultByDoctors.dart index 97e0ff05..04c117c0 100644 --- a/lib/pages/BookAppointment/search_result/ResultByDoctors.dart +++ b/lib/pages/BookAppointment/search_result/ResultByDoctors.dart @@ -6,7 +6,7 @@ import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -class ResultByDoctor extends StatelessWidget { +class ResultByDoctor extends StatefulWidget { List doctorsList = []; List? patientDoctorAppointmentListHospital; final bool isLiveCareAppointment; @@ -24,11 +24,15 @@ class ResultByDoctor extends StatelessWidget { this.obGyneProcedureListResponse, }); + @override + State createState() => _ResultByDoctorState(); +} + +class _ResultByDoctorState extends State { @override Widget build(BuildContext context) { return SizedBox( - child: patientDoctorAppointmentListHospital?.isNotEmpty == - true + child: widget.patientDoctorAppointmentListHospital?.isNotEmpty == true ? Padding( padding: const EdgeInsets.all(12.0), child: ListView.separated( @@ -43,15 +47,17 @@ class ResultByDoctor extends StatelessWidget { ); }, itemBuilder: (context, index) { - final doctor = patientDoctorAppointmentListHospital![index]; + final doctor = + widget.patientDoctorAppointmentListHospital![index]; return DoctorView( doctor: doctor, - isLiveCareAppointment: isLiveCareAppointment, - isObGyneAppointment: isObGyneAppointment, - isDoctorNameSearch: isDoctorNameSearch, - obGyneProcedureListResponse: obGyneProcedureListResponse, - isShowDate: false, + isLiveCareAppointment: widget.isLiveCareAppointment, + isObGyneAppointment: widget.isObGyneAppointment, + isDoctorNameSearch: widget.isDoctorNameSearch, + obGyneProcedureListResponse: + widget.obGyneProcedureListResponse, + isShowDate: false, onTap: () { context .read() @@ -61,10 +67,16 @@ class ResultByDoctor extends StatelessWidget { appointment_type: 'regular', doctor: doctor); }); }, - itemCount: patientDoctorAppointmentListHospital?.length ?? 0, + itemCount: + widget.patientDoctorAppointmentListHospital?.length ?? 0, ), ) : getNoDataWidget(context), ); } + + @override + void dispose() { + super.dispose(); + } } diff --git a/lib/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart b/lib/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart index 7fe5b539..c190554d 100644 --- a/lib/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart +++ b/lib/pages/BookAppointment/search_result/SearchResultWithTabForHospital.dart @@ -63,7 +63,10 @@ class _SearchResultWithTabForHospitalState changePageViewIndex(pageIndex) { _controller.jumpToPage(pageIndex); - scrollController.jumpTo(pageIndex.toDouble()); + // if (scrollController.hasClients) { + // print("it has clients"); + // scrollController.animateTo(pageIndex.toDouble(),curve: Curves.easeOut, + // duration: const Duration(milliseconds: 300),);} } @override diff --git a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart index 8d664dc5..bfd0c60c 100644 --- a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart +++ b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart @@ -41,10 +41,10 @@ class _DentalComplaintCardState extends State { // if(widget.isDoctorNameSearch) { // widget.onSelectedMethod(); // } else { - // if (widget.isFromHospitalSearchPage) { - // getChiefComplaintsDoctorMappedList(); - // } else - getChiefComplaintsList(); + if (widget.isFromHospitalSearchPage) { + getChiefComplaintsDoctorMappedList(); + } else + getChiefComplaintsList(); // } }, child: Container( diff --git a/lib/pages/BookAppointment/widgets/DoctorView.dart b/lib/pages/BookAppointment/widgets/DoctorView.dart index ac6e4230..9939e87c 100644 --- a/lib/pages/BookAppointment/widgets/DoctorView.dart +++ b/lib/pages/BookAppointment/widgets/DoctorView.dart @@ -49,13 +49,12 @@ class DoctorView extends StatefulWidget { State createState() => _DoctorViewState(); } -class _DoctorViewState extends State with AutomaticKeepAliveClientMixin { +class _DoctorViewState extends State { late ProjectViewModel projectViewModel; @override Widget build(BuildContext context) { projectViewModel = Provider.of(context); - super.build(context); return InkWell( onTap: () { if (widget.isObGyneAppointment) { diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index b58921a6..ffc9fec5 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -4,22 +4,17 @@ import 'dart:io'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; -import 'package:diplomaticquarterapp/core/model/geofencing/requests/GeoZonesRequestModel.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; -import 'package:diplomaticquarterapp/core/service/geofencing/GeofencingServices.dart'; import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; -import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; import 'package:diplomaticquarterapp/models/LiveCare/IncomingCallData.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart'; import 'package:diplomaticquarterapp/pages/landing/home_page_2.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart'; -import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart'; -import 'package:diplomaticquarterapp/pages/videocall-webrtc-rnd/webrtc/start_video_call.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart' @@ -40,15 +35,12 @@ import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart'; import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/not_auh_page.dart'; -import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // import 'package:flutter_app_icon_badge/flutter_app_icon_badge.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; -import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; import '../../locator.dart'; @@ -205,9 +197,9 @@ class _LandingPageState extends State with WidgetsBindingObserver { return; } } - Future.delayed(Duration(seconds: 0), () { - setState(() { - if (tab == 5) { + // Future.delayed(Duration(seconds: 0), () { + // setState(() { + if (tab == 5) { IS_VOICE_COMMAND_CLOSED = false; triggerRobot(); @@ -215,7 +207,8 @@ class _LandingPageState extends State with WidgetsBindingObserver { } else { if (currentTab > 0 && tab == 2) { pageController.jumpToPage(0); - currentTab = tab; + + currentTab = tab; } else if (tab != 0) { // if (tab == 4 && projectViewModel.isLogin && model.count == 0) { // AppToast.showErrorToast(message: TranslationBase.of(context).noBookedAppo); @@ -227,11 +220,11 @@ class _LandingPageState extends State with WidgetsBindingObserver { pageController.jumpToPage(tab); currentTab = tab; } - + setState(() {}); // currentTab = tab; } - }); - }); + // }); + // }); projectViewModel.analytics.bottomTabNavigation.log(tabIndex: tab, isLoggedIn: projectViewModel.isLogin); }