Merge branch 'dev_v3.13.6_search_hospital_by_region' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region

merge-update-with-lab-changes
taha.alam 1 year ago
commit 2a37777b9a

@ -2143,5 +2143,5 @@ const Map localizedValues = {
"hmgHospital": {"en": "HMG Hospital", "ar": "مستشفى HMG"},
"hmcHospital": {"en": "HMC", "ar": "HMC"},
"hmcHospitalCount": {"en": "@ HMC", "ar": "@ HMC"},
"hmgHospitalCount": {"en": "@ HMG Hospital", "ar": "@ مستشفى HMC"},
"hmgHospitalCount": {"en": "@ HMG Hospital", "ar": "@ مستشفى HMG"},
};

@ -369,7 +369,7 @@ class HospitalTitle extends StatelessWidget {
Text(
isHMC
? "${TranslationBase.of(context).hmcHospitalCount.replaceAll("@", itemCount)}"
: "${TranslationBase.of(context).hmgHospitalCount.replaceAll("@", itemCount)} ,",
: "${TranslationBase.of(context).hmgHospitalCount.replaceAll("@", itemCount)}",
style: TextStyle(
fontSize: 12, color: Colors.black, fontWeight: FontWeight.w600),
),

@ -63,13 +63,11 @@ class _LiveCareBookAppointmentState extends State<LiveCareBookAppointment> {
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
child: SvgPicture.asset(
SvgPicture.asset(
"assets/images/new-design/liveCare_mobile_care.svg",
width: 150.0),
),
Container(
margin: EdgeInsets.only(left: 10.0, right: 8.0),
Flexible(
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -200,6 +198,7 @@ class _LiveCareBookAppointmentState extends State<LiveCareBookAppointment> {
),
],
),
),
)
],
),

@ -55,8 +55,9 @@ class _SearchByHospitalState extends State<SearchByHospital> {
void initState() {
locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context);
locationUtils.getCurrentLocation();
WidgetsBinding.instance.addPostFrameCallback((_) => getProjectsList());
WidgetsBinding.instance.addPostFrameCallback((_) {
getProjectsList();
});
}
@override
@ -271,11 +272,13 @@ class _SearchByHospitalState extends State<SearchByHospital> {
projectsList = projectsListLocal;
});
} else {}
locationUtils.getCurrentLocation();
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
locationUtils.getCurrentLocation();
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
locationUtils.getCurrentLocation();
print(err);
});
}

Loading…
Cancel
Save