From 5ec3935c6890612a1cb5c8718f93e54b579d1b43 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 2 Sep 2020 16:17:22 +0300 Subject: [PATCH 01/17] ER --- lib/config/localized_values.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index ea14b71f..ca6ec86d 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -363,7 +363,7 @@ const Map> localizedValues = { "consultation": {"en": "Consultation", "ar": "استشارة"}, "logs": {"en": "Logs", "ar": "السجلات"}, "textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"}, - "locationDialogMessage": {"en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.", "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."} + "locationDialogMessage": {"en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.", "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."}, "parking":{"en":"Parking","ar":"مواقف"}, "alhabiServices":{"en":"HMG Service","ar":"خدمات الحبيب"}, "parkingTitle":{"en":"Car service, car service, service to save parking information, return to it later, 1- By clicking on (Read the code), save the parking data. 2- By clicking on the button (view my car park), it shows you the car’s location in Google Maps. 3- Read another position by pressing the Clear Position Data button.","ar":" خدمة المواقف، تتيح هذه الخدمة للمستخدم معلومات عن موقف السيارة ليسهل عليه العودة لها لاحقاً ، 1- بالضغط على زر(قراءة الكود) تستطيع حفظ البيانات الخاصة بالموقف. 2-بالضغط على زر(عرض موقف سيارتي) يعرض لك موقع السيارة في خرائط قوقل. 3- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). "}, @@ -375,5 +375,8 @@ const Map> localizedValues = { "building":{"en":"Building:","ar":"المبنى"}, "branch":{"en":"Branch:","ar":"الفرع"}, "emergencyServices":{"en":"Emergency Services:","ar":"خدمات الطوارئ"}, - "textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"} + "nearester":{"en":"Nearest ER:","ar":"أقرب طوارى"}, + "locationa":{"en":"location:","ar":"الموقع"}, + "ambulancerequest":{"en":"Ambulance :","ar":"طلب نقل "}, + "requestA":{"en":"Request:","ar":"اسعاف"}, }; From 4ffbb80f3d4c830e978f2d425a5c356867ce7712 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 2 Sep 2020 16:17:37 +0300 Subject: [PATCH 02/17] ER --- .../er_service/projectavgerwaitingtime.dart | 52 +++++++++++++ lib/pages/ErService/ErOptions.dart | 76 +++++++++++++++++++ lib/pages/ErService/widgets/card_common.dart | 64 ++++++++++++++++ lib/pages/landing/home_page.dart | 47 +++++++----- lib/uitl/translations_delegate_base.dart | 8 ++ 5 files changed, 226 insertions(+), 21 deletions(-) create mode 100644 lib/core/model/er_service/projectavgerwaitingtime.dart create mode 100644 lib/pages/ErService/ErOptions.dart create mode 100644 lib/pages/ErService/widgets/card_common.dart diff --git a/lib/core/model/er_service/projectavgerwaitingtime.dart b/lib/core/model/er_service/projectavgerwaitingtime.dart new file mode 100644 index 00000000..7d5f8ca4 --- /dev/null +++ b/lib/core/model/er_service/projectavgerwaitingtime.dart @@ -0,0 +1,52 @@ +class ProjectAvgERWaitingTime { + int iD; + int projectID; + int avgTimeInMinutes; + String avgTimeInHHMM; + double distanceInKilometers; + String latitude; + String longitude; + String phoneNumber; + String projectImageURL; + String projectName; + + ProjectAvgERWaitingTime( + {this.iD, + this.projectID, + this.avgTimeInMinutes, + this.avgTimeInHHMM, + this.distanceInKilometers, + this.latitude, + this.longitude, + this.phoneNumber, + this.projectImageURL, + this.projectName}); + + ProjectAvgERWaitingTime.fromJson(Map json) { + iD = json['ID']; + projectID = json['ProjectID']; + avgTimeInMinutes = json['AvgTimeInMinutes']; + avgTimeInHHMM = json['AvgTimeInHHMM']; + distanceInKilometers = json['DistanceInKilometers']; + latitude = json['Latitude']; + longitude = json['Longitude']; + phoneNumber = json['PhoneNumber']; + projectImageURL = json['ProjectImageURL']; + projectName = json['ProjectName']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['ProjectID'] = this.projectID; + data['AvgTimeInMinutes'] = this.avgTimeInMinutes; + data['AvgTimeInHHMM'] = this.avgTimeInHHMM; + data['DistanceInKilometers'] = this.distanceInKilometers; + data['Latitude'] = this.latitude; + data['Longitude'] = this.longitude; + data['PhoneNumber'] = this.phoneNumber; + data['ProjectImageURL'] = this.projectImageURL; + data['ProjectName'] = this.projectName; + return data; + } +} \ No newline at end of file diff --git a/lib/pages/ErService/ErOptions.dart b/lib/pages/ErService/ErOptions.dart new file mode 100644 index 00000000..33de54b9 --- /dev/null +++ b/lib/pages/ErService/ErOptions.dart @@ -0,0 +1,76 @@ +import 'package:diplomaticquarterapp/uitl/location_util.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 '../../uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; + +class ErOptions extends StatefulWidget { + final bool isAppbar; + + const ErOptions({Key key, this.isAppbar}) : super(key: key); + + + @override + _ErOptionsState createState() => _ErOptionsState(); +} + +class _ErOptionsState extends State { + LocationUtils locationUtils; + + @override + void initState() { + locationUtils = + new LocationUtils(isShowConfirmDialog: true, context: context); + WidgetsBinding.instance + .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); + + super.initState(); + } + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: widget.isAppbar, + appBarTitle: TranslationBase.of(context).bookAppo, + body: Container( + margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(TranslationBase.of(context).searchBy, + style: TextStyle( + fontSize: 24.0, + letterSpacing: 1.0, + fontWeight: FontWeight.bold, + color: new Color(0xFF60686b))), + Container( + margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/AM.PNG', + text: TranslationBase.of(context).ambulancerequest, + subText: TranslationBase.of(context).requestA, + type: 0, + ), + ), + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/emergency_icon.png', + text: TranslationBase.of(context).nearester, + subText: TranslationBase.of(context).locationa, + type: 1), + ) + ], + ), + ), + ], + ), + ), + ); + } +} + diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart new file mode 100644 index 00000000..124c73c4 --- /dev/null +++ b/lib/pages/ErService/widgets/card_common.dart @@ -0,0 +1,64 @@ +//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:flutter/material.dart'; + +class CardCommonEr extends StatelessWidget { + final image; + final text; + final subText; + final type; + const CardCommonEr( + {@required this.image, + @required this.text, + @required this.subText, + @required this.type}); + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () { + navigateToSearch(context, this.type); + }, + child: Container( + margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), + decoration: BoxDecoration(boxShadow: [ + BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) + ], borderRadius: BorderRadius.circular(10), color: Colors.white), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0), + child: Text(this.text, + overflow: TextOverflow.clip, + style: TextStyle( + color: new Color(0xFFc5272d), + letterSpacing: 1.0, + fontSize: 20.0)), + ), + Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0), + child: Text(this.subText, + overflow: TextOverflow.clip, + style: TextStyle( + color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)), + ), + Container( + alignment: Alignment.bottomRight, + margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0), + child: Image.asset(this.image, width: 60.0, height: 60.0), + ), + ], + ), + ), + ); + } + + Future navigateToSearch(context, type) async { +// Navigator.push( +// context, +// MaterialPageRoute( +// builder: (context) => Search( +// type: type, +// ))); + } +} diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 06a2f9ca..de1670e6 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart'; +import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -512,27 +513,31 @@ class _HomePageState extends State { )), Container( width: MediaQuery.of(context).size.width * 0.29, - child: Center( - child: Padding( - padding: const EdgeInsets.all(15.0), - child: Column( - children: [ - Image.asset( - 'assets/images/Dr_Schedule_report.png', - width: 50, - height: 50, - ), - SizedBox( - height: 15, - ), - Texts( - TranslationBase.of(context).emergencyServices, - textAlign: TextAlign.center, - color: Colors.black87, - bold: false, - fontSize: SizeConfig.textMultiplier * 2.0, - ) - ], + child: InkWell( + onTap: ()=>Navigator.push(context, + FadePage(page: ErOptions(isAppbar: true,))), + child: Center( + child: Padding( + padding: const EdgeInsets.all(15.0), + child: Column( + children: [ + Image.asset( + 'assets/images/Dr_Schedule_report.png', + width: 50, + height: 50, + ), + SizedBox( + height: 15, + ), + Texts( + TranslationBase.of(context).emergencyServices, + textAlign: TextAlign.center, + color: Colors.black87, + bold: false, + fontSize: SizeConfig.textMultiplier * 2.0, + ) + ], + ), ), ), ), diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index d9fc04bc..ba4e7ad7 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -444,6 +444,14 @@ class TranslationBase { String get branch =>localizedValues['branch'][locale.languageCode]; String get emergencyServices =>localizedValues['emergencyServices'][locale.languageCode]; + String get nearester=> localizedValues['nearester'][locale.languageCode]; + String get locationa=> localizedValues['locationa'][locale.languageCode]; + String get ambulancerequest=> localizedValues['ambulancerequest'][locale.languageCode]; + String get requestA=> localizedValues['requestA'][locale.languageCode]; + + + + String get consultation => localizedValues['consultation'][locale.languageCode]; From e909c16b805f8c5dada92fb55d486c341e383595 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 3 Sep 2020 15:10:25 +0300 Subject: [PATCH 03/17] ER --- lib/pages/ErService/NearestEr.dart | 144 +++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 lib/pages/ErService/NearestEr.dart diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart new file mode 100644 index 00000000..eba0dd4f --- /dev/null +++ b/lib/pages/ErService/NearestEr.dart @@ -0,0 +1,144 @@ +import 'package:diplomaticquarterapp/uitl/location_util.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import '../../uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; +class NearestEr extends StatefulWidget { + final bool isAppbar; + + const NearestEr({Key key, this.isAppbar}) : super(key: key); + @override + _NearestErState createState() => _NearestErState(); +} + +class _NearestErState extends State { + LocationUtils locationUtils; + @override + void initState() { + locationUtils = + new LocationUtils(isShowConfirmDialog: true, context: context); + WidgetsBinding.instance + .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); + + super.initState(); + } + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: widget.isAppbar, + appBarTitle: TranslationBase.of(context).bookAppo, + body: Container( + margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), + child: ListView( + + children: [ + Text(TranslationBase.of(context).searchBy, + style: TextStyle( + fontSize: 24.0, + letterSpacing: 1.0, + fontWeight: FontWeight.bold, + color: new Color(0xFF60686b))), + Container( + margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), + + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).ambulancerequest, + subText: TranslationBase.of(context).requestA, + type: 0, + ), + flex: 0, + ), + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).nearester, + subText: TranslationBase.of(context).locationa, + type: 1), + flex: 0, + + ) + ], + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).ambulancerequest, + subText: TranslationBase.of(context).requestA, + type: 0, + ), + flex: 0, + ), + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).nearester, + subText: TranslationBase.of(context).locationa, + type: 1), + flex: 0, + ) + ], + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).ambulancerequest, + subText: TranslationBase.of(context).requestA, + type: 0, + ), + flex: 0, + ), + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).nearester, + subText: TranslationBase.of(context).locationa, + type: 1), + flex: 0, + + ) + ], + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardCommonEr( + image: 'assets/images/new-design/find_us_icon.png', + text: TranslationBase.of(context).ambulancerequest, + subText: TranslationBase.of(context).requestA, + type: 0, + + ), + flex: 0, + ), + + ], + ), + ], + ) + ), + ], + ), + ), + ); + } +} From e254261ef91ebec6c9ea58d43f9b94bc18894b4c Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 6 Sep 2020 09:48:55 +0300 Subject: [PATCH 04/17] ER --- lib/pages/ErService/AmbulanceReq.dart | 0 lib/pages/ErService/ErOptions.dart | 15 ++-- lib/pages/ErService/NearestEr.dart | 19 +++-- lib/pages/ErService/widgets/card_common.dart | 16 ++++ .../ErService/widgets/card_position.dart | 83 +++++++++++++++++++ 5 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 lib/pages/ErService/AmbulanceReq.dart create mode 100644 lib/pages/ErService/widgets/card_position.dart diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart new file mode 100644 index 00000000..e69de29b diff --git a/lib/pages/ErService/ErOptions.dart b/lib/pages/ErService/ErOptions.dart index 33de54b9..2d22f262 100644 --- a/lib/pages/ErService/ErOptions.dart +++ b/lib/pages/ErService/ErOptions.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/uitl/location_util.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 '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; @@ -37,12 +37,12 @@ class _ErOptionsState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(TranslationBase.of(context).searchBy, - style: TextStyle( - fontSize: 24.0, - letterSpacing: 1.0, - fontWeight: FontWeight.bold, - color: new Color(0xFF60686b))), +// Text(TranslationBase.of(context).searchBy, +// style: TextStyle( +// fontSize: 24.0, +// letterSpacing: 1.0, +// fontWeight: FontWeight.bold, +// color: new Color(0xFF60686b))), Container( margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), child: Row( @@ -63,6 +63,7 @@ class _ErOptionsState extends State { text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, type: 1), + ) ], ), diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index eba0dd4f..ddd3d74d 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -4,6 +4,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; +import 'widgets/card_position.dart'; + class NearestEr extends StatefulWidget { final bool isAppbar; @@ -50,16 +52,17 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( - image: 'assets/images/new-design/find_us_icon.png', + child: CardPosition( text: TranslationBase.of(context).ambulancerequest, + image: 'assets/images/new-design/find_us_icon.png', + subText: TranslationBase.of(context).requestA, type: 0, ), flex: 0, ), Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, @@ -74,7 +77,7 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, @@ -83,7 +86,7 @@ class _NearestErState extends State { flex: 0, ), Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, @@ -97,7 +100,7 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, @@ -106,7 +109,7 @@ class _NearestErState extends State { flex: 0, ), Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, @@ -121,7 +124,7 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart index 124c73c4..4d652542 100644 --- a/lib/pages/ErService/widgets/card_common.dart +++ b/lib/pages/ErService/widgets/card_common.dart @@ -1,6 +1,9 @@ //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:flutter/material.dart'; +import '../NearestEr.dart'; + class CardCommonEr extends StatelessWidget { final image; final text; @@ -17,6 +20,7 @@ class CardCommonEr extends StatelessWidget { return GestureDetector( onTap: () { navigateToSearch(context, this.type); + print("=============this.type============="+this.type); }, child: Container( margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), @@ -54,6 +58,18 @@ class CardCommonEr extends StatelessWidget { } Future navigateToSearch(context, type) async { +//===Switch case=== + if(type==0) + {print("========Ambalunce=========");} + else{ + print("=========Nearest ER==========="); + + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => NearestEr(isAppbar: true,))); + + } // Navigator.push( // context, // MaterialPageRoute( diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart new file mode 100644 index 00000000..37766467 --- /dev/null +++ b/lib/pages/ErService/widgets/card_position.dart @@ -0,0 +1,83 @@ +//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:flutter/material.dart'; + +import '../NearestEr.dart'; + +class CardPosition extends StatelessWidget { + final image; + final text; + final subText; + final type; + const CardPosition( + { + @required this.image, + @required this.text, + @required this.subText, + @required this.type}); + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () { + navigateToSearch(context, this.type); + print("=============this.type============="+this.type); + }, + child: Container( + margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), + decoration: BoxDecoration(boxShadow: [ + BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) + ], borderRadius: BorderRadius.circular(10), color: Colors.white), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0), + child: Text(this.text, + overflow: TextOverflow.clip, + style: TextStyle( + color: new Color(0xFFc5272d), + letterSpacing: 1.0, + fontSize: 20.0)), + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0), + child: Image.asset(this.image, width: 60.0, height: 60.0), + ), + Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0), + child: Text(this.subText, + overflow: TextOverflow.clip, + style: TextStyle( + color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)), + ), + + ], + ), + ), + ); + } + + Future navigateToSearch(context, type) async { +//===Switch case=== + if(type==0) + {print("========Ambalunce=========");} + else{ + print("=========Nearest ER==========="); + + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => NearestEr(isAppbar: true,))); + + } +// Navigator.push( +// context, +// MaterialPageRoute( +// builder: (context) => Search( +// type: type, +// ))); + } +} + From db79f299b6ec043b8f37ef0d37c9105cfe08cdcf Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 6 Sep 2020 10:49:39 +0300 Subject: [PATCH 05/17] ER --- lib/pages/ErService/NearestEr.dart | 28 +++++++++---------- lib/pages/ErService/widgets/card_common.dart | 12 +++++--- .../ErService/widgets/card_position.dart | 16 +++++++---- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index ddd3d74d..16eb0f4c 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -53,20 +53,20 @@ class _NearestErState extends State { children: [ Expanded( child: CardPosition( - text: TranslationBase.of(context).ambulancerequest, + text: "Olaya Hospital", image: 'assets/images/new-design/find_us_icon.png', subText: TranslationBase.of(context).requestA, - type: 0, + type: 3, ), flex: 0, ), Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).nearester, + text: "Takhassusi Hospital", subText: TranslationBase.of(context).locationa, - type: 1), + type: 5), flex: 0, ) @@ -79,18 +79,18 @@ class _NearestErState extends State { Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).ambulancerequest, + text: "Arryan Hospital", subText: TranslationBase.of(context).requestA, - type: 0, + type: 4, ), flex: 0, ), Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).nearester, + text: "Suwaidi Hospital", subText: TranslationBase.of(context).locationa, - type: 1), + type: 6), flex: 0, ) ], @@ -102,18 +102,18 @@ class _NearestErState extends State { Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).ambulancerequest, + text: "Al Qassim Hospital", subText: TranslationBase.of(context).requestA, - type: 0, + type: 7, ), flex: 0, ), Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).nearester, + text: "Khobar Hospital", subText: TranslationBase.of(context).locationa, - type: 1), + type: 8), flex: 0, ) @@ -126,9 +126,9 @@ class _NearestErState extends State { Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).ambulancerequest, + text: "Dubai Hospital", subText: TranslationBase.of(context).requestA, - type: 0, + type: 1, ), flex: 0, diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart index 4d652542..f59df83c 100644 --- a/lib/pages/ErService/widgets/card_common.dart +++ b/lib/pages/ErService/widgets/card_common.dart @@ -1,5 +1,6 @@ //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import '../NearestEr.dart'; @@ -64,12 +65,15 @@ class CardCommonEr extends StatelessWidget { else{ print("=========Nearest ER==========="); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => NearestEr(isAppbar: true,))); + Navigator.push( + context, + + FadePage( + page: NearestEr(isAppbar: true,))); } + + // Navigator.push( // context, // MaterialPageRoute( diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 37766467..e5241772 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -1,5 +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/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import '../NearestEr.dart'; @@ -24,7 +26,7 @@ class CardPosition extends StatelessWidget { print("=============this.type============="+this.type); }, child: Container( - margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), + margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.0), decoration: BoxDecoration(boxShadow: [ BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) ], borderRadius: BorderRadius.circular(10), color: Colors.white), @@ -36,9 +38,9 @@ class CardPosition extends StatelessWidget { child: Text(this.text, overflow: TextOverflow.clip, style: TextStyle( - color: new Color(0xFFc5272d), + color: Colors.black, letterSpacing: 1.0, - fontSize: 20.0)), + fontSize: 2 * SizeConfig.textMultiplier)), ), Container( alignment: Alignment.center, @@ -50,7 +52,7 @@ class CardPosition extends StatelessWidget { child: Text(this.subText, overflow: TextOverflow.clip, style: TextStyle( - color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)), + color: Color(0xFFc5272d), letterSpacing: 1.0, fontSize: 15.0)), ), ], @@ -68,10 +70,12 @@ class CardPosition extends StatelessWidget { Navigator.push( context, - MaterialPageRoute( - builder: (context) => NearestEr(isAppbar: true,))); + + FadePage( + page: NearestEr(isAppbar: true,))); } + //NearestEr(isAppbar: true,) // Navigator.push( // context, // MaterialPageRoute( From 20f9f6f06c20fc922977cfbcadeb72667d57d922 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 7 Sep 2020 14:49:25 +0300 Subject: [PATCH 06/17] ER --- lib/config/config.dart | 7 + .../projectavgerwaitingtime.dart | 2 +- lib/core/service/er/er_service.dart | 39 ++ .../er/near_hospital_view_model.dart | 34 ++ lib/locator.dart | 4 + lib/pages/ErService/NearestEr.dart | 436 +++++++++++++----- lib/pages/ErService/widgets/card_common.dart | 9 +- .../ErService/widgets/card_position.dart | 20 +- 8 files changed, 412 insertions(+), 139 deletions(-) rename lib/core/model/{er_service => er}/projectavgerwaitingtime.dart (97%) create mode 100644 lib/core/service/er/er_service.dart create mode 100644 lib/core/viewModels/er/near_hospital_view_model.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 91cc2eda..8ce2bdf2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -49,6 +49,13 @@ const GET_PATIENT_AppointmentHistory = const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign'; +///Er Nearest +const GET_NEAREST_HOSPITAL= + 'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime'; + + + + ///Reports const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo'; const INSERT_REQUEST_FOR_MEDICAL_REPORT = diff --git a/lib/core/model/er_service/projectavgerwaitingtime.dart b/lib/core/model/er/projectavgerwaitingtime.dart similarity index 97% rename from lib/core/model/er_service/projectavgerwaitingtime.dart rename to lib/core/model/er/projectavgerwaitingtime.dart index 7d5f8ca4..f999d46f 100644 --- a/lib/core/model/er_service/projectavgerwaitingtime.dart +++ b/lib/core/model/er/projectavgerwaitingtime.dart @@ -3,7 +3,7 @@ class ProjectAvgERWaitingTime { int projectID; int avgTimeInMinutes; String avgTimeInHHMM; - double distanceInKilometers; + int distanceInKilometers; String latitude; String longitude; String phoneNumber; diff --git a/lib/core/service/er/er_service.dart b/lib/core/service/er/er_service.dart new file mode 100644 index 00000000..779efdc1 --- /dev/null +++ b/lib/core/service/er/er_service.dart @@ -0,0 +1,39 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/er/projectavgerwaitingtime.dart'; +import '../base_service.dart'; + +class ErService extends BaseService { + List projectAvgERWaitingTimeModelList = List(); + Map body = Map(); + String Latitude = ""; + String Longitude = ""; + String PhoneNumber = ""; + + Future getProjectAvgERWaitingTimeOrders({int id, int projectID}) async { + hasError = false; + + if (id != null && projectID != null) { + body['ID'] = id; + body['ProjectID'] = projectID; + } + + await baseAppClient.post(GET_NEAREST_HOSPITAL, + onSuccess: (dynamic response, int statusCode) { + projectAvgERWaitingTimeModelList.clear(); + response['List_ProjectAvgERWaitingTime'].forEach((vital) { + projectAvgERWaitingTimeModelList + .add(ProjectAvgERWaitingTime.fromJson(vital)); + }); + projectAvgERWaitingTimeModelList.forEach((element) { + Latitude = '${element.latitude}'; + Longitude = '${element.longitude}'; + PhoneNumber = '${element.phoneNumber}'; + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + +} diff --git a/lib/core/viewModels/er/near_hospital_view_model.dart b/lib/core/viewModels/er/near_hospital_view_model.dart new file mode 100644 index 00000000..f1d1c350 --- /dev/null +++ b/lib/core/viewModels/er/near_hospital_view_model.dart @@ -0,0 +1,34 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/er/projectavgerwaitingtime.dart'; + +import 'package:diplomaticquarterapp/core/service/er/er_service.dart'; +import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; + +import '../../../locator.dart'; + +class NearHospitalViewModel extends BaseViewModel { + + + ErService _erService = locator(); + List get ProjectAvgERWaitingTimeModeList => + _erService.projectAvgERWaitingTimeModelList; + + getProjectAvgERWaitingTimeOrders({int id, int projectID}) async { + setState(ViewState.Busy); + + if (id != null && projectID != null) { + + await _erService.getProjectAvgERWaitingTimeOrders(id: id,projectID: projectID); + } else { + await _erService.getProjectAvgERWaitingTimeOrders(); + } + if (_erService.hasError) { + error = _erService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } + + +} diff --git a/lib/locator.dart b/lib/locator.dart index be35b5ab..71035955 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -5,6 +5,7 @@ import 'package:get_it/get_it.dart'; import 'core/service/appointment_rate_service.dart'; import 'core/service/dashboard_service.dart'; +import 'core/service/er/er_service.dart'; import 'core/service/feedback/feedback_service.dart'; import 'core/service/hospital_service.dart'; import 'core/service/medical/labs_service.dart'; @@ -14,6 +15,7 @@ import 'core/service/medical/prescriptions_service.dart'; import 'core/service/medical/radiology_service.dart'; import 'core/service/medical/vital_sign_service.dart'; import 'core/viewModels/appointment_rate_view_model.dart'; +import 'core/viewModels/er/near_hospital_view_model.dart'; import 'core/viewModels/feedback/feedback_view_model.dart'; import 'core/service/medical/reports_service.dart'; import 'core/viewModels/hospital_view_model.dart'; @@ -50,6 +52,7 @@ void setupLocator() { locator.registerLazySingleton(() => DashboardService()); locator.registerLazySingleton(() => AppointmentRateService()); locator.registerLazySingleton(() => QrService()); + locator.registerLazySingleton(() => ErService()); /// View Model locator.registerFactory(() => HospitalViewModel()); @@ -66,5 +69,6 @@ void setupLocator() { locator.registerFactory(() => DashboardViewModel()); locator.registerFactory(() => AppointmentRateViewModel()); locator.registerFactory(() => QrViewModel()); + locator.registerFactory(() => NearHospitalViewModel()); } diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index 16eb0f4c..787e66ac 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -1,147 +1,339 @@ +import 'package:diplomaticquarterapp/core/viewModels/er/near_hospital_view_model.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/location_util.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; import 'widgets/card_position.dart'; -class NearestEr extends StatefulWidget { - final bool isAppbar; - const NearestEr({Key key, this.isAppbar}) : super(key: key); - @override - _NearestErState createState() => _NearestErState(); -} +class NearestEr extends StatelessWidget { -class _NearestErState extends State { - LocationUtils locationUtils; - @override - void initState() { - locationUtils = - new LocationUtils(isShowConfirmDialog: true, context: context); - WidgetsBinding.instance - .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); + static const String url = "assets/images/"; - super.initState(); - } + int appointmentNo; + int projectID; + NearestEr({this.appointmentNo, this.projectID}); @override Widget build(BuildContext context) { - return AppScaffold( - isShowAppBar: widget.isAppbar, - appBarTitle: TranslationBase.of(context).bookAppo, - body: Container( - margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), - child: ListView( - - children: [ - Text(TranslationBase.of(context).searchBy, - style: TextStyle( - fontSize: 24.0, - letterSpacing: 1.0, - fontWeight: FontWeight.bold, - color: new Color(0xFF60686b))), - Container( - margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), - - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - text: "Olaya Hospital", - image: 'assets/images/new-design/find_us_icon.png', - - subText: TranslationBase.of(context).requestA, - type: 3, - ), - flex: 0, - ), - Expanded( - child: CardPosition( - image: 'assets/images/new-design/find_us_icon.png', - text: "Takhassusi Hospital", - subText: TranslationBase.of(context).locationa, - type: 5), - flex: 0, - - ) - ], - ), - Row( - mainAxisSize: MainAxisSize.max, + return BaseView( + onModelReady: appointmentNo != null && projectID != null + ? (model) => model.getProjectAvgERWaitingTimeOrders( + id: appointmentNo, projectID: projectID) + : (model) => model.getProjectAvgERWaitingTimeOrders(), + builder: (_, mode, widget) => AppScaffold( + isShowAppBar: true, + appBarTitle: 'Nearest ER', + baseViewModel: mode, + + body: mode.ProjectAvgERWaitingTimeModeList.length > 0 + ? Container( + child: ListView( + + children: [ + Text(TranslationBase.of(context).searchBy, + style: TextStyle( + fontSize: 24.0, + letterSpacing: 1.0, + fontWeight: FontWeight.bold, + color: new Color(0xFF60686b))), + Container( + margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), + + child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded( - child: CardPosition( - image: 'assets/images/new-design/find_us_icon.png', - text: "Arryan Hospital", - subText: TranslationBase.of(context).requestA, - type: 4, - ), - flex: 0, + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( + + + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + ), + flex: 0, + + ), + Expanded( + child: CardPosition( + +// mode +// .vitalSignResModelList[ +// mode.vitalSignResModelList.length - 1] +// .heightCm +// .toString() + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + ), + flex: 0, + + ) + ], ), - Expanded( - child: CardPosition( - image: 'assets/images/new-design/find_us_icon.png', - text: "Suwaidi Hospital", - subText: TranslationBase.of(context).locationa, - type: 6), - flex: 0, - ) - ], - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - image: 'assets/images/new-design/find_us_icon.png', - text: "Al Qassim Hospital", - subText: TranslationBase.of(context).requestA, - type: 7, - ), - flex: 0, + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( + +// mode +// .vitalSignResModelList[ +// mode.vitalSignResModelList.length - 1] +// .heightCm +// .toString() + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + ), + flex: 0, + ), + Expanded( + child: CardPosition( + +// mode +// .vitalSignResModelList[ +// mode.vitalSignResModelList.length - 1] +// .heightCm +// .toString() + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + ), + flex: 0, + ) + ], ), - Expanded( - child: CardPosition( - image: 'assets/images/new-design/find_us_icon.png', - text: "Khobar Hospital", - subText: TranslationBase.of(context).locationa, - type: 8), - flex: 0, - - ) - ], - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - image: 'assets/images/new-design/find_us_icon.png', - text: "Dubai Hospital", - subText: TranslationBase.of(context).requestA, - type: 1, - - ), - flex: 0, + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( + +// mode +// .vitalSignResModelList[ +// mode.vitalSignResModelList.length - 1] +// .heightCm +// .toString() + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + ), + flex: 0, + ), + Expanded( + child: CardPosition( + +// mode +// .vitalSignResModelList[ +// mode.vitalSignResModelList.length - 1] +// .heightCm +// .toString() + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + ), + flex: 0, + + ) + ], ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( + + + text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + image: 'assets/images/new-design/find_us_icon.png', + subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD.toString(), + ), + flex: 0, + ), + + ], + ), ], - ), - ], - ) - ), - ], + ) + ), + ], + ), + ) + : Center( + child: Texts('No Data'), ), ), ); } } + + + +//class NearestEr extends StatefulWidget { +// static const String url = "assets/images/"; +// final bool isAppbar; +// +// +// const NearestEr({Key key, this.isAppbar}) : super(key: key); +// @override +// _NearestErState createState() => _NearestErState(); +//} +// +//class _NearestErState extends State { +// LocationUtils locationUtils; +// @override +// void initState() { +// locationUtils = +// new LocationUtils(isShowConfirmDialog: true, context: context); +// WidgetsBinding.instance +// .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); +// +// super.initState(); +// } +// @override +// Widget build(BuildContext context) { +// return AppScaffold( +// isShowAppBar: widget.isAppbar, +// appBarTitle: TranslationBase.of(context).bookAppo, +// body: Container( +// margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), +// child: ListView( +// +// children: [ +// Text(TranslationBase.of(context).searchBy, +// style: TextStyle( +// fontSize: 24.0, +// letterSpacing: 1.0, +// fontWeight: FontWeight.bold, +// color: new Color(0xFF60686b))), +// Container( +// margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), +// +// child: Column( +// mainAxisAlignment: MainAxisAlignment.center, +// children: [ +// Row( +// mainAxisSize: MainAxisSize.min, +// mainAxisAlignment: MainAxisAlignment.center, +// children: [ +// Expanded( +// child: CardPosition( +// text: "Olaya Hospital", +// image: 'assets/images/new-design/find_us_icon.png', +// +// subText: TranslationBase.of(context).requestA, +// type: 3, +// ), +// flex: 0, +// +// ), +// Expanded( +// child: CardPosition( +// image: 'assets/images/new-design/find_us_icon.png', +// text: "Takhassusi Hospital", +// subText: TranslationBase.of(context).locationa, +// type: 5), +// flex: 0, +// +// ) +// ], +// ), +// Row( +// mainAxisSize: MainAxisSize.max, +// mainAxisAlignment: MainAxisAlignment.center, +// children: [ +// Expanded( +// child: CardPosition( +// image: 'assets/images/new-design/find_us_icon.png', +// text: "Arryan Hospital", +// subText: TranslationBase.of(context).requestA, +// type: 4, +// ), +// flex: 0, +// ), +// Expanded( +// child: CardPosition( +// image: 'assets/images/new-design/find_us_icon.png', +// text: "Suwaidi Hospital", +// subText: TranslationBase.of(context).locationa, +// type: 6), +// flex: 0, +// ) +// ], +// ), +// Row( +// mainAxisSize: MainAxisSize.max, +// mainAxisAlignment: MainAxisAlignment.center, +// children: [ +// Expanded( +// child: CardPosition( +// image: 'assets/images/new-design/find_us_icon.png', +// text: "Al Qassim Hospital", +// subText: TranslationBase.of(context).requestA, +// type: 7, +// ), +// flex: 0, +// ), +// Expanded( +// child: CardPosition( +// image: 'assets/images/new-design/find_us_icon.png', +// text: "Khobar Hospital", +// subText: TranslationBase.of(context).locationa, +// type: 8), +// flex: 0, +// +// ) +// ], +// ), +// Row( +// mainAxisSize: MainAxisSize.max, +// mainAxisAlignment: MainAxisAlignment.center, +// children: [ +// Expanded( +// child: CardPosition( +// image: 'assets/images/new-design/find_us_icon.png', +// text: "Dubai Hospital", +// subText: TranslationBase.of(context).requestA, +// type: 1, +// +// ), +// flex: 0, +// ), +// +// ], +// ), +// ], +// ) +// ), +// ], +// ), +// ), +// ); +// } +//} diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart index f59df83c..c65789c5 100644 --- a/lib/pages/ErService/widgets/card_common.dart +++ b/lib/pages/ErService/widgets/card_common.dart @@ -65,11 +65,16 @@ class CardCommonEr extends StatelessWidget { else{ print("=========Nearest ER==========="); +// Navigator.push( +// context, +// +// FadePage( +// // page: NearestEr(isAppbar: true,))); +// page: NearestEr())); Navigator.push( context, - FadePage( - page: NearestEr(isAppbar: true,))); + page: NearestEr())); } diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index e5241772..35e875fc 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -1,7 +1,6 @@ //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; -import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import '../NearestEr.dart'; @@ -68,20 +67,13 @@ class CardPosition extends StatelessWidget { else{ print("=========Nearest ER==========="); - Navigator.push( - context, - - FadePage( - page: NearestEr(isAppbar: true,))); +// Navigator.push( +// context, +// MaterialPageRoute( +// builder: (context) => NearestEr(isAppbar: true,))); +// + } - } - //NearestEr(isAppbar: true,) -// Navigator.push( -// context, -// MaterialPageRoute( -// builder: (context) => Search( -// type: type, -// ))); } } From f534f8a348a949bf8d05b80ab3fc17567bd887a5 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 7 Sep 2020 15:11:05 +0300 Subject: [PATCH 07/17] ER --- lib/pages/ErService/NearestEr.dart | 48 +++++++++---------- .../ErService/widgets/card_position.dart | 9 ++-- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index 787e66ac..623871f6 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -55,11 +55,11 @@ class NearestEr extends StatelessWidget { child: CardPosition( - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + text: mode.ProjectAvgERWaitingTimeModeList[0].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + subText: mode.ProjectAvgERWaitingTimeModeList[0].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[0].iD.toString(), ), flex: 0, @@ -67,16 +67,12 @@ class NearestEr extends StatelessWidget { Expanded( child: CardPosition( -// mode -// .vitalSignResModelList[ -// mode.vitalSignResModelList.length - 1] -// .heightCm -// .toString() - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + + text: mode.ProjectAvgERWaitingTimeModeList[1].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + subText: mode.ProjectAvgERWaitingTimeModeList[1].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[1].iD.toString(), ), flex: 0, @@ -95,11 +91,11 @@ class NearestEr extends StatelessWidget { // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + text: mode.ProjectAvgERWaitingTimeModeList[2].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + subText: mode.ProjectAvgERWaitingTimeModeList[2].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[2].iD.toString(), ), flex: 0, ), @@ -111,11 +107,11 @@ class NearestEr extends StatelessWidget { // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + text: mode.ProjectAvgERWaitingTimeModeList[3].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + subText: mode.ProjectAvgERWaitingTimeModeList[3].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[3].iD.toString(), ), flex: 0, ) @@ -133,11 +129,11 @@ class NearestEr extends StatelessWidget { // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + text: mode.ProjectAvgERWaitingTimeModeList[4].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + subText: mode.ProjectAvgERWaitingTimeModeList[4].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[4].iD.toString(), ), flex: 0, ), @@ -149,11 +145,11 @@ class NearestEr extends StatelessWidget { // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + text: mode.ProjectAvgERWaitingTimeModeList[5].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, + subText: mode.ProjectAvgERWaitingTimeModeList[5].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[5].iD.toString(), ), flex: 0, @@ -168,11 +164,11 @@ class NearestEr extends StatelessWidget { child: CardPosition( - text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, + text: mode.ProjectAvgERWaitingTimeModeList[6].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', - subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD.toString(), + subText: mode.ProjectAvgERWaitingTimeModeList[6].distanceInKilometers.toString(), + type: mode.ProjectAvgERWaitingTimeModeList[6].iD.toString(), ), flex: 0, ), diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 35e875fc..73ab318a 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -25,11 +25,13 @@ class CardPosition extends StatelessWidget { print("=============this.type============="+this.type); }, child: Container( + width:190, margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.0), decoration: BoxDecoration(boxShadow: [ BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) ], borderRadius: BorderRadius.circular(10), color: Colors.white), child: Column( + crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( @@ -62,10 +64,7 @@ class CardPosition extends StatelessWidget { Future navigateToSearch(context, type) async { //===Switch case=== - if(type==0) - {print("========Ambalunce=========");} - else{ - print("=========Nearest ER==========="); + print("================"+type); // Navigator.push( // context, @@ -75,5 +74,5 @@ class CardPosition extends StatelessWidget { } } -} + From 2ef36d3d8a44faa60db359657d0aa37e17a25cac Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 7 Sep 2020 16:41:53 +0300 Subject: [PATCH 08/17] ER --- lib/pages/ErService/ErOptions.dart | 1 + lib/pages/ErService/NearestEr.dart | 15 +++++++++++++++ lib/pages/ErService/widgets/card_position.dart | 11 ++++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/lib/pages/ErService/ErOptions.dart b/lib/pages/ErService/ErOptions.dart index 2d22f262..6b6166bb 100644 --- a/lib/pages/ErService/ErOptions.dart +++ b/lib/pages/ErService/ErOptions.dart @@ -55,6 +55,7 @@ class _ErOptionsState extends State { text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, type: 0, + ), ), Expanded( diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index 623871f6..eb6e6981 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -60,6 +60,8 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[0].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[0].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[0].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[0].projectImageURL.toString(), ), flex: 0, @@ -73,6 +75,8 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[1].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[1].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[1].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[1].projectImageURL.toString(), ), flex: 0, @@ -96,6 +100,9 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[2].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[2].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[2].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[2].projectImageURL.toString(), + ), flex: 0, ), @@ -112,6 +119,8 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[3].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[3].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[3].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[3].projectImageURL.toString(), ), flex: 0, ) @@ -134,6 +143,8 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[4].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[4].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[4].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[4].projectImageURL.toString(), ), flex: 0, ), @@ -150,6 +161,8 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[5].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[5].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[5].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[5].projectImageURL.toString(), ), flex: 0, @@ -169,6 +182,8 @@ class NearestEr extends StatelessWidget { subText: mode.ProjectAvgERWaitingTimeModeList[6].distanceInKilometers.toString(), type: mode.ProjectAvgERWaitingTimeModeList[6].iD.toString(), + telephone: mode.ProjectAvgERWaitingTimeModeList[6].phoneNumber.toString(), + networkImage: mode.ProjectAvgERWaitingTimeModeList[6].projectImageURL.toString(), ), flex: 0, ), diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 73ab318a..4088c8c7 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -10,18 +10,22 @@ class CardPosition extends StatelessWidget { final text; final subText; final type; + final telephone; + final networkImage; const CardPosition( { @required this.image, @required this.text, @required this.subText, - @required this.type}); + @required this.type, + @required this.telephone, + @required this.networkImage }); @override Widget build(BuildContext context) { return GestureDetector( onTap: () { - navigateToSearch(context, this.type); + navigateToSearch(context, this.type,this.telephone,this.networkImage); print("=============this.type============="+this.type); }, child: Container( @@ -62,9 +66,10 @@ class CardPosition extends StatelessWidget { ); } - Future navigateToSearch(context, type) async { + Future navigateToSearch(context, type,telephone,networkImage) async { //===Switch case=== print("================"+type); + print("================"+telephone); // Navigator.push( // context, From 5485cbab36b7930065f522a89bd8063db59ea2dc Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 7 Sep 2020 16:58:59 +0300 Subject: [PATCH 09/17] ER --- .../ErService/widgets/card_position.dart | 20 ++++++++++++++----- pubspec.yaml | 3 ++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 4088c8c7..88b0fe42 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:flutter/material.dart'; +import 'package:giffy_dialog/giffy_dialog.dart'; import '../NearestEr.dart'; @@ -70,12 +71,21 @@ class CardPosition extends StatelessWidget { //===Switch case=== print("================"+type); print("================"+telephone); + print("================"+networkImage); + + showDialog( + context: context,builder: (_) => AssetGiffyDialog(image:Image.network(networkImage, fit: BoxFit.cover,), + title: Text('Men Wearing Jackets', + style: TextStyle( + fontSize: 22.0, fontWeight: FontWeight.w600), + ), + description: Text('This is a men wearing jackets dialog box.This library helps you easily create fancy giffy dialog.', + textAlign: TextAlign.center, + style: TextStyle(), + ), + onOkButtonPressed: () {}, + ) ); -// Navigator.push( -// context, -// MaterialPageRoute( -// builder: (context) => NearestEr(isAppbar: true,))); -// } } diff --git a/pubspec.yaml b/pubspec.yaml index f4c5e5c2..814f1fac 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,7 +31,8 @@ dependencies: # Permissions permission_handler: ^5.0.0+hotfix.3 device_info: ^0.4.2+4 - +#popub + giffy_dialog: ^1.8.0 # Native flutter_device_type: ^0.2.0 local_auth: ^0.6.2+3 From 629251d2167e9b743c291bc5b9e18ed95adf07d2 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 7 Sep 2020 18:10:21 +0300 Subject: [PATCH 10/17] ER --- lib/pages/ErService/NearestEr.dart | 26 ++++++++-- .../ErService/widgets/card_position.dart | 48 +++++++++++++++---- 2 files changed, 61 insertions(+), 13 deletions(-) diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index eb6e6981..64ca8682 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -62,6 +62,9 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[0].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[0].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[0].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[0].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[0].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[0].projectName , ), flex: 0, @@ -77,6 +80,9 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[1].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[1].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[1].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[1].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[1].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[1].projectName , ), flex: 0, @@ -102,6 +108,9 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[2].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[2].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[2].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[2].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[2].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[2].projectName , ), flex: 0, @@ -121,6 +130,9 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[3].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[3].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[3].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[3].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[3].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[3].projectName , ), flex: 0, ) @@ -145,17 +157,15 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[4].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[4].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[4].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[4].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[4].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[4].projectName , ), flex: 0, ), Expanded( child: CardPosition( -// mode -// .vitalSignResModelList[ -// mode.vitalSignResModelList.length - 1] -// .heightCm -// .toString() text: mode.ProjectAvgERWaitingTimeModeList[5].projectName.toString(), image: 'assets/images/new-design/find_us_icon.png', @@ -163,6 +173,9 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[5].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[5].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[5].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[5].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[5].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[5].projectName , ), flex: 0, @@ -184,6 +197,9 @@ class NearestEr extends StatelessWidget { type: mode.ProjectAvgERWaitingTimeModeList[6].iD.toString(), telephone: mode.ProjectAvgERWaitingTimeModeList[6].phoneNumber.toString(), networkImage: mode.ProjectAvgERWaitingTimeModeList[6].projectImageURL.toString(), + latitude:mode.ProjectAvgERWaitingTimeModeList[6].latitude , + longitude:mode.ProjectAvgERWaitingTimeModeList[6].longitude , + projectname:mode.ProjectAvgERWaitingTimeModeList[6].projectName , ), flex: 0, ), diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 88b0fe42..05141351 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -3,6 +3,9 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:flutter/material.dart'; import 'package:giffy_dialog/giffy_dialog.dart'; +import 'package:url_launcher/url_launcher.dart'; +import 'package:maps_launcher/maps_launcher.dart'; + import '../NearestEr.dart'; @@ -13,6 +16,9 @@ class CardPosition extends StatelessWidget { final type; final telephone; final networkImage; + final latitude; + final longitude; + final projectname; const CardPosition( { @required this.image, @@ -20,13 +26,17 @@ class CardPosition extends StatelessWidget { @required this.subText, @required this.type, @required this.telephone, - @required this.networkImage }); + @required this.networkImage , + @required this.latitude, + @required this.longitude, + @required this.projectname , + }); @override Widget build(BuildContext context) { return GestureDetector( onTap: () { - navigateToSearch(context, this.type,this.telephone,this.networkImage); + navigateToSearch(context, this.type,this.telephone,this.networkImage,this.latitude,this.longitude,this.projectname); print("=============this.type============="+this.type); }, child: Container( @@ -67,23 +77,45 @@ class CardPosition extends StatelessWidget { ); } - Future navigateToSearch(context, type,telephone,networkImage) async { + Future navigateToSearch(context, type,telephone,networkImage,latitude,longitude,projectname) async { + //===Switch case=== print("================"+type); print("================"+telephone); print("================"+networkImage); showDialog( - context: context,builder: (_) => AssetGiffyDialog(image:Image.network(networkImage, fit: BoxFit.cover,), - title: Text('Men Wearing Jackets', + context: context,builder: (_) => AssetGiffyDialog( + title: Text(projectname, style: TextStyle( fontSize: 22.0, fontWeight: FontWeight.w600), - ), - description: Text('This is a men wearing jackets dialog box.This library helps you easily create fancy giffy dialog.', + ),image:Image.network(networkImage, fit: BoxFit.cover,), + description: Text('projectname', textAlign: TextAlign.center, style: TextStyle(), ), - onOkButtonPressed: () {}, + onOkButtonPressed: () { MapsLauncher.launchCoordinates(double.parse(latitude),double.parse(longitude),projectname);}, + onCancelButtonPressed :() {launch("tel://" +telephone);} + +// double.parse( +// _medicineProvider.pharmaciesList[index]["Latitude"]), +// double.parse( +// _medicineProvider.pharmaciesList[index]["Longitude"]), +// _medicineProvider.pharmaciesList[index] +// ["LocationDescription"]); + //launch("tel://" +telephone); +//================ +// MapsLauncher.launchCoordinates( +// double.parse( +// _medicineProvider.pharmaciesList[index]["Latitude"]), +// double.parse( +// _medicineProvider.pharmaciesList[index]["Longitude"]), +// _medicineProvider.pharmaciesList[index] +// ["LocationDescription"]); +//================= + + + ) ); } From 294a7523384fb94871bb190dae1338e8fe943efe Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 8 Sep 2020 10:55:20 +0300 Subject: [PATCH 11/17] ER --- lib/core/service/er/er_service.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/core/service/er/er_service.dart b/lib/core/service/er/er_service.dart index 779efdc1..87367f62 100644 --- a/lib/core/service/er/er_service.dart +++ b/lib/core/service/er/er_service.dart @@ -1,9 +1,11 @@ import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/er/projectavgerwaitingtime.dart'; import '../base_service.dart'; class ErService extends BaseService { List projectAvgERWaitingTimeModelList = List(); + Map body = Map(); String Latitude = ""; String Longitude = ""; @@ -16,6 +18,10 @@ class ErService extends BaseService { body['ID'] = id; body['ProjectID'] = projectID; } + var lat = await sharedPref.getDouble(USER_LAT); + var long = await sharedPref.getDouble(USER_LONG); + body['Latitude'] = lat; + body['Longitude'] = long; await baseAppClient.post(GET_NEAREST_HOSPITAL, onSuccess: (dynamic response, int statusCode) { @@ -34,6 +40,4 @@ class ErService extends BaseService { super.error = error; }, body: body); } - - } From ed1c04ab2569147abb098aba5477aa9936745da1 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 8 Sep 2020 10:57:46 +0300 Subject: [PATCH 12/17] ER --- lib/config/config.dart | 2 +- .../model/er/projectavgerwaitingtime.dart | 56 ++++++++++++++++++- .../ErService/widgets/card_position.dart | 2 +- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 8ce2bdf2..a5210914 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -56,6 +56,7 @@ const GET_NEAREST_HOSPITAL= + ///Reports const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo'; const INSERT_REQUEST_FOR_MEDICAL_REPORT = @@ -160,7 +161,6 @@ const SESSION_ID = 'TMRhVmkGhOsvamErw'; const IS_DENTAL_ALLOWED_BACKEND = false; const PATIENT_TYPE = 1; const PATIENT_TYPE_ID = 1; - var DeviceTypeID = Platform.isIOS ? 1 : 2; const LANGUAGE_ID = 2; const GET_PHARMCY_ITEMS = "Services/Lists.svc/REST/GetPharmcyItems_Region"; diff --git a/lib/core/model/er/projectavgerwaitingtime.dart b/lib/core/model/er/projectavgerwaitingtime.dart index f999d46f..9b21ec66 100644 --- a/lib/core/model/er/projectavgerwaitingtime.dart +++ b/lib/core/model/er/projectavgerwaitingtime.dart @@ -3,7 +3,7 @@ class ProjectAvgERWaitingTime { int projectID; int avgTimeInMinutes; String avgTimeInHHMM; - int distanceInKilometers; + dynamic distanceInKilometers; String latitude; String longitude; String phoneNumber; @@ -49,4 +49,56 @@ class ProjectAvgERWaitingTime { data['ProjectName'] = this.projectName; return data; } -} \ No newline at end of file +} +//class ProjectAvgERWaitingTime { +// int iD; +// int projectID; +// int avgTimeInMinutes; +// String avgTimeInHHMM; +// String distanceInKilometers; +// String latitude; +// String longitude; +// String phoneNumber; +// String projectImageURL; +// String projectName; +// +// ProjectAvgERWaitingTime( +// {this.iD, +// this.projectID, +// this.avgTimeInMinutes, +// this.avgTimeInHHMM, +// this.distanceInKilometers, +// this.latitude, +// this.longitude, +// this.phoneNumber, +// this.projectImageURL, +// this.projectName}); +// +// ProjectAvgERWaitingTime.fromJson(Map json) { +// iD = json['ID']; +// projectID = json['ProjectID']; +// avgTimeInMinutes = json['AvgTimeInMinutes']; +// avgTimeInHHMM = json['AvgTimeInHHMM']; +// distanceInKilometers = json['DistanceInKilometers']; +// latitude = json['Latitude']; +// longitude = json['Longitude']; +// phoneNumber = json['PhoneNumber']; +// projectImageURL = json['ProjectImageURL']; +// projectName = json['ProjectName']; +// } +// +// Map toJson() { +// final Map data = new Map(); +// data['ID'] = this.iD; +// data['ProjectID'] = this.projectID; +// data['AvgTimeInMinutes'] = this.avgTimeInMinutes; +// data['AvgTimeInHHMM'] = this.avgTimeInHHMM; +// data['DistanceInKilometers'] = this.distanceInKilometers; +// data['Latitude'] = this.latitude; +// data['Longitude'] = this.longitude; +// data['PhoneNumber'] = this.phoneNumber; +// data['ProjectImageURL'] = this.projectImageURL; +// data['ProjectName'] = this.projectName; +// return data; +// } +//} \ No newline at end of file diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 05141351..572d52f0 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -37,7 +37,7 @@ class CardPosition extends StatelessWidget { return GestureDetector( onTap: () { navigateToSearch(context, this.type,this.telephone,this.networkImage,this.latitude,this.longitude,this.projectname); - print("=============this.type============="+this.type); + }, child: Container( width:190, From 50d1e50df47c8b0be63f01c8c425ff53d1d4ae8b Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 8 Sep 2020 12:57:31 +0300 Subject: [PATCH 13/17] ER --- lib/pages/ErService/NearestEr.dart | 7 ++++--- lib/pages/ErService/widgets/card_position.dart | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index 64ca8682..1cc741ff 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -35,11 +35,12 @@ class NearestEr extends StatelessWidget { child: ListView( children: [ - Text(TranslationBase.of(context).searchBy, + Text("\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location",textAlign: TextAlign.center, style: TextStyle( - fontSize: 24.0, + fontSize: 18.0, letterSpacing: 1.0, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w900, + color: new Color(0xFF60686b))), Container( margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 572d52f0..28184103 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -93,7 +93,12 @@ class CardPosition extends StatelessWidget { description: Text('projectname', textAlign: TextAlign.center, style: TextStyle(), + ), + 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);} From ddf53ce999063f6876c44f24d32e30c4d87daf60 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 8 Sep 2020 13:44:13 +0300 Subject: [PATCH 14/17] ER --- lib/pages/ErService/widgets/card_position.dart | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 28184103..f8077fe0 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -90,11 +90,7 @@ class CardPosition extends StatelessWidget { style: TextStyle( fontSize: 22.0, fontWeight: FontWeight.w600), ),image:Image.network(networkImage, fit: BoxFit.cover,), - description: Text('projectname', - textAlign: TextAlign.center, - style: TextStyle(), - - ), + buttonOkText:Text("LOCATION"), buttonOkColor: Colors.grey, buttonCancelText:Text('CAll') , From e6384646570028ccc1520cbe5ce8ed07f2ef1777 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Tue, 8 Sep 2020 14:21:28 +0300 Subject: [PATCH 15/17] edit card_position.dart --- lib/pages/ErService/widgets/card_position.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index f8077fe0..4c649fc5 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -90,7 +90,7 @@ class CardPosition extends StatelessWidget { style: TextStyle( fontSize: 22.0, fontWeight: FontWeight.w600), ),image:Image.network(networkImage, fit: BoxFit.cover,), - + buttonOkText:Text("LOCATION"), buttonOkColor: Colors.grey, buttonCancelText:Text('CAll') , From 62d96a3f1ccfa8396aa20f12704e41f1d9e2e493 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Wed, 9 Sep 2020 10:17:16 +0300 Subject: [PATCH 16/17] edit card_position.dart --- lib/core/service/er/er_service.dart | 4 +- .../er/near_hospital_view_model.dart | 35 +- lib/pages/ErService/NearestEr.dart | 607 +++++++++--------- 3 files changed, 312 insertions(+), 334 deletions(-) diff --git a/lib/core/service/er/er_service.dart b/lib/core/service/er/er_service.dart index 87367f62..bd3b6116 100644 --- a/lib/core/service/er/er_service.dart +++ b/lib/core/service/er/er_service.dart @@ -20,8 +20,8 @@ class ErService extends BaseService { } var lat = await sharedPref.getDouble(USER_LAT); var long = await sharedPref.getDouble(USER_LONG); - body['Latitude'] = lat; - body['Longitude'] = long; + body['Latitude'] = lat ?? 0; + body['Longitude'] = long ?? 0; await baseAppClient.post(GET_NEAREST_HOSPITAL, onSuccess: (dynamic response, int statusCode) { diff --git a/lib/core/viewModels/er/near_hospital_view_model.dart b/lib/core/viewModels/er/near_hospital_view_model.dart index f1d1c350..f12aa28f 100644 --- a/lib/core/viewModels/er/near_hospital_view_model.dart +++ b/lib/core/viewModels/er/near_hospital_view_model.dart @@ -8,27 +8,24 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.da import '../../../locator.dart'; class NearHospitalViewModel extends BaseViewModel { - - ErService _erService = locator(); + List get ProjectAvgERWaitingTimeModeList => _erService.projectAvgERWaitingTimeModelList; - getProjectAvgERWaitingTimeOrders({int id, int projectID}) async { - setState(ViewState.Busy); - - if (id != null && projectID != null) { - - await _erService.getProjectAvgERWaitingTimeOrders(id: id,projectID: projectID); - } else { - await _erService.getProjectAvgERWaitingTimeOrders(); - } - if (_erService.hasError) { - error = _erService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); - } - - + getProjectAvgERWaitingTimeOrders({int id, int projectID}) async { + setState(ViewState.Busy); + + if (id != null && projectID != null) { + await _erService.getProjectAvgERWaitingTimeOrders( + id: id, projectID: projectID); + } else { + await _erService.getProjectAvgERWaitingTimeOrders(); + } + if (_erService.hasError) { + error = _erService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } } diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index 1cc741ff..e167770b 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -10,358 +10,339 @@ import '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; import 'widgets/card_position.dart'; - class NearestEr extends StatelessWidget { - - static const String url = "assets/images/"; + static const String _url = "assets/images/"; int appointmentNo; int projectID; + NearestEr({this.appointmentNo, this.projectID}); + @override Widget build(BuildContext context) { return BaseView( onModelReady: appointmentNo != null && projectID != null ? (model) => model.getProjectAvgERWaitingTimeOrders( - id: appointmentNo, projectID: projectID) + id: appointmentNo, projectID: projectID) : (model) => model.getProjectAvgERWaitingTimeOrders(), builder: (_, mode, widget) => AppScaffold( isShowAppBar: true, appBarTitle: 'Nearest ER', baseViewModel: mode, - body: mode.ProjectAvgERWaitingTimeModeList.length > 0 ? Container( - child: ListView( - - children: [ - Text("\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location",textAlign: TextAlign.center, - style: TextStyle( - fontSize: 18.0, - letterSpacing: 1.0, - fontWeight: FontWeight.w900, - - color: new Color(0xFF60686b))), - Container( - margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), - - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - - - text: mode.ProjectAvgERWaitingTimeModeList[0].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[0].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[0].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[0].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[0].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[0].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[0].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[0].projectName , + child: ListView( + children: [ + Text( + "\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 18.0, + letterSpacing: 1.0, + fontWeight: FontWeight.w900, + color: new Color(0xFF60686b))), + Container( + margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( + text: mode + .ProjectAvgERWaitingTimeModeList[0] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + subText: mode + .ProjectAvgERWaitingTimeModeList[0] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[0].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[0] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[0] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[0] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[0] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[0] + .projectName, + ), + flex: 0, + ), + Expanded( + child: CardPosition( + text: mode + .ProjectAvgERWaitingTimeModeList[1] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + subText: mode + .ProjectAvgERWaitingTimeModeList[1] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[1].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[1] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[1] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[1] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[1] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[1] + .projectName, + ), + flex: 0, + ) + ], ), - flex: 0, - - ), - Expanded( - child: CardPosition( - - - text: mode.ProjectAvgERWaitingTimeModeList[1].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[1].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[1].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[1].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[1].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[1].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[1].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[1].projectName , - ), - flex: 0, - - ) - ], - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( // mode // .vitalSignResModelList[ // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[2].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[2].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[2].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[2].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[2].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[2].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[2].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[2].projectName , - - ), - flex: 0, - ), - Expanded( - child: CardPosition( - + text: mode + .ProjectAvgERWaitingTimeModeList[2] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + + subText: mode + .ProjectAvgERWaitingTimeModeList[2] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[2].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[2] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[2] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[2] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[2] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[2] + .projectName, + ), + flex: 0, + ), + Expanded( + child: CardPosition( // mode // .vitalSignResModelList[ // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[3].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[3].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[3].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[3].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[3].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[3].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[3].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[3].projectName , + text: mode + .ProjectAvgERWaitingTimeModeList[3] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + + subText: mode + .ProjectAvgERWaitingTimeModeList[3] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[3].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[3] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[3] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[3] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[3] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[3] + .projectName, + ), + flex: 0, + ) + ], ), - flex: 0, - ) - ], - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( // mode // .vitalSignResModelList[ // mode.vitalSignResModelList.length - 1] // .heightCm // .toString() - text: mode.ProjectAvgERWaitingTimeModeList[4].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[4].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[4].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[4].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[4].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[4].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[4].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[4].projectName , - ), - flex: 0, - ), - Expanded( - child: CardPosition( - - text: mode.ProjectAvgERWaitingTimeModeList[5].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[5].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[5].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[5].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[5].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[5].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[5].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[5].projectName , + text: mode + .ProjectAvgERWaitingTimeModeList[4] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + + subText: mode + .ProjectAvgERWaitingTimeModeList[4] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[4].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[4] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[4] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[4] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[4] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[4] + .projectName, + ), + flex: 0, + ), + Expanded( + child: CardPosition( + text: mode + .ProjectAvgERWaitingTimeModeList[5] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + subText: mode + .ProjectAvgERWaitingTimeModeList[5] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[5].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[5] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[5] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[5] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[5] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[5] + .projectName, + ), + flex: 0, + ) + ], ), - flex: 0, - - ) - ], - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: CardPosition( - - - text: mode.ProjectAvgERWaitingTimeModeList[6].projectName.toString(), - image: 'assets/images/new-design/find_us_icon.png', - - subText: mode.ProjectAvgERWaitingTimeModeList[6].distanceInKilometers.toString(), - type: mode.ProjectAvgERWaitingTimeModeList[6].iD.toString(), - telephone: mode.ProjectAvgERWaitingTimeModeList[6].phoneNumber.toString(), - networkImage: mode.ProjectAvgERWaitingTimeModeList[6].projectImageURL.toString(), - latitude:mode.ProjectAvgERWaitingTimeModeList[6].latitude , - longitude:mode.ProjectAvgERWaitingTimeModeList[6].longitude , - projectname:mode.ProjectAvgERWaitingTimeModeList[6].projectName , + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: CardPosition( + text: mode + .ProjectAvgERWaitingTimeModeList[6] + .projectName + .toString(), + image: + 'assets/images/new-design/find_us_icon.png', + subText: mode + .ProjectAvgERWaitingTimeModeList[6] + .distanceInKilometers + .toString(), + type: mode + .ProjectAvgERWaitingTimeModeList[6].iD + .toString(), + telephone: mode + .ProjectAvgERWaitingTimeModeList[6] + .phoneNumber + .toString(), + networkImage: mode + .ProjectAvgERWaitingTimeModeList[6] + .projectImageURL + .toString(), + latitude: mode + .ProjectAvgERWaitingTimeModeList[6] + .latitude, + longitude: mode + .ProjectAvgERWaitingTimeModeList[6] + .longitude, + projectname: mode + .ProjectAvgERWaitingTimeModeList[6] + .projectName, + ), + flex: 0, + ), + ], ), - flex: 0, - ), - - ], - ), - ], - ) - ), - ], - ), - ) + ], + )), + ], + ), + ) : Center( - child: Texts('No Data'), - ), + child: Texts('No Data'), + ), ), ); } } - - -//class NearestEr extends StatefulWidget { -// static const String url = "assets/images/"; -// final bool isAppbar; -// -// -// const NearestEr({Key key, this.isAppbar}) : super(key: key); -// @override -// _NearestErState createState() => _NearestErState(); -//} -// -//class _NearestErState extends State { -// LocationUtils locationUtils; -// @override -// void initState() { -// locationUtils = -// new LocationUtils(isShowConfirmDialog: true, context: context); -// WidgetsBinding.instance -// .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); -// -// super.initState(); -// } -// @override -// Widget build(BuildContext context) { -// return AppScaffold( -// isShowAppBar: widget.isAppbar, -// appBarTitle: TranslationBase.of(context).bookAppo, -// body: Container( -// margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), -// child: ListView( -// -// children: [ -// Text(TranslationBase.of(context).searchBy, -// style: TextStyle( -// fontSize: 24.0, -// letterSpacing: 1.0, -// fontWeight: FontWeight.bold, -// color: new Color(0xFF60686b))), -// Container( -// margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), -// -// child: Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Row( -// mainAxisSize: MainAxisSize.min, -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Expanded( -// child: CardPosition( -// text: "Olaya Hospital", -// image: 'assets/images/new-design/find_us_icon.png', -// -// subText: TranslationBase.of(context).requestA, -// type: 3, -// ), -// flex: 0, -// -// ), -// Expanded( -// child: CardPosition( -// image: 'assets/images/new-design/find_us_icon.png', -// text: "Takhassusi Hospital", -// subText: TranslationBase.of(context).locationa, -// type: 5), -// flex: 0, -// -// ) -// ], -// ), -// Row( -// mainAxisSize: MainAxisSize.max, -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Expanded( -// child: CardPosition( -// image: 'assets/images/new-design/find_us_icon.png', -// text: "Arryan Hospital", -// subText: TranslationBase.of(context).requestA, -// type: 4, -// ), -// flex: 0, -// ), -// Expanded( -// child: CardPosition( -// image: 'assets/images/new-design/find_us_icon.png', -// text: "Suwaidi Hospital", -// subText: TranslationBase.of(context).locationa, -// type: 6), -// flex: 0, -// ) -// ], -// ), -// Row( -// mainAxisSize: MainAxisSize.max, -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Expanded( -// child: CardPosition( -// image: 'assets/images/new-design/find_us_icon.png', -// text: "Al Qassim Hospital", -// subText: TranslationBase.of(context).requestA, -// type: 7, -// ), -// flex: 0, -// ), -// Expanded( -// child: CardPosition( -// image: 'assets/images/new-design/find_us_icon.png', -// text: "Khobar Hospital", -// subText: TranslationBase.of(context).locationa, -// type: 8), -// flex: 0, -// -// ) -// ], -// ), -// Row( -// mainAxisSize: MainAxisSize.max, -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Expanded( -// child: CardPosition( -// image: 'assets/images/new-design/find_us_icon.png', -// text: "Dubai Hospital", -// subText: TranslationBase.of(context).requestA, -// type: 1, -// -// ), -// flex: 0, -// ), -// -// ], -// ), -// ], -// ) -// ), -// ], -// ), -// ), -// ); -// } -//} From ea02622977beebb09a97106c2115e0a8f53f945a Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 9 Sep 2020 11:00:37 +0300 Subject: [PATCH 17/17] fix merge issues --- android/app/src/main/AndroidManifest.xml | 1 + assets/images/new-design/AM.PNG | Bin 0 -> 1554 bytes lib/config/localized_values.dart | 18 ------------------ 3 files changed, 1 insertion(+), 18 deletions(-) create mode 100644 assets/images/new-design/AM.PNG diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 30575eb9..884c7e09 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> + diff --git a/assets/images/new-design/AM.PNG b/assets/images/new-design/AM.PNG new file mode 100644 index 0000000000000000000000000000000000000000..212ca0b154ff8a2826dcc331cc1e4bed16185c93 GIT binary patch literal 1554 zcmV+t2JQKYP)$r1p>+9ah+gb-0jwQ2w; zxmI_rFit{<$BvJF0Kj&JA{lAJwO}7n0R|%l7>vXkhLmzArR*}qKFg4(a`<=_TNqNx zR0#1RggDIw1idol47^}@NW~HcR{RxO(wP>u;xtFpjPJB-bs*_pyp;S1DyZan$?@05L(4CTa1LOH#_%B7E^Dy02wj1fZn@onG=EBi4S#@pMQ z_M9kMQZ(L70C3a{93OEyVv;7gwrQF|UDr^SC7eztsH*DDO)ZMza=seSsq=@V?$LIK z=XPy-+}%jy?!uI`Q>ENhMb*o1tAW)8V!PdvzIZAa_~N#jXQ?hN8atoSx6j6CrD-aj zpLH4hzl9m*zV+GR^Hg{AH1PR%05HxzaT+MBs>I9 zPYOtRo!Agy%&P}%A@4u}jQRD@%p{V*IG@jV-c&Q@2)dKO-fYc^wm>z&Qg<-U= z%^*kB_hGbCr(v?Q6%1E4@ocAmQsTzt{pU5!q6=wt?`_u+!3z(Hd!*^WbcqEm7*H7k#5F_ zFPEavchV{*!2q*;m}aYx=P%Oe6|K%;fZOd?NxP?xa!>u?ldf*fsg1L#RD>gMn+o+t zd6@%o4#En?RmBby0%$dr8#|)h+le-W>T8z> localizedValues = { "locationa":{"en":"location:","ar":"الموقع"}, "ambulancerequest":{"en":"Ambulance :","ar":"طلب نقل "}, "requestA":{"en":"Request:","ar":"اسعاف"}, - "parking": {"en": "Parking", "ar": "مواقف"}, - "alhabiServices": {"en": "HMG Service", "ar": "خدمات الحبيب"}, - "parkingTitle": { - "en": - "Car service, car service, service to save parking information, return to it later, 1- By clicking on (Read the code), save the parking data. 2- By clicking on the button (view my car park), it shows you the car’s location in Google Maps. 3- Read another position by pressing the Clear Position Data button.", - "ar": - " خدمة المواقف، تتيح هذه الخدمة للمستخدم معلومات عن موقف السيارة ليسهل عليه العودة لها لاحقاً ، 1- بالضغط على زر(قراءة الكود) تستطيع حفظ البيانات الخاصة بالموقف. 2-بالضغط على زر(عرض موقف سيارتي) يعرض لك موقع السيارة في خرائط قوقل. 3- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). " - }, - "readBarcode": {"en": "Read Barcode", "ar": "قراءة الكود"}, - "showMyPark": {"en": "Show My Park", "ar": "عرض بارك"}, - "clearMyData": {"en": "clear My Data", "ar": "امسح البيانات"}, - "floor": {"en": "Floor:", "ar": "الطابق"}, - "gate": {"en": "Gate:", "ar": "بوابة"}, - "building": {"en": "Building:", "ar": "المبنى"}, - "branch": {"en": "Branch:", "ar": "الفرع"}, - "emergencyServices": {"en": "Emergency Services:", "ar": "خدمات الطوارئ"}, - "textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"}, "MyAppointments": {"en": "My Appointments", "ar": "مواعيدي"}, "NoBookedAppointments": { "en": "No Booked Appointments", @@ -466,7 +449,6 @@ const Map> localizedValues = { "OrderDetails": {"en": "Order Details", "ar": "تفاصيل الطلب"}, "VitalSign": {"en": "Vital Sign", "ar": "العلامة حيوية"}, "MonthlyReports": {"en": "Monthly Reports", "ar": "تقارير شهرية"}, - "locationDialogMessage": {"en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.", "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."}, "km":{"en":"KMs:","ar":"كم"}, "PatientHealthSummaryReport":{"en":"Patient Health Summary Report","ar":" ملخص التقارير الشهرية"}, "ToViewTheTermsAndConditions":{"en":"To View The Terms And Conditions Report","ar":" عرض الشروط والأحكام "},