WD:String value change and context changes

merge-update-with-lab-changes
taha.alam 11 months ago
parent e6fcb1fddf
commit ca965a6d06

@ -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": "In Progress", "ar": "جاري الاختيار"},
"locked": {"en": "Locked", "ar": "مقفل"}, "locked": {"en": "Locked", "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": "الفحص الشامل"},

@ -74,6 +74,13 @@ class HospitalsModel {
return regionEnglish; return regionEnglish;
} }
String? getName(bool isArabic) {
if (isArabic) {
return "$legalNameN";
}
return legalName;
}
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['Desciption'] = this.desciption; data['Desciption'] = this.desciption;

@ -1,18 +1,14 @@
import 'package:diplomaticquarterapp/analytics/flows/appointments.dart';
import 'package:diplomaticquarterapp/analytics/google-analytics.dart'; import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByClinic.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByClinic.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByDoctor.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByDoctor.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/components/search_by_hospital_name.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/components/search_by_hospital_name.dart';
import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'components/SearchByClinic.dart';
class Search extends StatefulWidget { class Search extends StatefulWidget {
final int type; final int type;
final List? clnicIds; final List? clnicIds;

@ -521,6 +521,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
} }
getClinicsList() async { getClinicsList() async {
AppGlobal.context = context;
if (await sharedPref.getObject(CLINICS_LIST) != null) { if (await sharedPref.getObject(CLINICS_LIST) != null) {
dynamic res = await sharedPref.getObject(CLINICS_LIST); dynamic res = await sharedPref.getObject(CLINICS_LIST);
setState(() { setState(() {

@ -50,13 +50,27 @@ class _SearchByHospitalState extends State<SearchByHospital> {
@override @override
void initState() { void initState() {
locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
getProjectsList(); getProjectsList();
}); });
locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context);
} }
// @override
// void didChangeDependencies() {
// WidgetsBinding.instance.addPostFrameCallback((_) {
// getProjectsList();
// });
// }
// @override
// void didUpdateWidget(SearchByHospital oldWidget) {
// WidgetsBinding.instance.addPostFrameCallback((_) {
// getProjectsList();
// });
// }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppGlobal.context = context; AppGlobal.context = context;
@ -260,20 +274,20 @@ class _SearchByHospitalState extends State<SearchByHospital> {
} }
getProjectsList() { getProjectsList() {
AppGlobal.context = context;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2; int languageID = context.read<ProjectViewModel>().isArabic ? 1 : 2;
ClinicListService service = new ClinicListService(); ClinicListService service = new ClinicListService();
List<HospitalsModel> projectsListLocal = []; List<HospitalsModel> projectsListLocal = [];
service.getProjectsList(languageID, context).then((res) { service.getProjectsList(languageID, context).then((res) async {
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() async {
res['ListProject'].forEach((v) { res['ListProject'].forEach((v) {
projectsListLocal.add(new HospitalsModel.fromJson(v)); projectsListLocal.add(new HospitalsModel.fromJson(v));
}); });
projectsList = projectsListLocal; projectsList = projectsListLocal;
hospitalList = await DoctorMapper.getMappedHospitals(projectsList); hospitalList = await DoctorMapper.getMappedHospitals(projectsList,
}); isArabic: context.read<ProjectViewModel>().isArabic);
setState(() {});
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
} else {} } else {}
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -150,7 +150,7 @@ class DoctorMapper{
existingEntry.first.hospitalList.add(hospital); existingEntry.first.hospitalList.add(hospital);
} else { } else {
final newEntry = PatientDoctorAppointmentList( final newEntry = PatientDoctorAppointmentList(
filterName: hospital.legalName, filterName: hospital.getName(isArabic),
distanceInKMs: hospital.distanceInKilometers?.toString(), distanceInKMs: hospital.distanceInKilometers?.toString(),
projectTopName: hospital.name, projectTopName: hospital.name,
projectBottomName: hospital.legalName, projectBottomName: hospital.legalName,

@ -37,10 +37,11 @@ class LocationUtils {
if (callBack != null) callBack(LatLng(value.latitude, value.longitude)); if (callBack != null) callBack(LatLng(value.latitude, value.longitude));
}).catchError((err) { }).catchError((err) {
print(err); print(err);
if (isShowConfirmDialog && isShowLocationTimeoutDialog) if (isShowConfirmDialog && isShowLocationTimeoutDialog) {
showLocationTimeOutDialog(failureCallBack: () { showLocationTimeOutDialog(failureCallBack: () {
Geolocator.openAppSettings(); Geolocator.openAppSettings();
}); });
}
}); });
} }

Loading…
Cancel
Save