From d1c99d1d821c25322cce4315fcd1b7bd28ed3624 Mon Sep 17 00:00:00 2001 From: Zohaib Iqbal Kambrani <> Date: Tue, 31 Aug 2021 15:29:11 +0300 Subject: [PATCH] ER Average waiting time label applied --- lib/config/localized_values.dart | 2 + lib/pages/ErService/NearestEr.dart | 9 ++-- .../ErService/widgets/card_position.dart | 42 +++++++++---------- lib/uitl/translations_delegate_base.dart | 2 + 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 875a97d3..0cdbd783 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -355,6 +355,7 @@ const Map localizedValues = { "VitalSign": {"en": "Vital Sign", "ar": "العلامة حيوية"}, "MonthlyReports": {"en": "Monthly Reports", "ar": "تقارير شهرية"}, "km": {"en": "KMs:", "ar": "كم"}, + "km_": {"en": "KM", "ar": "كم"}, "PatientHealthSummaryReport": {"en": "Patient Health Summary Report", "ar": " ملخص التقارير الشهرية"}, "ToViewTheTermsAndConditions": {"en": "To View The Terms And Conditions Report", "ar": " عرض الشروط والأحكام "}, "ClickHere": {"en": "Click here", "ar": "أنقر هنا"}, @@ -396,6 +397,7 @@ const Map localizedValues = { "Ok": {"en": "Ok", "ar": "حسنا"}, "WaterConsumedInWeek": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"}, "WaterConsumedInMonth": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"}, + "averageWaitingTime": {"en": "Average Waiting Time:", "ar": "متوسط ​​وقت الانتظار:"}, "TheVerificationCodeExpiresIn": {"en": "The Verification Code Expires In", "ar": "تنتهي صلاحية رمز التحقق في"}, "PleaseEnterTheVerificationCode": {"en": "Please enter the verification code send to", "ar": "الرجاء إدخال رمز التحقق المرسل إلى"}, "EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"}, diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index cbafacce..0ecb19a7 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -60,16 +60,17 @@ class NearestEr extends StatelessWidget { children: List.generate(7, (index) { return Container( child: CardPosition( + waitingTime: mode + .ProjectAvgERWaitingTimeModeList[index] + .avgTimeInHHMM + .toString(), text: mode .ProjectAvgERWaitingTimeModeList[index] .projectName .toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode - .ProjectAvgERWaitingTimeModeList[index] - .distanceInKilometers - .toString(), + subText: '${mode.ProjectAvgERWaitingTimeModeList[index].distanceInKilometers ?? 0.0} ${TranslationBase.of(context).km_}', type: mode .ProjectAvgERWaitingTimeModeList[index].iD .toString(), diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 69ccaffe..29fdd5a4 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -1,6 +1,7 @@ //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:flutter/material.dart'; import 'package:giffy_dialog/giffy_dialog.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -20,6 +21,7 @@ class CardPosition extends StatelessWidget { final longitude; final projectname; final cardSize; + final String waitingTime; const CardPosition( { @@ -32,7 +34,8 @@ class CardPosition extends StatelessWidget { @required this.latitude, @required this.longitude, @required this.projectname , - @required this.cardSize , + @required this.cardSize, + @required this.waitingTime , }); @override @@ -83,31 +86,26 @@ class CardPosition extends StatelessWidget { } Future navigateToSearch(context, type,telephone,networkImage,latitude,longitude,projectname) async { - - - - + var localize = TranslationBase.of(context); showDialog( context: context,builder: (_) => AssetGiffyDialog( - title: Text(projectname, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ),image:Image.network(networkImage, fit: BoxFit.cover,), - - buttonOkText:Text("LOCATION"), - buttonOkColor: Colors.grey, - buttonCancelText:Text('CAll') , - buttonCancelColor: Colors.grey, - onOkButtonPressed: () { MapsLauncher.launchCoordinates(double.parse(latitude),double.parse(longitude),projectname);}, - onCancelButtonPressed :() {launch("tel://" +telephone);} - - - - - ) ); + entryAnimation: EntryAnimation.BOTTOM, + image:Image.network(networkImage, fit: BoxFit.cover,), + title: Text(projectname, + style: TextStyle( + fontSize: 22.0, fontWeight: FontWeight.w600), + ), + description: Text("${localize.averageWaitingTime}\n\n$waitingTime ${localize.minute}", textAlign: TextAlign.center,), + buttonOkText:Text("LOCATION", style: TextStyle(color: Colors.white),), + buttonOkColor: Colors.grey, + buttonCancelText:Text('CAll', style: TextStyle(color: Colors.white),) , + buttonCancelColor: Colors.grey, + onOkButtonPressed: () { MapsLauncher.launchCoordinates(double.parse(latitude),double.parse(longitude),projectname);}, + onCancelButtonPressed :() {launch("tel://" +telephone);} + )); } - } +} diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 6ebba17b..b8968adb 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -461,6 +461,7 @@ class TranslationBase { String get userView => localizedValues['user-view'][locale.languageCode]; String get sentRequest => localizedValues['sent-requests'][locale.languageCode]; String get km => localizedValues['km'][locale.languageCode]; + String get km_ => localizedValues['km_'][locale.languageCode]; String get patientHealthSummaryReport => localizedValues['PatientHealthSummaryReport'][locale.languageCode]; String get toViewTheTermsAndConditions => localizedValues['ToViewTheTermsAndConditions'][locale.languageCode]; String get clickHere => localizedValues['ClickHere'][locale.languageCode]; @@ -500,6 +501,7 @@ class TranslationBase { String get ok => localizedValues['Ok'][locale.languageCode]; String get waterConsumedInWeek => localizedValues['WaterConsumedInWeek'][locale.languageCode]; String get waterConsumedInMonth => localizedValues['WaterConsumedInMonth'][locale.languageCode]; + String get averageWaitingTime => localizedValues['averageWaitingTime'][locale.languageCode]; String get theVerificationCodeExpiresIn => localizedValues['TheVerificationCodeExpiresIn'][locale.languageCode]; String get pleaseEnterTheVerificationCode => localizedValues['PleaseEnterTheVerificationCode'][locale.languageCode]; String get eyeMeasurements => localizedValues['EyeMeasurements'][locale.languageCode];