Merge branch 'ZohaibIqbalKambrani' into 'development'

Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!381

lib/config/localized_values.dart

@@ -556,6 +556,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": " ملخص التقارير الشهرية"
@@ -617,6 +618,7 @@ const Map localizedValues = {
   "DepositorName": {"en": "Depositor Name", "ar": "اسم المودع *"},
   "MobileNumber": {"en": "Mobile Number", "ar": "رقم الجوال"},
   "Ok": {"en": "Ok", "ar": "حسنا"},
+  "averageWaitingTime": {"en": "Average Waiting Time:", "ar": "متوسط ​​وقت الانتظار:"},
   "WaterConsumedInWeek": {
     "en": "Water consumed in a week",
     "ar": "معدل شرب الماء خلال الاسبوع"

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
+                              subText: '${mode.ProjectAvgERWaitingTimeModeList[index].distanceInKilometers ?? 0.0} ${TranslationBase.of(context).km_}',
-                                  .ProjectAvgERWaitingTimeModeList[index]
-                                  .distanceInKilometers
-                                  .toString(),
                               type: mode
                                   .ProjectAvgERWaitingTimeModeList[index].iD
                                   .toString(),

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,
+        entryAnimation: EntryAnimation.BOTTOM,
-        style: TextStyle(
+        image:Image.network(networkImage, fit: BoxFit.cover,),
-            fontSize: 22.0, fontWeight: FontWeight.w600),
+        title: Text(projectname,
-      ),image:Image.network(networkImage, fit: BoxFit.cover,),
+          style: TextStyle(
-
+              fontSize: 22.0, fontWeight: FontWeight.w600),
-        buttonOkText:Text("LOCATION"),
+        ),
-         buttonOkColor: Colors.grey,
+        description: Text("${localize.averageWaitingTime}\n\n$waitingTime ${localize.minute}", textAlign: TextAlign.center,),
-      buttonCancelText:Text('CAll') ,
+        buttonOkText:Text("LOCATION", style: TextStyle(color: Colors.white),),
-      buttonCancelColor: Colors.grey,
+        buttonOkColor: Colors.grey,
-      onOkButtonPressed: () {  MapsLauncher.launchCoordinates(double.parse(latitude),double.parse(longitude),projectname);},
+        buttonCancelText:Text('CAll', style: TextStyle(color: Colors.white),) ,
-      onCancelButtonPressed :() {launch("tel://" +telephone);}
+        buttonCancelColor: Colors.grey,
-
+        onOkButtonPressed: () {  MapsLauncher.launchCoordinates(double.parse(latitude),double.parse(longitude),projectname);},
-
+        onCancelButtonPressed :() {launch("tel://" +telephone);}
-
+    ));
-
-    ) );
 
   }
 
-  }
+}
 
 

lib/uitl/translations_delegate_base.dart

@@ -599,6 +599,7 @@ class TranslationBase {
   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 =>
@@ -665,6 +666,7 @@ class TranslationBase {
   String get mobileNumber =>
       localizedValues['MobileNumber'][locale.languageCode];
   String get ok => localizedValues['Ok'][locale.languageCode];
+  String get averageWaitingTime => localizedValues['averageWaitingTime'][locale.languageCode];
   String get waterConsumedInWeek =>
       localizedValues['WaterConsumedInWeek'][locale.languageCode];
   String get waterConsumedInMonth =>