WD: doctor screen issue changes and string changes of top bar

merge-update-with-lab-changes
taha.alam 1 year ago
parent ca965a6d06
commit 88cd6f811a

@ -1599,8 +1599,8 @@ const Map localizedValues = {
"RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"}, "RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"},
"PatientInfo": {"en": "Patient Info", "ar": "معلومات المراجع"}, "PatientInfo": {"en": "Patient Info", "ar": "معلومات المراجع"},
"OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"}, "OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"},
"inPrgress": {"en": "In Progress", "ar": "جاري الاختيار"}, "inPrgress": {"en": "Active", "ar": "نشط"},
"locked": {"en": "Locked", "ar": "غير مفعل"}, "locked": {"en": "Inactive", "ar": "غير نشط"},
"personalInfo": {"en": "Personal Information", "ar": "معلومات شخصية"}, "personalInfo": {"en": "Personal Information", "ar": "معلومات شخصية"},
"cmcTitle": {"en": "Comprehensive", "ar": "خدمة"}, "cmcTitle": {"en": "Comprehensive", "ar": "خدمة"},
"cmcSubtitle": {"en": "Medical Checkup", "ar": "الفحص الشامل"}, "cmcSubtitle": {"en": "Medical Checkup", "ar": "الفحص الشامل"},

@ -57,7 +57,15 @@ class _SearchByHospitalState extends State<SearchByHospital> {
new LocationUtils(isShowConfirmDialog: true, context: context); new LocationUtils(isShowConfirmDialog: true, context: context);
} }
// @override @override
void deactivate() {
super.deactivate();
}
@override
void reassemble() {
super.reassemble();
} // @override
// void didChangeDependencies() { // void didChangeDependencies() {
// WidgetsBinding.instance.addPostFrameCallback((_) { // WidgetsBinding.instance.addPostFrameCallback((_) {
// getProjectsList(); // getProjectsList();

@ -6,7 +6,7 @@ import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class ResultByDoctor extends StatelessWidget { class ResultByDoctor extends StatefulWidget {
List<DoctorList> doctorsList = []; List<DoctorList> doctorsList = [];
List<DoctorList>? patientDoctorAppointmentListHospital; List<DoctorList>? patientDoctorAppointmentListHospital;
final bool isLiveCareAppointment; final bool isLiveCareAppointment;
@ -24,11 +24,15 @@ class ResultByDoctor extends StatelessWidget {
this.obGyneProcedureListResponse, this.obGyneProcedureListResponse,
}); });
@override
State<ResultByDoctor> createState() => _ResultByDoctorState();
}
class _ResultByDoctorState extends State<ResultByDoctor> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox( return SizedBox(
child: patientDoctorAppointmentListHospital?.isNotEmpty == child: widget.patientDoctorAppointmentListHospital?.isNotEmpty == true
true
? Padding( ? Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: ListView.separated( child: ListView.separated(
@ -43,15 +47,17 @@ class ResultByDoctor extends StatelessWidget {
); );
}, },
itemBuilder: (context, index) { itemBuilder: (context, index) {
final doctor = patientDoctorAppointmentListHospital![index]; final doctor =
widget.patientDoctorAppointmentListHospital![index];
return DoctorView( return DoctorView(
doctor: doctor, doctor: doctor,
isLiveCareAppointment: isLiveCareAppointment, isLiveCareAppointment: widget.isLiveCareAppointment,
isObGyneAppointment: isObGyneAppointment, isObGyneAppointment: widget.isObGyneAppointment,
isDoctorNameSearch: isDoctorNameSearch, isDoctorNameSearch: widget.isDoctorNameSearch,
obGyneProcedureListResponse: obGyneProcedureListResponse, obGyneProcedureListResponse:
isShowDate: false, widget.obGyneProcedureListResponse,
isShowDate: false,
onTap: () { onTap: () {
context context
.read<ProjectViewModel>() .read<ProjectViewModel>()
@ -61,10 +67,16 @@ class ResultByDoctor extends StatelessWidget {
appointment_type: 'regular', doctor: doctor); appointment_type: 'regular', doctor: doctor);
}); });
}, },
itemCount: patientDoctorAppointmentListHospital?.length ?? 0, itemCount:
widget.patientDoctorAppointmentListHospital?.length ?? 0,
), ),
) )
: getNoDataWidget(context), : getNoDataWidget(context),
); );
} }
@override
void dispose() {
super.dispose();
}
} }

@ -63,7 +63,10 @@ class _SearchResultWithTabForHospitalState
changePageViewIndex(pageIndex) { changePageViewIndex(pageIndex) {
_controller.jumpToPage(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 @override

@ -41,10 +41,10 @@ class _DentalComplaintCardState extends State<DentalComplaintCard> {
// if(widget.isDoctorNameSearch) { // if(widget.isDoctorNameSearch) {
// widget.onSelectedMethod(); // widget.onSelectedMethod();
// } else { // } else {
// if (widget.isFromHospitalSearchPage) { if (widget.isFromHospitalSearchPage) {
// getChiefComplaintsDoctorMappedList(); getChiefComplaintsDoctorMappedList();
// } else } else
getChiefComplaintsList(); getChiefComplaintsList();
// } // }
}, },
child: Container( child: Container(

@ -49,13 +49,12 @@ class DoctorView extends StatefulWidget {
State<DoctorView> createState() => _DoctorViewState(); State<DoctorView> createState() => _DoctorViewState();
} }
class _DoctorViewState extends State<DoctorView> with AutomaticKeepAliveClientMixin { class _DoctorViewState extends State<DoctorView> {
late ProjectViewModel projectViewModel; late ProjectViewModel projectViewModel;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectViewModel = Provider.of(context); projectViewModel = Provider.of(context);
super.build(context);
return InkWell( return InkWell(
onTap: () { onTap: () {
if (widget.isObGyneAppointment) { if (widget.isObGyneAppointment) {

@ -4,22 +4,17 @@ import 'dart:io';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.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/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/appointment_rate_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.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/models/LiveCare/IncomingCallData.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart'; import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
import 'package:diplomaticquarterapp/pages/landing/home_page_2.dart'; import 'package:diplomaticquarterapp/pages/landing/home_page_2.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.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/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
import 'package:diplomaticquarterapp/services/family_files/family_files_provider.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/drawer/app_drawer_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/not_auh_page.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:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// import 'package:flutter_app_icon_badge/flutter_app_icon_badge.dart'; // import 'package:flutter_app_icon_badge/flutter_app_icon_badge.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../locator.dart'; import '../../locator.dart';
@ -205,9 +197,9 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
return; return;
} }
} }
Future.delayed(Duration(seconds: 0), () { // Future.delayed(Duration(seconds: 0), () {
setState(() { // setState(() {
if (tab == 5) { if (tab == 5) {
IS_VOICE_COMMAND_CLOSED = false; IS_VOICE_COMMAND_CLOSED = false;
triggerRobot(); triggerRobot();
@ -215,7 +207,8 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
} else { } else {
if (currentTab > 0 && tab == 2) { if (currentTab > 0 && tab == 2) {
pageController.jumpToPage(0); pageController.jumpToPage(0);
currentTab = tab;
currentTab = tab;
} else if (tab != 0) { } else if (tab != 0) {
// if (tab == 4 && projectViewModel.isLogin && model.count == 0) { // if (tab == 4 && projectViewModel.isLogin && model.count == 0) {
// AppToast.showErrorToast(message: TranslationBase.of(context).noBookedAppo); // AppToast.showErrorToast(message: TranslationBase.of(context).noBookedAppo);
@ -227,11 +220,11 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
pageController.jumpToPage(tab); pageController.jumpToPage(tab);
currentTab = tab; currentTab = tab;
} }
setState(() {});
// currentTab = tab; // currentTab = tab;
} }
}); // });
}); // });
projectViewModel.analytics.bottomTabNavigation.log(tabIndex: tab, isLoggedIn: projectViewModel.isLogin); projectViewModel.analytics.bottomTabNavigation.log(tabIndex: tab, isLoggedIn: projectViewModel.isLogin);
} }

Loading…
Cancel
Save