From f1e0bcf86eea105ff5dcca857998be2e4661cb51 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 31 Aug 2020 17:54:03 +0300 Subject: [PATCH 01/37] speech to tex --- lib/widgets/others/bottom_bar.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 32df2dfc..ce480abb 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -206,12 +206,13 @@ class _SearchBot extends State { if (result['ProjectId'] != 0 && result['ClinicId'] != 0 && result['DoctorId'] != 0) { + var name = result['DoctorName'].replaceAll('دكتور', ''); getDoctorsList( result['ProjectId'], result['ClinicId'], context, doctorId: result['DoctorId'], - doctorName: result['DoctorName'], + doctorName: name.trim(), ); } else if (result['ProjectId'] != 0 && result['ClinicId'] != 0 && @@ -232,12 +233,13 @@ class _SearchBot extends State { } else if (result['ProjectId'] == 0 && result['ClinicId'] != 0 && result['DoctorId'] != 0) { + var name = result['DoctorName'].replaceAll('دكتور', ''); getDoctorsList( result['ProjectId'], result['ClinicId'], context, doctorId: result['DoctorId'], - doctorName: result['DoctorName'], + doctorName: name.trim(), ); } else { Navigator.push( @@ -304,8 +306,7 @@ class _SearchBot extends State { } }).catchError((err) { print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) { From e7a3d1a4ab75fc97826e1a3158fe916b8c8731cf Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 1 Sep 2020 10:28:58 +0300 Subject: [PATCH 02/37] speech search --- lib/widgets/others/bottom_bar.dart | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index ce480abb..ed9be80f 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -1,3 +1,4 @@ +import 'dart:collection'; import 'dart:convert'; import 'package:diplomaticquarterapp/config/config.dart'; @@ -9,6 +10,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; @@ -311,6 +313,7 @@ class _SearchBot extends State { getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) { List doctorsList = []; + List arr = []; DoctorsListService service = new DoctorsListService(); service .getDoctorsList(clinicId, projectId, context, doctorId: doctorName) @@ -319,8 +322,10 @@ class _SearchBot extends State { setState(() { if (res['DoctorList'].length != 0) { doctorsList.clear(); + res['DoctorList'].forEach((v) { doctorsList.add(new DoctorList.fromJson(v)); + arr.add(new DoctorList.fromJson(v).projectName); }); if (res['DoctorList'].length == 1 && doctorId != null) { getDoctorProfile( @@ -328,7 +333,7 @@ class _SearchBot extends State { //speak(); } else { - navigateToSearchResults(context, doctorsList); + navigateToSearchResults(context, doctorsList, arr); } } }); @@ -353,11 +358,20 @@ class _SearchBot extends State { ))); } - Future navigateToSearchResults(context, docList) async { + Future navigateToSearchResults(context, docList, arr) async { + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (context) => SearchResults(doctorsList: docList))); + var result = LinkedHashSet.from(arr).toList(); + var numAll = result.length; Navigator.push( - context, - MaterialPageRoute( - builder: (context) => SearchResults(doctorsList: docList))); + context, + MaterialPageRoute( + builder: (context) => + BranchView(doctorsList: docList, result: result, num: numAll), + ), + ); } speak() async { From 3a4c016f4ebdefc9b30cd213a8ca391bf04c11b7 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 2 Sep 2020 18:05:34 +0300 Subject: [PATCH 03/37] search --- lib/pages/BookAppointment/Search.dart | 10 +- .../components/SearchByClinic.dart | 21 ++-- .../appointment_services/GetDoctorsList.dart | 4 +- lib/widgets/others/bottom_bar.dart | 111 +++++++++++------- 4 files changed, 91 insertions(+), 55 deletions(-) diff --git a/lib/pages/BookAppointment/Search.dart b/lib/pages/BookAppointment/Search.dart index 9af6b449..d3ceaafd 100644 --- a/lib/pages/BookAppointment/Search.dart +++ b/lib/pages/BookAppointment/Search.dart @@ -7,7 +7,8 @@ import 'package:flutter/material.dart'; class Search extends StatefulWidget { final int type; - Search({this.type = 0}); + final List clnicIds; + Search({this.type = 0, this.clnicIds}); @override _SearchState createState() => _SearchState(); } @@ -41,7 +42,12 @@ class _SearchState extends State with TickerProviderStateMixin { ), body: TabBarView( physics: NeverScrollableScrollPhysics(), - children: [SearchByClinic(), SearchByDoctor()], + children: [ + SearchByClinic( + clnicIds: widget.clnicIds, + ), + SearchByDoctor() + ], controller: _tabController), bottomNavigationBar: BottomBarSearch()); } diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index bfadd3b0..28e3bcb6 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -17,6 +17,8 @@ import '../SearchResults.dart'; import "dart:collection"; class SearchByClinic extends StatefulWidget { + final List clnicIds; + SearchByClinic({this.clnicIds}); @override _SearchByClinicState createState() => _SearchByClinicState(); } @@ -30,14 +32,7 @@ class _SearchByClinicState extends State { @override void initState() { WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList()); - // event.controller.stream.listen((p) { - // if (p['clinic_id'] != null) { - // // setState(() { - // dropdownValue = p['clinic_id'].toString(); - // //}); - // getDoctorsList(context); - // } - // }); + super.initState(); } @@ -109,6 +104,7 @@ class _SearchByClinicState extends State { clinicsList.add(new ListClinicCentralized.fromJson(v)); }); }); + filterClinic(); } else {} }).catchError((err) { print(err); @@ -167,4 +163,13 @@ class _SearchByClinicState extends State { ); //builder: (context) => SearchResults(doctorsList: docList))); } + + filterClinic() { + setState(() { + clinicsList = clinicsList + .where((i) => widget.clnicIds.indexOf(i.clinicID) > -1) + .toList(); + print(clinicsList); + }); + } } diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index ba3ad56e..b183aa63 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -54,7 +54,9 @@ class DoctorsListService extends BaseService { "IsGetNearAppointment": false, "Latitude": 0, "Longitude": 0, - "License": true + "License": true, + // "IsVoiceCommand": doctorId != null && doctorId.length > 0 ? true : false, + // "DoctorIDsList": doctorId }; dynamic localRes; diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index ed9be80f..bce06dab 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -194,62 +194,70 @@ class _SearchBot extends State { searchProvider .getBotPages(request) .then((value) => {getCommands(value['Understand'])}); - //getDoctorsList(12, 17, 40036, context); } getCommands(result) async { - //RoboSearch.closeAlertDialog(context); print(result); results = result; - //getDoctorsList(12, 17, 40036, context); - + List clnicID = unique(result['ClinicId']); switch (result["CommandNumber"]) { case 100: if (result['ProjectId'] != 0 && - result['ClinicId'] != 0 && - result['DoctorId'] != 0) { + clnicID.length > 0 && + result['DoctorId'].length > 0) { var name = result['DoctorName'].replaceAll('دكتور', ''); - getDoctorsList( - result['ProjectId'], - result['ClinicId'], - context, - doctorId: result['DoctorId'], - doctorName: name.trim(), - ); + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + doctorId: result['DoctorId'], + doctorName: name.trim(), + ); + } else { + goToClinic(clnicID); + } } else if (result['ProjectId'] != 0 && - result['ClinicId'] != 0 && - result['DoctorId'] == 0) { - getDoctorsList( - result['ProjectId'], - result['ClinicId'], - context, - ); + clnicID.length > 0 && + result['DoctorId'].length == 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + ); + } else { + goToClinic(clnicID); + } } else if (result['ProjectId'] == 0 && - result['ClinicId'] != 0 && - result['DoctorId'] == 0) { - getDoctorsList( - result['ProjectId'], - result['ClinicId'], - context, - ); + clnicID.length > 0 && + result['DoctorId'].length == 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + ); + } else { + goToClinic(clnicID); + } } else if (result['ProjectId'] == 0 && - result['ClinicId'] != 0 && - result['DoctorId'] != 0) { + clnicID.length > 0 && + result['DoctorId'].length > 0) { var name = result['DoctorName'].replaceAll('دكتور', ''); - getDoctorsList( - result['ProjectId'], - result['ClinicId'], - context, - doctorId: result['DoctorId'], - doctorName: name.trim(), - ); + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + doctorId: result['DoctorId'], + doctorName: name.trim(), + ); + } else { + goToClinic(clnicID); + } } else { - Navigator.push( - AppGlobal.context, - MaterialPageRoute( - builder: (context) => Search( - type: 0, - ))); + goToClinic(clnicID); } speak(); break; @@ -327,9 +335,9 @@ class _SearchBot extends State { doctorsList.add(new DoctorList.fromJson(v)); arr.add(new DoctorList.fromJson(v).projectName); }); - if (res['DoctorList'].length == 1 && doctorId != null) { + if (res['DoctorList'].length == 1) { getDoctorProfile( - projectId, clinicId, doctorId, context, doctorsList); + projectId, clinicId, doctorId[0], context, doctorsList); //speak(); } else { @@ -384,4 +392,19 @@ class _SearchBot extends State { // initSpeechState().then((value) => startVoiceSearch()); // }); } + + goToClinic(List ids) { + Navigator.push( + AppGlobal.context, + MaterialPageRoute( + builder: (context) => Search( + type: 0, + clnicIds: ids, + ))); + // eventProvider.setValue({"clinic_id": ids}); + } + + List unique(List list) { + return list.toSet().toList(); + } } From 4a75215a19a90afef70af232d2622be3d12cf0b1 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 3 Sep 2020 10:11:22 +0300 Subject: [PATCH 04/37] search --- lib/config/localized_values.dart | 40 ++++++++++++------- .../appointment_services/GetDoctorsList.dart | 4 +- lib/widgets/others/bottom_bar.dart | 15 +++++-- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index ea14b71f..257a3995 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -343,7 +343,10 @@ const Map> localizedValues = { "en": "Online Payment Service", 'ar': 'خدمة الدفع عبر الإلكتدوني' }, - "OffersAndPackages": {"en": "Online transfer request", 'ar': 'طلب التحويل الالكتروني'}, + "OffersAndPackages": { + "en": "Online transfer request", + 'ar': 'طلب التحويل الالكتروني' + }, "ComprehensiveMedicalCheckup": { "en": "Comprehensive Medical Check up", 'ar': 'فحص طبي شامل' @@ -363,17 +366,26 @@ 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": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."} - "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": "كيف يمكنني مساعدتك؟"} + "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- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). " + }, + "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": "خدمات الطوارئ"}, }; diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index 4f16ab77..b8969a3a 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -66,8 +66,8 @@ class DoctorsListService extends BaseService { // "License": true, // "IsVoiceCommand": doctorId != null && doctorId.length > 0 ? true : false, // "DoctorIDsList": doctorId - "Latitude": lat.toString(), - "Longitude": long.toString(), + "Latitude": lat != null ? lat.toString() : 0, + "Longitude": long != null ? long.toString() : 0, "License": true }; diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index bce06dab..49651ca1 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -322,6 +322,7 @@ class _SearchBot extends State { getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) { List doctorsList = []; List arr = []; + List arrDistance = []; DoctorsListService service = new DoctorsListService(); service .getDoctorsList(clinicId, projectId, context, doctorId: doctorName) @@ -334,6 +335,9 @@ class _SearchBot extends State { res['DoctorList'].forEach((v) { doctorsList.add(new DoctorList.fromJson(v)); arr.add(new DoctorList.fromJson(v).projectName); + arrDistance.add(new DoctorList.fromJson(v) + .projectDistanceInKiloMeters + .toString()); }); if (res['DoctorList'].length == 1) { getDoctorProfile( @@ -341,7 +345,7 @@ class _SearchBot extends State { //speak(); } else { - navigateToSearchResults(context, doctorsList, arr); + navigateToSearchResults(context, doctorsList, arr, arrDistance); } } }); @@ -366,7 +370,7 @@ class _SearchBot extends State { ))); } - Future navigateToSearchResults(context, docList, arr) async { + Future navigateToSearchResults(context, docList, arr, arrDistance) async { // Navigator.push( // context, // MaterialPageRoute( @@ -376,8 +380,11 @@ class _SearchBot extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => - BranchView(doctorsList: docList, result: result, num: numAll), + builder: (context) => BranchView( + doctorsList: docList, + result: result, + num: numAll, + resultDistance: arrDistance), ), ); } From 20a17c0070bd46817ed4f1495affa26a00901366 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 3 Sep 2020 10:55:38 +0300 Subject: [PATCH 05/37] clinic search --- .../appointment_services/GetDoctorsList.dart | 6 +++--- lib/widgets/others/bottom_bar.dart | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index b8969a3a..653d6e43 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -54,7 +54,7 @@ class DoctorsListService extends BaseService { "SessionID": "YckwoXhUmWBsnHKEKig", "ClinicID": clinicID, "ProjectID": projectID, - "DoctorName": doctorId, //!= null ? doctorId : 0, + //"DoctorName": doctorId, //!= null ? doctorId : 0, "ContinueDentalPlan": false, "IsSearchAppointmnetByClinicID": true, "PatientID": authUser.patientID != null ? authUser.patientID : 0, @@ -64,8 +64,8 @@ class DoctorsListService extends BaseService { // "Latitude": 0, // "Longitude": 0, // "License": true, - // "IsVoiceCommand": doctorId != null && doctorId.length > 0 ? true : false, - // "DoctorIDsList": doctorId + "IsVoiceCommand": doctorId != null && doctorId.length > 0 ? true : false, + "DoctorIDsList": doctorId, "Latitude": lat != null ? lat.toString() : 0, "Longitude": long != null ? long.toString() : 0, "License": true diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 49651ca1..1747ef19 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -325,21 +325,22 @@ class _SearchBot extends State { List arrDistance = []; DoctorsListService service = new DoctorsListService(); service - .getDoctorsList(clinicId, projectId, context, doctorId: doctorName) + .getDoctorsList(clinicId, projectId, context, doctorId: doctorId) .then((res) { if (res['MessageStatus'] == 1) { setState(() { - if (res['DoctorList'].length != 0) { + if (res['SearchDoctorsByTime_IsVoiceCommandList'].length != 0) { doctorsList.clear(); - - res['DoctorList'].forEach((v) { - doctorsList.add(new DoctorList.fromJson(v)); - arr.add(new DoctorList.fromJson(v).projectName); - arrDistance.add(new DoctorList.fromJson(v) - .projectDistanceInKiloMeters - .toString()); + res['SearchDoctorsByTime_IsVoiceCommandList'].forEach((v1) { + v1['DoctorList'].forEach((v) { + doctorsList.add(new DoctorList.fromJson(v)); + arr.add(new DoctorList.fromJson(v).projectName); + arrDistance.add(new DoctorList.fromJson(v) + .projectDistanceInKiloMeters + .toString()); + }); }); - if (res['DoctorList'].length == 1) { + if (doctorsList.length == 1) { getDoctorProfile( projectId, clinicId, doctorId[0], context, doctorsList); From f6a3f0e61555e4123f15500b5ec885608d703ad0 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 6 Sep 2020 09:13:48 +0300 Subject: [PATCH 06/37] family file --- lib/config/localized_values.dart | 20 +- .../components/SearchByClinic.dart | 10 +- lib/pages/family/my-family.dart | 475 ++++++++++++------ .../appointment_services/GetDoctorsList.dart | 7 +- .../family_files/family_files_provider.dart | 46 ++ lib/uitl/translations_delegate_base.dart | 72 ++- lib/widgets/others/bottom_bar.dart | 185 +++---- 7 files changed, 538 insertions(+), 277 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index cfb13581..0ce36f70 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -388,16 +388,12 @@ const Map> localizedValues = { "building": {"en": "Building:", "ar": "المبنى"}, "branch": {"en": "Branch:", "ar": "الفرع"}, "emergencyServices": {"en": "Emergency Services:", "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- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). "}, - "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":"خدمات الطوارئ"} + "user-view-requester": { + "en": "User Wants To View Your Medical File", + "ar": "أشخاص يرغبون الاطلاع على ملفك الطبي" + }, + "user-view": { + "en": "User Can View Your Medical File", + "ar": "أشخاص يمكنهم الاطلاع على ملفك الطبي" + }, }; diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 8056de24..2ba7d571 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -256,10 +256,12 @@ class _SearchByClinicState extends State { filterClinic() { setState(() { - clinicsList = clinicsList - .where((i) => widget.clnicIds.indexOf(i.clinicID) > -1) - .toList(); - print(clinicsList); + if (widget.clnicIds.length > 0) { + clinicsList = clinicsList + .where((i) => widget.clnicIds.indexOf(i.clinicID) > -1) + .toList(); + print(clinicsList); + } }); } } diff --git a/lib/pages/family/my-family.dart b/lib/pages/family/my-family.dart index b2757514..bfce655d 100644 --- a/lib/pages/family/my-family.dart +++ b/lib/pages/family/my-family.dart @@ -1,178 +1,351 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; +import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart'; import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; +import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/routes.dart'; -class MyFamily extends StatelessWidget { - //bool isLoading = true; +class MyFamily extends StatefulWidget { + @override + _MyFamily createState() => _MyFamily(); +} + +class _MyFamily extends State with TickerProviderStateMixin { final familyFileProvider = FamilyFilesProvider(); AppSharedPreferences sharedPref = new AppSharedPreferences(); var userID; + TabController _tabController; + + @override + void initState() { + _tabController = new TabController(length: 2, vsync: this, initialIndex: 0); + super.initState(); + } + + bool expandFlag = false; Widget build(BuildContext context) { - return AppScaffold( - appBarTitle: TranslationBase.of(context).myFamilyFiles, - isShowAppBar: true, - body: DefaultTabController( - length: 2, - child: SingleChildScrollView( - padding: EdgeInsets.all(20), - child: Container( - height: SizeConfig.realScreenHeight, - width: SizeConfig.realScreenWidth, - child: Stack( - children: [ - TabBar( - indicatorColor: Colors.red, - tabs: [ - Padding( - padding: EdgeInsets.all(6), - child: - Text(TranslationBase.of(context).family)), - Padding( - padding: EdgeInsets.all(6), - child: - Text(TranslationBase.of(context).request)), - ], - ), - TabBarView( - children: [ - myFamilyDetails(context), - myFamilyRequest(context) - ], - ) - ], - ))))); + return Scaffold( + appBar: AppBar( + bottom: TabBar( + indicatorColor: Colors.red, + tabs: [ + Padding( + padding: EdgeInsets.all(6), + child: AppText( + TranslationBase.of(context).family, + color: Colors.white, + )), + Padding( + padding: EdgeInsets.all(6), + child: AppText( + TranslationBase.of(context).request, + color: Colors.white, + )), + ], + controller: _tabController, + ), + title: AppText(TranslationBase.of(context).myFamilyFiles, + color: Colors.white)), + body: TabBarView( + // physics: NeverScrollableScrollPhysics(), + children: [myFamilyDetails(context), myFamilyRequest(context)], + controller: _tabController), + bottomNavigationBar: BottomBarSearch()); + + // AppScaffold( + // appBarTitle: TranslationBase.of(context).myFamilyFiles, + // isShowAppBar: true, + // body: SingleChildScrollView( + // child: Container( + // height: SizeConfig.screenHeight, + // width: SizeConfig.realScreenWidth, + // padding: EdgeInsets.all(20), + // child: Stack( + // children: [ + // TabBar( + // controller: _tabController, + // indicatorColor: Colors.red, + // tabs: [ + // Padding( + // padding: EdgeInsets.all(6), + // child: Text(TranslationBase.of(context).family)), + // Padding( + // padding: EdgeInsets.all(6), + // child: Text(TranslationBase.of(context).request)), + // ], + // ), + // TabBarView( + // controller: _tabController, + // children: [ + // myFamilyDetails(context), + // myFamilyRequest(context) + // ], + // ) + // ], + // )))); } Widget myFamilyDetails(context) { - return // Padding( - //padding: EdgeInsets.only(top: 50), - //child: - Column( - // mainAxisAlignment: MainAxisAlignment.start, - children: [ - Expanded( - flex: 3, - child: FutureBuilder( - future: getFamilyFiles(), // async work - builder: (BuildContext context, - AsyncSnapshot snapshot) { - switch (snapshot.connectionState) { - case ConnectionState.waiting: - return Padding( - padding: EdgeInsets.only(top: 50), - child: Text('Loading....')); - default: - if (snapshot.hasError) - return Padding( - padding: EdgeInsets.all(10), - child: Text(snapshot.error)); - else - return Padding( - padding: EdgeInsets.only(top: 50), - child: Column(children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - flex: 3, - child: Text( - TranslationBase.of(context).request)), - Expanded( - flex: 2, - child: Text( - TranslationBase.of(context).switchUser, - )), - Expanded( - flex: 1, - child: Text( - TranslationBase.of(context).deleteView, - )), - ], - ), - Column( - mainAxisAlignment: MainAxisAlignment.start, - children: snapshot - .data.getAllSharedRecordsByStatusList - .map((result) { - return result.status == 3 - ? Padding( - padding: EdgeInsets.all(10), - child: Row( - children: [ - Expanded( - flex: 3, - child: - Text(result.patientName)), - Expanded( - flex: 2, - child: IconButton( - icon: Icon(Icons.group), - color: Colors.black, - onPressed: () { - switchUser( - result, context); - }, - )), - Expanded( - flex: 1, - child: IconButton( - icon: Icon( - Icons.delete, - color: Colors.black, - ), - onPressed: () { - deleteFamily( - result, context); - }, - )), - ], - )) - : SizedBox(); - }).toList()) - ])); - } - }, - )), - Expanded( - flex: 1, - child: Column( - children: [ - Row( + return Container( + height: MediaQuery.of(context).size.height, + margin: EdgeInsets.fromLTRB(20.0, 0, 20.0, 0.0), + child: Column( + children: [ + Expanded( + flex: 1, + child: FutureBuilder( + future: getFamilyFiles(), // async work + builder: (BuildContext context, + AsyncSnapshot + snapshot) { + switch (snapshot.connectionState) { + case ConnectionState.waiting: + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); + default: + if (snapshot.hasError) + return Padding( + padding: EdgeInsets.all(10), + child: Text(snapshot.error)); + else + return Padding( + padding: EdgeInsets.only(top: 50), + child: Column(children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 3, + child: Text(TranslationBase.of(context) + .request)), + Expanded( + flex: 2, + child: Text( + TranslationBase.of(context) + .switchUser, + )), + Expanded( + flex: 1, + child: Text( + TranslationBase.of(context) + .deleteView, + )), + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.start, + children: snapshot + .data.getAllSharedRecordsByStatusList + .map((result) { + return result.status == 3 + ? Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: Text( + result.patientName)), + Expanded( + flex: 2, + child: IconButton( + icon: Icon(Icons.group), + color: Colors.black, + onPressed: () { + switchUser( + result, context); + }, + )), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.delete, + color: Colors.black, + ), + onPressed: () { + deleteFamily( + result, context); + }, + )), + ], + )) + : SizedBox(); + }).toList()) + ])); + } + }, + )), + Expanded( + flex: 1, + child: Column( + mainAxisAlignment: MainAxisAlignment.end, children: [ - Expanded( - child: DefaultButton( - TranslationBase.of(context).addFamilyMember, - () => { - Navigator.of(context).pushNamed(ADD_FAMILY_MEMBER_TYPE) - }, - color: Colors.grey[900], - textColor: Colors.white, - )) + Row( + children: [ + Expanded( + child: DefaultButton( + TranslationBase.of(context).addFamilyMember, + () => { + Navigator.of(context) + .pushNamed(ADD_FAMILY_MEMBER_TYPE) + }, + color: Colors.grey[900], + textColor: Colors.white, + )) + ], + ), ], - ), - ], - )) - ], - ); + )) + ], + )); } - addMember() {} Widget myFamilyRequest(context) { - return Column( - children: [], + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 10.0), + child: Column( + children: [ + // SizedBox(height: 20.0), + RoundedContainer( + child: ExpansionTile( + title: Text( + TranslationBase.of(context).userViewRequest, + style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), + ), + children: [ + FutureBuilder( + future: getUserViewRequest(), // async work + builder: (BuildContext context, + AsyncSnapshot snapshot) { + switch (snapshot.connectionState) { + case ConnectionState.waiting: + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); + default: + if (snapshot.hasError) + return Padding( + padding: EdgeInsets.all(10), + child: Text(snapshot.error)); + else + return Column( + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 3, + child: Text(TranslationBase.of(context) + .request)), + Expanded( + flex: 2, + child: Text( + TranslationBase.of(context) + .switchUser, + )), + Expanded( + flex: 1, + child: Text( + TranslationBase.of(context) + .deleteView, + )), + ], + ), + Column( + children: [], + ) + ], + ); + } + }) + ], + ), + ), + RoundedContainer( + child: ExpansionTile( + title: Text( + TranslationBase.of(context).sentRequest, + style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), + ), + children: [ + FutureBuilder( + future: getSentRequest(), // async work + builder: + (BuildContext context, AsyncSnapshot snapshot) { + switch (snapshot.connectionState) { + case ConnectionState.waiting: + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); + default: + if (snapshot.hasError) + return Padding( + padding: EdgeInsets.all(10), + child: Text(snapshot.error)); + else + return Column( + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 3, + child: Text( + TranslationBase.of(context).request)), + Expanded( + flex: 2, + child: Text( + TranslationBase.of(context).switchUser, + )), + Expanded( + flex: 1, + child: Text( + TranslationBase.of(context).deleteView, + )), + ], + ), + Column( + children: [], + ) + ], + ); + } + }) + ], + )), + RoundedContainer( + child: ExpansionTile( + title: Text( + TranslationBase.of(context).userView, + style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), + ), + children: [ + ListTile( + title: Text('data'), + ) + ], + )) + ], + ), ); } @@ -186,6 +359,16 @@ class MyFamily extends StatelessWidget { } } + Future getUserViewRequest() async { + var user = await sharedPref.getObject(USER_PROFILE); + return familyFileProvider.getUserViewRequest(user['PatientID']); + } + + Future getSentRequest() async { + // var user = await sharedPref.getObject(USER_PROFILE); + return familyFileProvider.getUserSentRequest(); + } + deleteFamily(family, context) { ConfirmDialog dialog = new ConfirmDialog( context: context, diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index 5a9cf3f4..ad58175c 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -24,7 +24,7 @@ class DoctorsListService extends BaseService { double long; Future getDoctorsList(int clinicID, int projectID, BuildContext context, - {doctorId}) async { + {doctorId, doctorName}) async { //Utils.showProgressDialog(context); Map request; @@ -54,7 +54,7 @@ class DoctorsListService extends BaseService { "SessionID": "YckwoXhUmWBsnHKEKig", "ClinicID": clinicID, "ProjectID": projectID, - //"DoctorName": doctorId, //!= null ? doctorId : 0, + "DoctorName": doctorName, //!= null ? doctorId : 0, "ContinueDentalPlan": false, "IsSearchAppointmnetByClinicID": true, "PatientID": authUser.patientID != null ? authUser.patientID : 0, @@ -94,7 +94,8 @@ class DoctorsListService extends BaseService { authUser = data; } - if (await this.sharedPref.getDouble(USER_LAT) != null && await this.sharedPref.getDouble(USER_LONG) != null) { + if (await this.sharedPref.getDouble(USER_LAT) != null && + await this.sharedPref.getDouble(USER_LONG) != null) { lat = await this.sharedPref.getDouble(USER_LAT); long = await this.sharedPref.getDouble(USER_LONG); } diff --git a/lib/services/family_files/family_files_provider.dart b/lib/services/family_files/family_files_provider.dart index ea2247d3..4a70c0b1 100644 --- a/lib/services/family_files/family_files_provider.dart +++ b/lib/services/family_files/family_files_provider.dart @@ -33,6 +33,10 @@ const String REMOVE_FILE_STATUS = const String ACTIVATION_CODE_URL = "Services/Authentication.svc/REST/CheckActivationCode"; +const String SENT_REQUEST_URL = + 'Services/Authentication.svc/REST/GetAllSharedRecordsByStatus'; +const String RECEVIED_REQUEST_URL = + 'Services/Authentication.svc/REST/GetAllPendingRecordsByResponseId'; class FamilyFilesProvider with ChangeNotifier { bool isLogin = false; @@ -60,6 +64,48 @@ class FamilyFilesProvider with ChangeNotifier { } } + Future getUserViewRequest(responseID) async { + try { + dynamic localRes; + Map request = {}; + request['ResponseID'] = responseID; + await new BaseAppClient().post(RECEVIED_REQUEST_URL, + onSuccess: (dynamic response, int statusCode) { + localRes = response; + }, onFailure: (String error, int statusCode) { + AppToast.showErrorToast(message: error); + throw error; + }, body: request); + sharedPref.setObject(FAMILY_FILE, localRes); + return Future.value( + GetAllSharedRecordsByStatusResponse.fromJson(localRes)); + } catch (error) { + print(error); + throw error; + } + } + + Future getUserSentRequest() async { + try { + dynamic localRes; + Map request = {}; + request['Status'] = 0; + await new BaseAppClient().post(SENT_REQUEST_URL, + onSuccess: (dynamic response, int statusCode) { + localRes = response; + }, onFailure: (String error, int statusCode) { + AppToast.showErrorToast(message: error); + throw error; + }, body: request); + sharedPref.setObject(FAMILY_FILE, localRes); + return Future.value( + GetAllSharedRecordsByStatusResponse.fromJson(localRes)); + } catch (error) { + print(error); + throw error; + } + } + Future addFamilyFile(AddFamilyFileReq request) async { try { dynamic localRes; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index d9fc04bc..023a1318 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -417,33 +417,46 @@ class TranslationBase { String get removeFamilyMember => localizedValues['remove-family-member'][locale.languageCode]; - String get myMedicalFile =>localizedValues['MyMedicalFile'][locale.languageCode]; - String get myMedicalFileSubTitle =>localizedValues['myMedicalFileSubTitle'][locale.languageCode]; - String get viewMore =>localizedValues['viewMore'][locale.languageCode]; - String get homeHealthCareService =>localizedValues['homeHealthCareService'][locale.languageCode]; - String get onlinePharmacy =>localizedValues['OnlinePharmacy'][locale.languageCode]; - String get emergencyService =>localizedValues['EmergencyService'][locale.languageCode]; - String get onlinePaymentService =>localizedValues['OnlinePaymentService'][locale.languageCode]; - String get offersAndPackages =>localizedValues['OffersAndPackages'][locale.languageCode]; - String get comprehensiveMedicalCheckup =>localizedValues['ComprehensiveMedicalCheckup'][locale.languageCode]; - String get hMGService =>localizedValues['HMGService'][locale.languageCode]; - String get viewAllHabibMedicalService =>localizedValues['ViewAllHabibMedicalService'][locale.languageCode]; - String get viewAll =>localizedValues['viewAll'][locale.languageCode]; - String get contactUs =>localizedValues['ContactUs'][locale.languageCode]; - String get viewAllWaysReachUs =>localizedValues['ViewAllWaysReachUs'][locale.languageCode]; - String get medicalProfile =>localizedValues['medicalProfile'][locale.languageCode]; - String get parking =>localizedValues['parking'][locale.languageCode]; - String get alhabiServices =>localizedValues['alhabiServices'][locale.languageCode]; - String get parkingTitle =>localizedValues['parkingTitle'][locale.languageCode]; - String get readBarcode =>localizedValues['readBarcode'][locale.languageCode]; - String get showMyPark =>localizedValues['showMyPark'][locale.languageCode]; - String get clearMyData =>localizedValues['clearMyData'][locale.languageCode]; - String get floor =>localizedValues['floor'][locale.languageCode]; - String get gate =>localizedValues['gate'][locale.languageCode]; - String get building =>localizedValues['building'][locale.languageCode]; - String get branch =>localizedValues['branch'][locale.languageCode]; - String get emergencyServices =>localizedValues['emergencyServices'][locale.languageCode]; - + String get myMedicalFile => + localizedValues['MyMedicalFile'][locale.languageCode]; + String get myMedicalFileSubTitle => + localizedValues['myMedicalFileSubTitle'][locale.languageCode]; + String get viewMore => localizedValues['viewMore'][locale.languageCode]; + String get homeHealthCareService => + localizedValues['homeHealthCareService'][locale.languageCode]; + String get onlinePharmacy => + localizedValues['OnlinePharmacy'][locale.languageCode]; + String get emergencyService => + localizedValues['EmergencyService'][locale.languageCode]; + String get onlinePaymentService => + localizedValues['OnlinePaymentService'][locale.languageCode]; + String get offersAndPackages => + localizedValues['OffersAndPackages'][locale.languageCode]; + String get comprehensiveMedicalCheckup => + localizedValues['ComprehensiveMedicalCheckup'][locale.languageCode]; + String get hMGService => localizedValues['HMGService'][locale.languageCode]; + String get viewAllHabibMedicalService => + localizedValues['ViewAllHabibMedicalService'][locale.languageCode]; + String get viewAll => localizedValues['viewAll'][locale.languageCode]; + String get contactUs => localizedValues['ContactUs'][locale.languageCode]; + String get viewAllWaysReachUs => + localizedValues['ViewAllWaysReachUs'][locale.languageCode]; + String get medicalProfile => + localizedValues['medicalProfile'][locale.languageCode]; + String get parking => localizedValues['parking'][locale.languageCode]; + String get alhabiServices => + localizedValues['alhabiServices'][locale.languageCode]; + String get parkingTitle => + localizedValues['parkingTitle'][locale.languageCode]; + String get readBarcode => localizedValues['readBarcode'][locale.languageCode]; + String get showMyPark => localizedValues['showMyPark'][locale.languageCode]; + String get clearMyData => localizedValues['clearMyData'][locale.languageCode]; + String get floor => localizedValues['floor'][locale.languageCode]; + String get gate => localizedValues['gate'][locale.languageCode]; + String get building => localizedValues['building'][locale.languageCode]; + String get branch => localizedValues['branch'][locale.languageCode]; + String get emergencyServices => + localizedValues['emergencyServices'][locale.languageCode]; String get consultation => localizedValues['consultation'][locale.languageCode]; @@ -452,6 +465,11 @@ class TranslationBase { localizedValues['textToSpeech'][locale.languageCode]; String get locationDialogMessage => localizedValues['locationDialogMessage'][locale.languageCode]; + String get userViewRequest => + localizedValues['user-view-requester'][locale.languageCode]; + String get userView => localizedValues['user-view'][locale.languageCode]; + String get sentRequest => + localizedValues['sent-requests'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 1747ef19..b6108c36 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -138,7 +138,7 @@ class _SearchBot extends State { } Future _speak(reconizedWord) async { - await flutterTts.speak(reconizedWord); + //await flutterTts.speak(reconizedWord); getPages(reconizedWord); } @@ -199,94 +199,88 @@ class _SearchBot extends State { getCommands(result) async { print(result); results = result; - List clnicID = unique(result['ClinicId']); + switch (result["CommandNumber"]) { - case 100: - if (result['ProjectId'] != 0 && - clnicID.length > 0 && - result['DoctorId'].length > 0) { - var name = result['DoctorName'].replaceAll('دكتور', ''); - if (clnicID.length == 1) { - getDoctorsList( - result['ProjectId'], - clnicID[0], - context, - doctorId: result['DoctorId'], - doctorName: name.trim(), - ); - } else { - goToClinic(clnicID); - } - } else if (result['ProjectId'] != 0 && - clnicID.length > 0 && - result['DoctorId'].length == 0) { - if (clnicID.length == 1) { - getDoctorsList( - result['ProjectId'], - clnicID[0], - context, - ); - } else { - goToClinic(clnicID); - } - } else if (result['ProjectId'] == 0 && - clnicID.length > 0 && - result['DoctorId'].length == 0) { - if (clnicID.length == 1) { - getDoctorsList( - result['ProjectId'], - clnicID[0], - context, - ); - } else { - goToClinic(clnicID); - } - } else if (result['ProjectId'] == 0 && - clnicID.length > 0 && - result['DoctorId'].length > 0) { - var name = result['DoctorName'].replaceAll('دكتور', ''); - if (clnicID.length == 1) { - getDoctorsList( - result['ProjectId'], - clnicID[0], - context, - doctorId: result['DoctorId'], - doctorName: name.trim(), - ); + case '100': + { + List clnicID = unique(result['ClinicId']); + if (result['ProjectId'] != 0 && + clnicID.length > 0 && + result['DoctorId'].length > 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + doctorId: result['DoctorId'], + doctorName: null, + ); + } else { + goToClinic(clnicID); + } + } else if (result['ProjectId'] != 0 && + clnicID.length > 0 && + result['DoctorId'].length == 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + ); + } else { + goToClinic(clnicID); + } + } else if (result['ProjectId'] == 0 && + clnicID.length > 0 && + result['DoctorId'].length == 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + ); + } else { + goToClinic(clnicID); + } + } else if (result['ProjectId'] == 0 && + clnicID.length > 0 && + result['DoctorId'].length > 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + doctorId: result['DoctorId'], + doctorName: null, + ); + } else { + goToClinic(clnicID); + } } else { goToClinic(clnicID); } - } else { - goToClinic(clnicID); + speak(); + } + break; + case '102': + { + // getDoctorsList( + // 0, + // 0, + // context, + // doctorId: null, + // doctorName: result['DoctorName'], + // ); + getDoctorsList( + 0, + 0, + context, + doctorId: result['DoctorId'], + doctorName: null, + ); + speak(); } - speak(); break; - // case '101': - // Navigator.push( - // AppGlobal.context, - // MaterialPageRoute( - // builder: (context) => Search( - // type: 0, - // ))); - // break; - // case '102': - // Navigator.push( - // AppGlobal.context, - // MaterialPageRoute( - // builder: (context) => Search( - // type: 1, - // ))); - // break; - // case '103': - // eventProvider.setValue({"clinic_id": understand}); - // break; - - // case '104': - // eventProvider.setValue({"project_id": understand}); - // break; - // case '105': - // eventProvider.setValue({"doctor_id": understand}); - // break; default: Navigator.of(context).pushNamed(HOME); speak(); @@ -325,11 +319,13 @@ class _SearchBot extends State { List arrDistance = []; DoctorsListService service = new DoctorsListService(); service - .getDoctorsList(clinicId, projectId, context, doctorId: doctorId) + .getDoctorsList(clinicId, projectId, context, + doctorId: doctorId, doctorName: doctorName) .then((res) { if (res['MessageStatus'] == 1) { setState(() { - if (res['SearchDoctorsByTime_IsVoiceCommandList'].length != 0) { + if (res['SearchDoctorsByTime_IsVoiceCommandList'] != null && + res['SearchDoctorsByTime_IsVoiceCommandList'].length != 0) { doctorsList.clear(); res['SearchDoctorsByTime_IsVoiceCommandList'].forEach((v1) { v1['DoctorList'].forEach((v) { @@ -340,6 +336,25 @@ class _SearchBot extends State { .toString()); }); }); + if (doctorsList.length == 1) { + getDoctorProfile( + projectId, clinicId, doctorId[0], context, doctorsList); + + //speak(); + } else { + navigateToSearchResults(context, doctorsList, arr, arrDistance); + } + } else if (res['DoctorList'].length != 0) { + doctorsList.clear(); + + res['DoctorList'].forEach((v) { + doctorsList.add(new DoctorList.fromJson(v)); + arr.add(new DoctorList.fromJson(v).projectName); + arrDistance.add(new DoctorList.fromJson(v) + .projectDistanceInKiloMeters + .toString()); + }); + if (doctorsList.length == 1) { getDoctorProfile( projectId, clinicId, doctorId[0], context, doctorsList); From 0f63b922d128ec864b06cc15984510a7a83b5b74 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 7 Sep 2020 14:50:43 +0300 Subject: [PATCH 07/37] speech to text --- .../Appointments/DoctorListResponse.dart | 4 +- lib/pages/BookAppointment/Search.dart | 52 +-- .../components/SearchByClinic.dart | 122 ++++-- .../BookAppointment/widgets/BranchView.dart | 6 + lib/pages/family/my-family.dart | 374 ++++++++++++------ .../family_files/family_files_provider.dart | 2 +- lib/widgets/others/app_scaffold_widget.dart | 10 +- lib/widgets/others/bottom_bar.dart | 18 +- 8 files changed, 383 insertions(+), 205 deletions(-) diff --git a/lib/models/Appointments/DoctorListResponse.dart b/lib/models/Appointments/DoctorListResponse.dart index 66c0c855..e0468c1f 100644 --- a/lib/models/Appointments/DoctorListResponse.dart +++ b/lib/models/Appointments/DoctorListResponse.dart @@ -173,7 +173,9 @@ class PatientDoctorAppointmentList { List patientDoctorAppointmentList = List(); PatientDoctorAppointmentList( - {this.filterName, this.distanceInKMs, DoctorList patientDoctorAppointment}) { + {this.filterName, + this.distanceInKMs, + DoctorList patientDoctorAppointment}) { patientDoctorAppointmentList.add(patientDoctorAppointment); } } diff --git a/lib/pages/BookAppointment/Search.dart b/lib/pages/BookAppointment/Search.dart index b5f83c4c..095d72a6 100644 --- a/lib/pages/BookAppointment/Search.dart +++ b/lib/pages/BookAppointment/Search.dart @@ -1,8 +1,10 @@ +import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByClinic.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/components/SearchByDoctor.dart'; import 'package:diplomaticquarterapp/uitl/location_util.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; +import 'package:diplomaticquarterapp/widgets/others/arrow_back.dart'; import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart'; import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; @@ -28,29 +30,35 @@ class _SearchState extends State with TickerProviderStateMixin { @override Widget build(BuildContext context) { + AppGlobal.context = context; return Scaffold( - appBar: AppBar( - bottom: TabBar( - tabs: [ - Tab(text: TranslationBase.of(context).clinicName), - Tab( - text: TranslationBase.of(context).doctorName, - ) - ], - controller: _tabController, - ), - title: Text(TranslationBase.of(context).bookAppo, - style: TextStyle(color: Colors.white)), + appBar: AppBar( + bottom: TabBar( + tabs: [ + Tab(text: TranslationBase.of(context).clinicName), + Tab( + text: TranslationBase.of(context).doctorName, + ) + ], + controller: _tabController, ), - body: TabBarView( - physics: NeverScrollableScrollPhysics(), - children: [ - SearchByClinic( - clnicIds: widget.clnicIds, - ), - SearchByDoctor() - ], - controller: _tabController), - bottomNavigationBar: BottomBarSearch()); + title: Text(TranslationBase.of(context).bookAppo, + style: TextStyle(color: Colors.white)), + leading: Builder( + builder: (BuildContext context) { + return ArrowBack(); + }, + ), + ), + body: TabBarView( + physics: NeverScrollableScrollPhysics(), + children: [ + SearchByClinic( + clnicIds: widget.clnicIds, + ), + SearchByDoctor() + ], + controller: _tabController), + ); } } diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 2ba7d571..de3aaed0 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -1,5 +1,5 @@ import "dart:collection"; - +import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Appointments/SearchInfoModel.dart'; @@ -11,6 +11,7 @@ import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; import 'package:flutter/material.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; @@ -29,7 +30,7 @@ class _SearchByClinicState extends State { List clinicsList = []; List projectsList = []; bool isMobileAppDentalAllow = false; - + bool isLoaded = false; @override void initState() { WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList()); @@ -58,40 +59,70 @@ class _SearchByClinicState extends State { style: TextStyle(fontSize: 16.0, letterSpacing: 0.9)), ], ), - Container( - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - border: Border.all( - color: Colors.grey[400], - width: 1.0, - ), - borderRadius: BorderRadius.circular(10), - ), - // margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 20.0), - padding: EdgeInsets.all(8.0), - width: MediaQuery.of(context).size.width, - child: DropdownButtonHideUnderline( - child: DropdownButton( - hint: new Text("Select Clinic"), - value: dropdownValue, - items: clinicsList.map((item) { - return new DropdownMenuItem( - value: item.clinicID.toString(), - child: new Text(item.clinicDescription), - ); - }).toList(), - onChanged: (newValue) { - setState(() { - dropdownValue = newValue; - if (!isDentalSelectedAndSupported()) { - projectDropdownValue = ""; - getDoctorsList(context); - } - }); - }, - ), - )), + widget.clnicIds != null && + widget.clnicIds.length > 1 && + isLoaded == true + ? Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: clinicsList.map((result) { + return RoundedContainer( + child: ListTile( + onTap: () { + // setState(() { + dropdownValue = result.clinicID.toString(); + setState(() { + if (!isDentalSelectedAndSupported()) { + projectDropdownValue = ""; + getDoctorsList(context); + } + }); + }, + trailing: Icon(TranslationBase.of(AppGlobal.context) + .locale + .languageCode == + 'en' + ? Icons.keyboard_arrow_right + : Icons.keyboard_arrow_left), + title: Text(result.clinicDescription, + style: TextStyle( + fontSize: 14.0, + color: Colors.grey[700], + letterSpacing: 1.0)))); + }).toList()) + : Container( + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Colors.grey[400], + width: 1.0, + ), + borderRadius: BorderRadius.circular(10), + ), + // margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 20.0), + padding: EdgeInsets.all(8.0), + width: MediaQuery.of(context).size.width, + child: DropdownButtonHideUnderline( + child: DropdownButton( + hint: new Text("Select Clinic"), + value: dropdownValue, + items: clinicsList.map((item) { + return new DropdownMenuItem( + value: item.clinicID.toString(), + child: new Text(item.clinicDescription), + ); + }).toList(), + onChanged: (newValue) { + setState(() { + dropdownValue = newValue; + if (!isDentalSelectedAndSupported()) { + projectDropdownValue = ""; + getDoctorsList(context); + } + }); + }, + ), + )), isDentalSelectedAndSupported() == true || nearestAppo ? Container( height: 60.0, @@ -202,15 +233,18 @@ class _SearchByClinicState extends State { if (res['MessageStatus'] == 1) { setState(() { if (res['DoctorList'].length != 0) { - print(res['DoctorList']); doctorsList.clear(); res['DoctorList'].forEach((v) { - doctorsList.add(new DoctorList.fromJson(v)); + try { + doctorsList.add(new DoctorList.fromJson(v)); - arr.add(new DoctorList.fromJson(v).projectName); - arrDistance.add(new DoctorList.fromJson(v) - .projectDistanceInKiloMeters - .toString()); + arr.add(new DoctorList.fromJson(v).projectName); + arrDistance.add(new DoctorList.fromJson(v) + .projectDistanceInKiloMeters + .toString()); + } catch (issue) { + print(issue); + } }); } else {} }); @@ -260,7 +294,9 @@ class _SearchByClinicState extends State { clinicsList = clinicsList .where((i) => widget.clnicIds.indexOf(i.clinicID) > -1) .toList(); - print(clinicsList); + isLoaded = true; + + ///print(clinicsList); } }); } diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart index 6819c54b..63d47b5f 100644 --- a/lib/pages/BookAppointment/widgets/BranchView.dart +++ b/lib/pages/BookAppointment/widgets/BranchView.dart @@ -27,6 +27,7 @@ class _BranchViewState extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).bookAppo, isShowAppBar: true, + isBottomBar: false, body: new ListView.builder( itemBuilder: (BuildContext context, int index) { return new ExpandableListView( @@ -58,6 +59,8 @@ class ExpandableListView extends StatefulWidget { class _ExpandableListViewState extends State { bool expandFlag = false; + var _radioValue1; + @override Widget build(BuildContext context) { return new Container( @@ -150,6 +153,9 @@ class _ExpandableListViewState extends State { return ""; } } + + sortByProject() {} + sortByClinic() {} } class ExpandableContainer extends StatelessWidget { diff --git a/lib/pages/family/my-family.dart b/lib/pages/family/my-family.dart index bfce655d..8a9ff531 100644 --- a/lib/pages/family/my-family.dart +++ b/lib/pages/family/my-family.dart @@ -106,113 +106,113 @@ class _MyFamily extends State with TickerProviderStateMixin { child: Column( children: [ Expanded( - flex: 1, - child: FutureBuilder( - future: getFamilyFiles(), // async work - builder: (BuildContext context, - AsyncSnapshot - snapshot) { - switch (snapshot.connectionState) { - case ConnectionState.waiting: + flex:4, + child: FutureBuilder( + future: getFamilyFiles(), // async work + builder: (BuildContext context, + AsyncSnapshot + snapshot) { + switch (snapshot.connectionState) { + case ConnectionState.waiting: + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); + default: + if (snapshot.hasError) + return Padding( + padding: EdgeInsets.all(10), + child: Text(snapshot.error)); + else return Padding( padding: EdgeInsets.only(top: 50), - child: Text('Loading....')); - default: - if (snapshot.hasError) - return Padding( - padding: EdgeInsets.all(10), - child: Text(snapshot.error)); - else - return Padding( - padding: EdgeInsets.only(top: 50), - child: Column(children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - flex: 3, - child: Text(TranslationBase.of(context) - .request)), - Expanded( - flex: 2, - child: Text( - TranslationBase.of(context) - .switchUser, - )), - Expanded( - flex: 1, - child: Text( - TranslationBase.of(context) - .deleteView, - )), - ], - ), - Column( - mainAxisAlignment: MainAxisAlignment.start, - children: snapshot - .data.getAllSharedRecordsByStatusList - .map((result) { - return result.status == 3 - ? Padding( - padding: EdgeInsets.all(10), - child: Row( - children: [ - Expanded( - flex: 3, - child: Text( - result.patientName)), - Expanded( - flex: 2, - child: IconButton( - icon: Icon(Icons.group), + child: Column(children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 3, + child: Text( + TranslationBase.of(context).request)), + Expanded( + flex: 2, + child: Text( + TranslationBase.of(context).switchUser, + )), + Expanded( + flex: 1, + child: Text( + TranslationBase.of(context).deleteView, + )), + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.start, + children: snapshot + .data.getAllSharedRecordsByStatusList + .map((result) { + return result.status == 3 + ? Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: Text( + result.patientName)), + Expanded( + flex: 2, + child: IconButton( + icon: Icon(Icons.group), + color: Colors.black, + onPressed: () { + switchUser( + result, context); + }, + )), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.delete, color: Colors.black, - onPressed: () { - switchUser( - result, context); - }, - )), - Expanded( - flex: 1, - child: IconButton( - icon: Icon( - Icons.delete, - color: Colors.black, - ), - onPressed: () { - deleteFamily( - result, context); - }, - )), - ], - )) - : SizedBox(); - }).toList()) - ])); - } - }, - )), + ), + onPressed: () { + deleteFamily( + result, context); + }, + )), + ], + )) + : SizedBox(); + }).toList()) + ])); + } + }, + ), + ), Expanded( - flex: 1, - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Row( - children: [ - Expanded( - child: DefaultButton( - TranslationBase.of(context).addFamilyMember, - () => { - Navigator.of(context) - .pushNamed(ADD_FAMILY_MEMBER_TYPE) - }, - color: Colors.grey[900], - textColor: Colors.white, - )) - ], - ), - ], - )) + flex:1, + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Row( + children: [ + Expanded( + child: DefaultButton( + TranslationBase.of(context).addFamilyMember, + () => { + Navigator.of(context) + .pushNamed(ADD_FAMILY_MEMBER_TYPE) + }, + color: Colors.grey[900], + textColor: Colors.white, + )) + ], + ), + ], + ), + ) ], )); } @@ -270,7 +270,53 @@ class _MyFamily extends State with TickerProviderStateMixin { ], ), Column( - children: [], + + children: [ + Row(children: [ + Expanded(flex:3,child:AppText('Name')), + Expanded(flex:1,child:AppText('Allow')), + Expanded(flex:1,child:AppText('Reject')), + ]), + Column(children: snapshot + .data['GetAllPendingRecordsList'] + .map((result) { + return Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: Text( + result.patientName)), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.check_circle, + color: Colors.black, + ), + onPressed: () { + acceptRequest( + result, context); + }, + )), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.delete, + color: Colors.black, + ), + onPressed: () { + deleteRequest( + result, context); + }, + )) + ], + )); + + }).toList()) + ] ) ], ); @@ -289,7 +335,57 @@ class _MyFamily extends State with TickerProviderStateMixin { FutureBuilder( future: getSentRequest(), // async work builder: - (BuildContext context, AsyncSnapshot snapshot) { + (BuildContext context, AsyncSnapshot snapshot) { + switch (snapshot.connectionState) { + case ConnectionState.waiting: + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); + default: + if (snapshot.hasError) + return Padding( + padding: EdgeInsets.all(10), + child: Text(snapshot.error)); + else + return SingleChildScrollView( + child: Container( + height: SizeConfig.screenHeight *.3, + child: ListView( + children: snapshot + .data.getAllSharedRecordsByStatusList + .map((result) { + return Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: Text( + result.patientName)), + Expanded( + flex: 2, + child: AppText(result.statusDescription, color: Colors.red,)), + + ], + )); + + }).toList(), + ))); + } + }) + ], + )), + RoundedContainer( + child: ExpansionTile( + title: Text( + TranslationBase.of(context).userView, + style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), + ), + children: [ + FutureBuilder( + future: getUserViewRequest(), // async work + builder: (BuildContext context, + AsyncSnapshot snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: return Padding( @@ -305,44 +401,68 @@ class _MyFamily extends State with TickerProviderStateMixin { children: [ Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, children: [ Expanded( flex: 3, - child: Text( - TranslationBase.of(context).request)), + child: Text(TranslationBase.of(context) + .request)), Expanded( flex: 2, child: Text( - TranslationBase.of(context).switchUser, + TranslationBase.of(context) + .switchUser, )), Expanded( flex: 1, child: Text( - TranslationBase.of(context).deleteView, + TranslationBase.of(context) + .deleteView, )), ], ), Column( - children: [], + + children: [ + Row(children: [ + Expanded(flex:3,child:AppText('Name')), + Expanded(flex:1,child:AppText('Delete')), + ]), + Column(children: snapshot + .data['GetAllPendingRecordsList'] + .map((result) { + return Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: Text( + result.patientName)), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.delete, + color: Colors.black, + ), + onPressed: () { + deleteRequest( + result, context); + }, + )), + + ], + )); + + }).toList()) + ] ) ], ); } }) ], - )), - RoundedContainer( - child: ExpansionTile( - title: Text( - TranslationBase.of(context).userView, - style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold), - ), - children: [ - ListTile( - title: Text('data'), - ) - ], )) ], ), @@ -364,7 +484,7 @@ class _MyFamily extends State with TickerProviderStateMixin { return familyFileProvider.getUserViewRequest(user['PatientID']); } - Future getSentRequest() async { + Future getSentRequest() async { // var user = await sharedPref.getObject(USER_PROFILE); return familyFileProvider.getUserSentRequest(); } @@ -419,4 +539,10 @@ class _MyFamily extends State with TickerProviderStateMixin { HOME, ); } + deleteRequest(result, context){ + + } + acceptRequest(result, context){ + + } } diff --git a/lib/services/family_files/family_files_provider.dart b/lib/services/family_files/family_files_provider.dart index 4a70c0b1..1fcaefd2 100644 --- a/lib/services/family_files/family_files_provider.dart +++ b/lib/services/family_files/family_files_provider.dart @@ -85,7 +85,7 @@ class FamilyFilesProvider with ChangeNotifier { } } - Future getUserSentRequest() async { + Future getUserSentRequest() async { try { dynamic localRes; Map request = {}; diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index b18a5fd9..eda27361 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -25,7 +25,7 @@ class AppScaffold extends StatelessWidget { final bool isShowAppBar; final bool hasAppBarParam; final BaseViewModel baseViewModel; - + final bool isBottomBar; AppScaffold( {@required this.body, this.appBarTitle = '', @@ -33,7 +33,8 @@ class AppScaffold extends StatelessWidget { this.isShowAppBar = false, this.hasAppBarParam, this.bottomSheet, - this.baseViewModel}); + this.baseViewModel, + this.isBottomBar = true}); @override Widget build(BuildContext context) { @@ -74,7 +75,8 @@ class AppScaffold extends StatelessWidget { ) : buildBodyWidget(), bottomSheet: bottomSheet, - bottomNavigationBar: BottomBarSearch() + bottomNavigationBar: + this.isBottomBar == true ? BottomBarSearch() : SizedBox() //floatingActionButton: FloatingSearchButton(), ); } @@ -84,6 +86,6 @@ class AppScaffold extends StatelessWidget { } buildBodyWidget() { - return body ;//Stack(children: [body, buildAppLoaderWidget(isLoading)]); + return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]); } } diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index b6108c36..25649b06 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -259,18 +259,11 @@ class _SearchBot extends State { } else { goToClinic(clnicID); } - speak(); + // speak(); } break; case '102': { - // getDoctorsList( - // 0, - // 0, - // context, - // doctorId: null, - // doctorName: result['DoctorName'], - // ); getDoctorsList( 0, 0, @@ -278,7 +271,12 @@ class _SearchBot extends State { doctorId: result['DoctorId'], doctorName: null, ); - speak(); + } + break; + case '103': + { + List clnicID = unique(result['ClinicId']); + goToClinic(clnicID); } break; default: @@ -424,7 +422,7 @@ class _SearchBot extends State { type: 0, clnicIds: ids, ))); - // eventProvider.setValue({"clinic_id": ids}); + speak(); } List unique(List list) { From 77f6dd94ef06f72d261f686b5f16781b76cd3429 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 8 Sep 2020 10:54:16 +0300 Subject: [PATCH 08/37] search page change --- lib/services/robo_search/search_provider.dart | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/services/robo_search/search_provider.dart b/lib/services/robo_search/search_provider.dart index bd129d1b..5a192d74 100644 --- a/lib/services/robo_search/search_provider.dart +++ b/lib/services/robo_search/search_provider.dart @@ -10,9 +10,11 @@ class SearchProvider with ChangeNotifier { bool isLogin = false; bool isLoading = true; dynamic pageData = {}; - + static bool isNewSession = false; + static var sessionID = new DateTime.now().millisecondsSinceEpoch; Future getBotPages(request) async { try { + request['SessionID'] = sessionID; await BaseAppClient().post(SEARCH_BOT, onSuccess: (dynamic response, int statusCode) { pageData = response; @@ -34,4 +36,12 @@ class SearchProvider with ChangeNotifier { //projectProvider.setSearchValue(pageData); notifyListeners(); } + + getSessionID() { + if (isNewSession == true) { + return new DateTime.now().millisecondsSinceEpoch; + } else { + return sessionID; + } + } } From a535543863c4c67eb0e3913222e7e64692f5a9e7 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 8 Sep 2020 15:05:46 +0300 Subject: [PATCH 09/37] more pages added on the voice search --- .../BookAppointment/widgets/BranchView.dart | 18 +++-- lib/pages/login/login-type.dart | 4 +- lib/pages/login/login.dart | 2 + lib/widgets/others/bottom_bar.dart | 66 +++++++++++++++++++ 4 files changed, 84 insertions(+), 6 deletions(-) diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart index 48613ebf..455a579b 100644 --- a/lib/pages/BookAppointment/widgets/BranchView.dart +++ b/lib/pages/BookAppointment/widgets/BranchView.dart @@ -47,7 +47,7 @@ class ExpandableListView extends StatefulWidget { final List resultDistance; final List doctorsList2; final val; - + static int doctorListheight = 0; const ExpandableListView( {Key key, this.result2, this.resultDistance, this.val, this.doctorsList2}) : super(key: key); @@ -59,8 +59,6 @@ class ExpandableListView extends StatefulWidget { class _ExpandableListViewState extends State { bool expandFlag = false; - var _radioValue1; - @override Widget build(BuildContext context) { return new Container( @@ -112,6 +110,10 @@ class _ExpandableListViewState extends State { onPressed: () { setState(() { expandFlag = !expandFlag; + if (expandFlag == true) { + setDoctorViewHeight( + widget.result2[widget.val].toString()); + } }); }), ], @@ -146,6 +148,11 @@ class _ExpandableListViewState extends State { ); } + setDoctorViewHeight(name) { + ExpandableListView.doctorListheight = + widget.doctorsList2.where((e) => e.projectName == name).toList().length; + } + String getProjectDistance(String distance) { if (distance != "0") return " - " + distance + " " + TranslationBase.of(context).km; @@ -178,9 +185,12 @@ class ExpandableContainer extends StatelessWidget { duration: new Duration(milliseconds: 500), curve: Curves.easeInOut, width: screenWidth, - height: expanded ? MediaQuery.of(context).size.height : collapsedHeight, + height: expanded + ? (ExpandableListView.doctorListheight * 160).toDouble() + : collapsedHeight, child: new Container( child: child, + padding: EdgeInsets.only(bottom: 30), decoration: new BoxDecoration( border: new Border.all(width: 1.0, color: Colors.white)), ), diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index 7a8a940d..24d28ba1 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -23,7 +23,7 @@ class LoginType extends StatelessWidget { Expanded( flex: 4, child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + // mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, children: [ Image.asset( @@ -135,7 +135,7 @@ class LoginType extends StatelessWidget { ]), ), Expanded( - flex: 2, + flex: 1, child: Column( mainAxisAlignment: MainAxisAlignment.end, children: [ diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 7510987c..b0942a88 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -180,6 +180,7 @@ class _Login extends State { // request.logInTokenID = await sharedPref.getString(LOGIN_TOKEN_ID); // request.activationCode = code ?? "0000"; // request.isSilentLogin = code != null ? false : true; + if (code == null) showLoader(true); request['PatientMobileNumber'] = int.parse(mobileNo); request['ZipCode'] = countryCode; request['SearchType'] = loginType; @@ -201,6 +202,7 @@ class _Login extends State { Navigator.of(context).pushNamed( HOME, ), + showLoader(false), appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index cd264111..2e936c1d 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -11,9 +11,15 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; +import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; @@ -289,6 +295,66 @@ class _SearchBot extends State { } } break; + case '4': + { + Navigator.push(context, FadePage(page: LabsHomePage())); + } + break; + case '6': + { + Navigator.push(context, FadePage(page: RadiologyHomePage())); + } + break; + case '7': + { + Navigator.push( + context, + FadePage( + page: MyAppointments(), + ), + ); + } + break; + case '7': + { + Navigator.push( + context, + FadePage( + page: MyAppointments(), + ), + ); + } + break; + case '8': + { + Navigator.push( + context, + FadePage( + page: HomePrescriptionsPage(), + ), + ); + } + break; + case '9': + { + Navigator.push( + context, + FadePage( + page: DoctorHomePage(), + ), + ); + } + break; + case '10': + { + Navigator.push( + context, + FadePage( + page: VitalSignDetailsScreen(), + ), + ); + } + break; default: Navigator.of(context).pushNamed(HOME); speak(); From 5d3439899828452ce385eef26a3c8a973bee60c3 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 8 Sep 2020 15:10:11 +0300 Subject: [PATCH 10/37] insurance updated --- lib/widgets/others/bottom_bar.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 2e936c1d..209d6b98 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -40,6 +40,7 @@ import 'dart:math'; import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; class BottomBarSearch extends StatefulWidget { @override @@ -355,6 +356,11 @@ class _SearchBot extends State { ); } break; + case '11': + { + Navigator.push(context, FadePage(page: InsuranceUpdate())); + } + break; default: Navigator.of(context).pushNamed(HOME); speak(); From f5d68642916a20db864f25d2ec3e837b74c1ea2e Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 9 Sep 2020 10:11:04 +0300 Subject: [PATCH 11/37] voice search coc --- lib/widgets/others/bottom_bar.dart | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 209d6b98..87672c58 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -41,6 +41,7 @@ import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; +import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; class BottomBarSearch extends StatefulWidget { @override @@ -316,16 +317,6 @@ class _SearchBot extends State { ); } break; - case '7': - { - Navigator.push( - context, - FadePage( - page: MyAppointments(), - ), - ); - } - break; case '8': { Navigator.push( @@ -361,6 +352,12 @@ class _SearchBot extends State { Navigator.push(context, FadePage(page: InsuranceUpdate())); } break; + case '12': + { + Navigator.push(context, FadePage(page: FeedbackHomePage())); + } + break; + default: Navigator.of(context).pushNamed(HOME); speak(); From 5e252d21d20d1e4c9adfe8c6d7054dcd3d80a125 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 9 Sep 2020 11:04:22 +0300 Subject: [PATCH 12/37] voice search added more medical option --- lib/pages/feedback/feedback_home_page.dart | 11 ++++------- lib/widgets/others/bottom_bar.dart | 21 ++++++++++++++++++++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/lib/pages/feedback/feedback_home_page.dart b/lib/pages/feedback/feedback_home_page.dart index 68f0bfab..d7c7361f 100644 --- a/lib/pages/feedback/feedback_home_page.dart +++ b/lib/pages/feedback/feedback_home_page.dart @@ -33,6 +33,7 @@ class _FeedbackHomePageState extends State Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, + isBottomBar: false, appBarTitle: 'Feedback', body: Scaffold( extendBodyBehindAppBar: true, @@ -62,8 +63,7 @@ class _FeedbackHomePageState extends State decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).dividerColor, - width: 0.7), + color: Theme.of(context).dividerColor, width: 0.7), ), color: Colors.white), child: Center( @@ -75,7 +75,7 @@ class _FeedbackHomePageState extends State indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), + EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( @@ -104,10 +104,7 @@ class _FeedbackHomePageState extends State child: TabBarView( physics: BouncingScrollPhysics(), controller: _tabController, - children: [ - SendFeedbackPage(), - StatusFeedbackPage() - ], + children: [SendFeedbackPage(), StatusFeedbackPage()], ), ) ], diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 87672c58..f5d4d8bf 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -12,6 +12,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; +import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; @@ -19,7 +20,9 @@ import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/reports/report_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart'; +import 'package:diplomaticquarterapp/pages/vaccine/my_vaccines_screen.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; @@ -354,9 +357,25 @@ class _SearchBot extends State { break; case '12': { - Navigator.push(context, FadePage(page: FeedbackHomePage())); + Navigator.push(context, FadePage(page: InsuranceApproval())); } break; + case '13': + { + Navigator.push(context, FadePage(page: MyVaccines())); + } + break; + case '14': + { + Navigator.push(context, FadePage(page: HomeReportPage())); + } + break; + + // case '12': + // { + // Navigator.push(context, FadePage(page: FeedbackHomePage())); + // } + // break; default: Navigator.of(context).pushNamed(HOME); From 0a2cb22042dfe36225d4bcbd2e44a1928429e24c Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 9 Sep 2020 13:13:50 +0300 Subject: [PATCH 13/37] design issues fixed --- lib/pages/MyAppointments/MyAppointments.dart | 205 ++++++++------- .../widgets/AppointmentCardView.dart | 5 +- lib/pages/family/my-family.dart | 245 +++++++++--------- lib/pages/landing/home_page.dart | 23 +- .../family_files/family_files_provider.dart | 8 +- .../others/app_expandable_notifier.dart | 68 ++++- 6 files changed, 299 insertions(+), 255 deletions(-) diff --git a/lib/pages/MyAppointments/MyAppointments.dart b/lib/pages/MyAppointments/MyAppointments.dart index dc6fc65c..aa0e7d98 100644 --- a/lib/pages/MyAppointments/MyAppointments.dart +++ b/lib/pages/MyAppointments/MyAppointments.dart @@ -216,87 +216,91 @@ class _MyAppointmentsState extends State Widget getBookedAppointments() { return Container( - child: widget.bookedAppoList.length != 0 - ? new ListView.builder( - itemCount: widget.bookedAppoList.length, - itemBuilder: (context, i) { - return AppointmentCard( - appo: widget.bookedAppoList[i], - onReloadAppointmentHistory: getPatientAppointmentHistory, - ); - }, - ) - : Container( - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/images/new-design/noAppointmentIcon.png"), - Container( - margin: EdgeInsets.only(top: 10.0), - child: Text(TranslationBase.of(context).noBookedAppointments, - style: TextStyle( - fontSize: 16.0, - )), - ), - Container( - margin: EdgeInsets.only(top: 10.0), - child: Container( - child: widget.bookedAppoList.length != 0 - ? SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Column( - children: [ - ...List.generate( - widget._patientBookedAppointmentListHospital.length, + child: widget.bookedAppoList.length != 0 + ? new ListView.builder( + itemCount: widget.bookedAppoList.length, + itemBuilder: (context, i) { + return AppointmentCard( + appo: widget.bookedAppoList[i], + onReloadAppointmentHistory: getPatientAppointmentHistory, + ); + }, + ) + : Container( + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // Image.asset( + // "assets/images/new-design/noAppointmentIcon.png"), + // Container( + // margin: EdgeInsets.only(top: 10.0), + // child: Text(TranslationBase.of(context).noBookedAppointments, + // style: TextStyle( + // fontSize: 16.0, + // )), + // ), + Container( + margin: EdgeInsets.only(top: 10.0), + child: Container( + child: widget.bookedAppoList.length != 0 + ? SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + ...List.generate( + widget._patientBookedAppointmentListHospital + .length, (index) => AppExpandableNotifier( - title: widget - ._patientBookedAppointmentListHospital[index] - .filterName, - bodyWidget: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: widget - ._patientBookedAppointmentListHospital[index] - .patientDoctorAppointmentList - .map((doctor) { - return AppointmentCard( - appo: doctor, - onReloadAppointmentHistory: - getPatientAppointmentHistory, - ); - }).toList(), - )), - ) - ], - ), - ) - : Container( - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/images/new-design/noAppointmentIcon.png"), - Container( - margin: EdgeInsets.only(top: 10.0), - child: Text("No Booked Appointments", - style: TextStyle( - fontSize: 16.0, - )), + title: widget + ._patientBookedAppointmentListHospital[ + index] + .filterName, + bodyWidget: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: widget + ._patientBookedAppointmentListHospital[ + index] + .patientDoctorAppointmentList + .map((doctor) { + return AppointmentCard( + appo: doctor, + onReloadAppointmentHistory: + getPatientAppointmentHistory, + ); + }).toList(), + )), + ) + ], + ), + ) + : Container( + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/images/new-design/noAppointmentIcon.png"), + Container( + margin: EdgeInsets.only(top: 10.0), + child: Text("No Booked Appointments", + style: TextStyle( + fontSize: 16.0, + )), + ), + ], ), - ], + ), ), - ), - ), - ), - ) - ], - - )))); + ), + ) + ], + )))); } Widget getConfirmedAppointments() { @@ -341,7 +345,8 @@ class _MyAppointmentsState extends State Image.asset("assets/images/new-design/noAppointmentIcon.png"), Container( margin: EdgeInsets.only(top: 10.0), - child: Text(TranslationBase.of(context).noConfirmedAppointments , + child: Text( + TranslationBase.of(context).noConfirmedAppointments, style: TextStyle( fontSize: 16.0, )), @@ -363,23 +368,24 @@ class _MyAppointmentsState extends State ...List.generate( widget._patientArrivedAppointmentListHospital.length, (index) => AppExpandableNotifier( - title: widget + title: widget + ._patientArrivedAppointmentListHospital[index] + .filterName, + bodyWidget: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: widget ._patientArrivedAppointmentListHospital[index] - .filterName, - bodyWidget: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: widget - ._patientArrivedAppointmentListHospital[index] - .patientDoctorAppointmentList - .map((doctor) { - return AppointmentCard( - appo: doctor, - onReloadAppointmentHistory: - getPatientAppointmentHistory, - ); - }).toList(), - )), + .patientDoctorAppointmentList + .map((doctor) { + return AppointmentCard( + appo: doctor, + onReloadAppointmentHistory: + getPatientAppointmentHistory, + ); + }).toList(), + ), + ), ) ], ), @@ -394,10 +400,11 @@ class _MyAppointmentsState extends State Image.asset("assets/images/new-design/noAppointmentIcon.png"), Container( margin: EdgeInsets.only(top: 10.0), - child: Text(TranslationBase.of(context).noArrivedAppointments, - style: TextStyle( - fontSize: 16.0, - )), + child: + Text(TranslationBase.of(context).noArrivedAppointments, + style: TextStyle( + fontSize: 16.0, + )), ), ], ), diff --git a/lib/pages/MyAppointments/widgets/AppointmentCardView.dart b/lib/pages/MyAppointments/widgets/AppointmentCardView.dart index b64bd232..a0bb7f40 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentCardView.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentCardView.dart @@ -24,7 +24,7 @@ class _ApointmentCardState extends State { navigateToAppointmentDetails(context, widget.appo); }, child: Card( - margin: EdgeInsets.fromLTRB(20.0, 16.0, 20.0, 8.0), + // margin: EdgeInsets.fromLTRB(20.0, 16.0, 20.0, 8.0), color: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), @@ -95,7 +95,8 @@ class _ApointmentCardState extends State { emptyIcon: Icons.star, ), Container( - transform: Matrix4.translationValues(15.0, -40.0, 0.0), + transform: + Matrix4.translationValues(15.0, -40.0, 0.0), child: Image.asset( "assets/images/new-design/arrow.png", width: 25.0, diff --git a/lib/pages/family/my-family.dart b/lib/pages/family/my-family.dart index 8a9ff531..698a6c75 100644 --- a/lib/pages/family/my-family.dart +++ b/lib/pages/family/my-family.dart @@ -106,7 +106,7 @@ class _MyFamily extends State with TickerProviderStateMixin { child: Column( children: [ Expanded( - flex:4, + flex: 4, child: FutureBuilder( future: getFamilyFiles(), // async work builder: (BuildContext context, @@ -192,7 +192,7 @@ class _MyFamily extends State with TickerProviderStateMixin { ), ), Expanded( - flex:1, + flex: 1, child: Column( mainAxisAlignment: MainAxisAlignment.end, children: [ @@ -269,55 +269,52 @@ class _MyFamily extends State with TickerProviderStateMixin { )), ], ), - Column( - - children: [ - Row(children: [ - Expanded(flex:3,child:AppText('Name')), - Expanded(flex:1,child:AppText('Allow')), - Expanded(flex:1,child:AppText('Reject')), - ]), - Column(children: snapshot + Column(children: [ + Row(children: [ + Expanded(flex: 3, child: AppText('Name')), + Expanded(flex: 1, child: AppText('Allow')), + Expanded(flex: 1, child: AppText('Reject')), + ]), + Column( + children: snapshot .data['GetAllPendingRecordsList'] .map((result) { - return Padding( - padding: EdgeInsets.all(10), - child: Row( - children: [ - Expanded( - flex: 3, - child: Text( - result.patientName)), - Expanded( - flex: 1, - child: IconButton( - icon: Icon( - Icons.check_circle, - color: Colors.black, - ), - onPressed: () { - acceptRequest( - result, context); - }, - )), - Expanded( - flex: 1, - child: IconButton( - icon: Icon( - Icons.delete, - color: Colors.black, - ), - onPressed: () { - deleteRequest( - result, context); - }, - )) - ], - )); - - }).toList()) - ] - ) + return Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: + Text(result.patientName)), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.check_circle, + color: Colors.black, + ), + onPressed: () { + acceptRequest( + result, context); + }, + )), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.delete, + color: Colors.black, + ), + onPressed: () { + deleteRequest( + result, context); + }, + )) + ], + )); + }).toList()) + ]) ], ); } @@ -334,8 +331,9 @@ class _MyFamily extends State with TickerProviderStateMixin { children: [ FutureBuilder( future: getSentRequest(), // async work - builder: - (BuildContext context, AsyncSnapshot snapshot) { + builder: (BuildContext context, + AsyncSnapshot + snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: return Padding( @@ -345,32 +343,33 @@ class _MyFamily extends State with TickerProviderStateMixin { if (snapshot.hasError) return Padding( padding: EdgeInsets.all(10), - child: Text(snapshot.error)); + child: Text('No data found..')); else - return SingleChildScrollView( - child: Container( - height: SizeConfig.screenHeight *.3, - child: ListView( - children: snapshot - .data.getAllSharedRecordsByStatusList - .map((result) { - return Padding( - padding: EdgeInsets.all(10), - child: Row( - children: [ - Expanded( - flex: 3, - child: Text( - result.patientName)), - Expanded( - flex: 2, - child: AppText(result.statusDescription, color: Colors.red,)), - - ], - )); - - }).toList(), - ))); + return SingleChildScrollView( + child: Container( + height: SizeConfig.screenHeight * .3, + child: ListView( + children: snapshot + .data.getAllSharedRecordsByStatusList + .map((result) { + return Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: + Text(result.patientName)), + Expanded( + flex: 2, + child: AppText( + result.statusDescription, + color: Colors.red, + )), + ], + )); + }).toList(), + ))); } }) ], @@ -384,8 +383,8 @@ class _MyFamily extends State with TickerProviderStateMixin { children: [ FutureBuilder( future: getUserViewRequest(), // async work - builder: (BuildContext context, - AsyncSnapshot snapshot) { + builder: + (BuildContext context, AsyncSnapshot snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: return Padding( @@ -395,69 +394,62 @@ class _MyFamily extends State with TickerProviderStateMixin { if (snapshot.hasError) return Padding( padding: EdgeInsets.all(10), - child: Text(snapshot.error)); + child: Text('No data found..')); else return Column( children: [ Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, children: [ Expanded( flex: 3, - child: Text(TranslationBase.of(context) - .request)), + child: Text( + TranslationBase.of(context).request)), Expanded( flex: 2, child: Text( - TranslationBase.of(context) - .switchUser, + TranslationBase.of(context).switchUser, )), Expanded( flex: 1, child: Text( - TranslationBase.of(context) - .deleteView, + TranslationBase.of(context).deleteView, )), ], ), - Column( - - children: [ - Row(children: [ - Expanded(flex:3,child:AppText('Name')), - Expanded(flex:1,child:AppText('Delete')), - ]), - Column(children: snapshot - .data['GetAllPendingRecordsList'] - .map((result) { - return Padding( - padding: EdgeInsets.all(10), - child: Row( - children: [ - Expanded( - flex: 3, - child: Text( - result.patientName)), - Expanded( - flex: 1, - child: IconButton( - icon: Icon( - Icons.delete, - color: Colors.black, - ), - onPressed: () { - deleteRequest( - result, context); - }, - )), - - ], - )); - - }).toList()) - ] - ) + Column(children: [ + Row(children: [ + Expanded(flex: 3, child: AppText('Name')), + Expanded(flex: 1, child: AppText('Delete')), + ]), + Column( + children: snapshot + .data['GetAllPendingRecordsList'] + .map((result) { + return Padding( + padding: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + flex: 3, + child: Text(result.patientName)), + Expanded( + flex: 1, + child: IconButton( + icon: Icon( + Icons.delete, + color: Colors.black, + ), + onPressed: () { + deleteRequest( + result, context); + }, + )), + ], + )); + }).toList()) + ]) ], ); } @@ -539,10 +531,7 @@ class _MyFamily extends State with TickerProviderStateMixin { HOME, ); } - deleteRequest(result, context){ - } - acceptRequest(result, context){ - - } + deleteRequest(result, context) {} + acceptRequest(result, context) {} } diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index da9d9348..7d7138d0 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -468,7 +468,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: SizeConfig.textMultiplier * 2, + fontSize: SizeConfig.textMultiplier * 1.9, ) ], ), @@ -500,7 +500,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: SizeConfig.textMultiplier * 2, + fontSize: SizeConfig.textMultiplier * 1.9, ) ], ), @@ -515,8 +515,12 @@ class _HomePageState extends State { Container( width: MediaQuery.of(context).size.width * 0.29, child: InkWell( - onTap: ()=>Navigator.push(context, - FadePage(page: ErOptions(isAppbar: true,))), + onTap: () => Navigator.push( + context, + FadePage( + page: ErOptions( + isAppbar: true, + ))), child: Center( child: Padding( padding: const EdgeInsets.all(15.0), @@ -531,11 +535,12 @@ class _HomePageState extends State { height: 15, ), Texts( - TranslationBase.of(context).emergencyServices, + TranslationBase.of(context) + .emergencyServices, textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: SizeConfig.textMultiplier * 1.9, ) ], ), @@ -598,9 +603,9 @@ class _HomePageState extends State { context, FadePage(page: AllHabibMedicalService())), ), DashboardItem( - onTap: (){ - Navigator.push(context, FadePage(page: FeedbackHomePage())); - + onTap: () { + Navigator.push( + context, FadePage(page: FeedbackHomePage())); }, child: Container( width: double.infinity, diff --git a/lib/services/family_files/family_files_provider.dart b/lib/services/family_files/family_files_provider.dart index 1fcaefd2..f5a06df9 100644 --- a/lib/services/family_files/family_files_provider.dart +++ b/lib/services/family_files/family_files_provider.dart @@ -73,8 +73,7 @@ class FamilyFilesProvider with ChangeNotifier { onSuccess: (dynamic response, int statusCode) { localRes = response; }, onFailure: (String error, int statusCode) { - AppToast.showErrorToast(message: error); - throw error; + return Future.value(error); }, body: request); sharedPref.setObject(FAMILY_FILE, localRes); return Future.value( @@ -94,8 +93,9 @@ class FamilyFilesProvider with ChangeNotifier { onSuccess: (dynamic response, int statusCode) { localRes = response; }, onFailure: (String error, int statusCode) { - AppToast.showErrorToast(message: error); - throw error; + return Future.value(error); + //AppToast.showErrorToast(message: error); + //throw error; }, body: request); sharedPref.setObject(FAMILY_FILE, localRes); return Future.value( diff --git a/lib/widgets/others/app_expandable_notifier.dart b/lib/widgets/others/app_expandable_notifier.dart index 353846e1..55cc7bee 100644 --- a/lib/widgets/others/app_expandable_notifier.dart +++ b/lib/widgets/others/app_expandable_notifier.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter/material.dart'; @@ -6,48 +7,89 @@ import 'package:flutter/material.dart'; /// [bodyWidget] widget want to show in the body /// [title] the widget title /// [collapsed] The widget shown in the collapsed state -class AppExpandableNotifier extends StatelessWidget { +class AppExpandableNotifier extends StatefulWidget { final Widget headerWidget; final Widget bodyWidget; final String title; final Widget collapsed; - + bool expandFlag = false; + var controller = new ExpandableController(); AppExpandableNotifier( {this.headerWidget, this.bodyWidget, this.title, this.collapsed}); + _AppExpandableNotifier createState() => _AppExpandableNotifier(); +} +class _AppExpandableNotifier extends State { @override Widget build(BuildContext context) { return ExpandableNotifier( child: Padding( - padding: const EdgeInsets.only(left: 10,right: 10,top: 4), + padding: const EdgeInsets.only(left: 10, right: 10, top: 4), child: Card( clipBehavior: Clip.antiAlias, child: Column( children: [ SizedBox( - child: headerWidget, + child: widget.headerWidget, ), ScrollOnExpand( scrollOnExpand: true, scrollOnCollapse: false, child: ExpandablePanel( + hasIcon: false, theme: const ExpandableThemeData( headerAlignment: ExpandablePanelHeaderAlignment.center, tapBodyToCollapse: true, ), - header: Padding( - padding: EdgeInsets.all(10), - child: Text( - title?? 'Details', - style: TextStyle(fontWeight: FontWeight.bold,fontSize: 22,), - ), - ), - collapsed: collapsed ?? Container(), - expanded: bodyWidget, + header: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: EdgeInsets.all(10), + child: Text( + widget.title ?? 'Details', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: SizeConfig.textMultiplier * 2, + ), + ), + ), + new IconButton( + icon: new Container( + height: 28.0, + width: 30.0, + decoration: new BoxDecoration( + color: Colors.red, + shape: BoxShape.circle, + ), + child: new Center( + child: new Icon( + widget.expandFlag + ? Icons.keyboard_arrow_up + : Icons.keyboard_arrow_down, + color: Colors.white, + size: 30.0, + ), + ), + ), + onPressed: () { + setState(() { + widget.expandFlag = !widget.expandFlag; + if (widget.expandFlag == true) { + widget.controller.expanded = true; + } else { + widget.controller.expanded = false; + } + }); + }), + ]), + collapsed: widget.collapsed ?? Container(), + expanded: widget.bodyWidget, builder: (_, collapsed, expanded) { return Padding( padding: EdgeInsets.only(left: 5, right: 5, bottom: 5), child: Expandable( + controller: widget.controller, collapsed: collapsed, expanded: expanded, theme: const ExpandableThemeData(crossFadePoint: 0), From 92efbcbd2f92a6dce97a6fc8d7d74ad31d7f5392 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 9 Sep 2020 14:11:46 +0300 Subject: [PATCH 14/37] my family --- lib/pages/family/my-family.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pages/family/my-family.dart b/lib/pages/family/my-family.dart index 698a6c75..b4024b0a 100644 --- a/lib/pages/family/my-family.dart +++ b/lib/pages/family/my-family.dart @@ -121,7 +121,7 @@ class _MyFamily extends State with TickerProviderStateMixin { if (snapshot.hasError) return Padding( padding: EdgeInsets.all(10), - child: Text(snapshot.error)); + child: Text("No data found")); else return Padding( padding: EdgeInsets.only(top: 50), @@ -243,7 +243,7 @@ class _MyFamily extends State with TickerProviderStateMixin { if (snapshot.hasError) return Padding( padding: EdgeInsets.all(10), - child: Text(snapshot.error)); + child: Text('No data found')); else return Column( children: [ @@ -343,7 +343,7 @@ class _MyFamily extends State with TickerProviderStateMixin { if (snapshot.hasError) return Padding( padding: EdgeInsets.all(10), - child: Text('No data found..')); + child: Text('No data found')); else return SingleChildScrollView( child: Container( @@ -394,7 +394,7 @@ class _MyFamily extends State with TickerProviderStateMixin { if (snapshot.hasError) return Padding( padding: EdgeInsets.all(10), - child: Text('No data found..')); + child: Text('No data found')); else return Column( children: [ From 591e9e9a4cfc99f80b8b0a172078bb6ac9460345 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 27 Sep 2020 09:35:46 +0300 Subject: [PATCH 15/37] updated --- lib/pages/landing/home_page.dart | 12 ++++++------ lib/widgets/data_display/text.dart | 2 +- lib/widgets/others/bottom_bar.dart | 28 +++++++++++++++++++++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 7d7138d0..24a6f714 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -362,7 +362,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -420,7 +420,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context).emergencyService, @@ -460,7 +460,7 @@ class _HomePageState extends State { height: 55, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -492,7 +492,7 @@ class _HomePageState extends State { height: 55, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -532,7 +532,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -595,7 +595,7 @@ class _HomePageState extends State { ), ), height: 100, - imageName: 'hmg_services_bg .png', + imageName: 'hmg_services_bg.png', opacity: 0.5, color: Colors.grey[700], width: MediaQuery.of(context).size.width * 0.45, diff --git a/lib/widgets/data_display/text.dart b/lib/widgets/data_display/text.dart index 17ddf05b..4b9fc551 100644 --- a/lib/widgets/data_display/text.dart +++ b/lib/widgets/data_display/text.dart @@ -225,7 +225,7 @@ class _TextsState extends State { fontStyle: widget.italic ? FontStyle.italic : null, color: widget.color ?? Colors.black, fontSize: widget.fontSize ?? _getFontSize(), - letterSpacing: widget.variant == "overline" ? 1.5 : null, + letterSpacing: widget.variant == "overline" ? 1 : null, fontWeight: widget.fontWeight ?? _getFontWeight(), ), ), diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index f5d4d8bf..4de9efdf 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -11,13 +11,16 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; +import 'package:diplomaticquarterapp/pages/ErService/NearestEr.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; +import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/patient_sick_leave_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/reports/report_home_page.dart'; @@ -370,12 +373,27 @@ class _SearchBot extends State { Navigator.push(context, FadePage(page: HomeReportPage())); } break; + case '5': + { + Navigator.push(context, FadePage(page: NearestEr())); + } + break; + case '15': + { + Navigator.push(context, FadePage(page: PatientSickLeavePage())); + } + break; + case '16': + { + Navigator.push(context, FadePage(page: LiveCareHome())); + } + break; - // case '12': - // { - // Navigator.push(context, FadePage(page: FeedbackHomePage())); - // } - // break; + case '200': + { + Navigator.push(context, FadePage(page: FeedbackHomePage())); + } + break; default: Navigator.of(context).pushNamed(HOME); From 79502de6823fc195558212c2bb839e9f7871597b Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 28 Sep 2020 09:50:06 +0300 Subject: [PATCH 16/37] update --- .../LiveChat/hospitalsLivechat_page.dart | 3 +- .../ContactUs/findus/hospitrals_page.dart | 347 ++++++++++-------- .../ContactUs/findus/pharmacies_page.dart | 53 ++- 3 files changed, 237 insertions(+), 166 deletions(-) diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 66ad31ee..5936328a 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -112,8 +112,7 @@ class _HospitalsLiveChatPageState extends State { children: [ IconButton( icon: Icon( - Icons - .arrow_forward_rounded, + Icons.arrow_forward, color: tappedIndex == index ? Colors.white diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index 315fe553..aafc3472 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -1,4 +1,3 @@ - import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; @@ -9,6 +8,7 @@ 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'; + class HospitalsPage extends StatefulWidget { @override _HospitalsPageState createState() => _HospitalsPageState(); @@ -18,167 +18,220 @@ class _HospitalsPageState extends State { @override Widget build(BuildContext context) { return BaseView( - onModelReady: (model) => model.getFindUsRequestOrders(),//model.getCOC(), + onModelReady: (model) => model.getFindUsRequestOrders(), //model.getCOC(), builder: (_, model, widget) => AppScaffold( baseViewModel: model, body: SingleChildScrollView( child: Container( - margin: EdgeInsets.only(left: 15,right: 15,top: 70), + margin: EdgeInsets.only(left: 15, right: 15, top: 70), child: Column( children: [ - ...List.generate(model.FindusHospitalModelList.length, (index) => Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - ), - - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.center, - children: [ - InkWell( - onTap:(){ - showDialog( - context: context,builder: (_) => AssetGiffyDialog( - title: Text(model.FindusHospitalModelList[index].locationName, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ),image:Image.network(model.FindusHospitalModelList[index].projectImageURL.toString(), fit: BoxFit.cover,), - buttonCancelText:Text('cancel') , - buttonCancelColor: Colors.grey, - onlyCancelButton: true, - - ) ); - }, - child: Container( - width: 70, - height: 70, - child: Image.network(model.FindusHospitalModelList[index].projectImageURL.toString())), - ), - Expanded( - flex: 4, - child: Container( - margin: EdgeInsets.only(left: 5,right: 5), - child: Texts('${model.FindusHospitalModelList[index].locationName}',textAlign: TextAlign.center,))),//model.cOCItemList[index].cOCTitl - Expanded( - flex: 2, - child: Row( - children: [ - IconButton( - icon: Icon(Icons.person_pin_circle_outlined,color: Colors.red,), - tooltip: 'Increase volume by 10', - onPressed: () { - setState(() { - MapsLauncher.launchCoordinates(double.parse(model.FindusHospitalModelList[index].latitude),double.parse(model.FindusHospitalModelList[index].longitude),model.FindusHospitalModelList[index].locationName); - // _volume += 10; - }); - }, - ), - IconButton( - icon: Icon(Icons.phone,color: Colors.red,), - tooltip: 'Increase volume by 10', - onPressed: () { - setState(() { - // _volume += 10; - launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - ], + ...List.generate( + model.FindusHospitalModelList.length, + (index) => Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + InkWell( + onTap: () { + showDialog( + context: context, + builder: (_) => + AssetGiffyDialog( + title: Text( + model + .FindusHospitalModelList[ + index] + .locationName, + style: TextStyle( + fontSize: 22.0, + fontWeight: + FontWeight + .w600), + ), + image: Image.network( + model + .FindusHospitalModelList[ + index] + .projectImageURL + .toString(), + fit: BoxFit.cover, + ), + buttonCancelText: + Text('cancel'), + buttonCancelColor: + Colors.grey, + onlyCancelButton: true, + )); + }, + child: Container( + width: 70, + height: 70, + child: Image.network(model + .FindusHospitalModelList[ + index] + .projectImageURL + .toString())), + ), + Expanded( + flex: 4, + child: Container( + margin: EdgeInsets.only( + left: 5, right: 5), + child: Texts( + '${model.FindusHospitalModelList[index].locationName}', + textAlign: TextAlign.center, + ))), //model.cOCItemList[index].cOCTitl + Expanded( + flex: 2, + child: Row( + children: [ + IconButton( + icon: Icon( + Icons.person_pin_circle, + color: Colors.red, + ), + tooltip: + 'Increase volume by 10', + onPressed: () { + setState(() { + MapsLauncher.launchCoordinates( + double.parse(model + .FindusHospitalModelList[ + index] + .latitude), + double.parse(model + .FindusHospitalModelList[ + index] + .longitude), + model + .FindusHospitalModelList[ + index] + .locationName); + // _volume += 10; + }); + }, + ), + IconButton( + icon: Icon( + Icons.phone, + color: Colors.red, + ), + tooltip: + 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + launch("tel://" + + model + .FindusHospitalModelList[ + index] + .phoneNumber); + }); + }, + ), + ], + ), + ), + ], + ), ), - ), - - - - ], - ), + ], + ), + // Texts('${model.FindusHospitalModelList[index].locationName}'), + Divider( + height: 4.5, + color: Colors.grey[500], + ) + ], ), - - ], - ), - // Texts('${model.FindusHospitalModelList[index].locationName}'), - Divider(height: 4.5,color: Colors.grey[500],) - ], - ), - ), - )), - SizedBox(height: 8,), - Container(width: double.infinity, - height: 100,color: Colors.white, - child: Row( - mainAxisSize:MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceAround, - - children: [ - - IconButton( - icon: new Image.asset('assets/images/new-design/youtube.png'), - iconSize: 70, - tooltip: 'Youtube', - onPressed: () { - setState(() { - - launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); - - }); - }, - ), - IconButton( - icon: new Image.asset('assets/images/new-design/linkedin.png'), - tooltip: 'LinkedIn', - iconSize: 70, - onPressed: () { - setState(() { - - launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); - }); - }, - ), - IconButton( - icon: new Image.asset('assets/images/new-design/twitter.png'), - tooltip: 'Twitter', - iconSize: 70, - onPressed: () { - setState(() { - - launch("https://twitter.com/HMG"); - }); - }, - ), - IconButton( - icon: new Image.asset('assets/images/new-design/facebook.png'), - tooltip: 'facebook', - iconSize: 70, - onPressed: () { - setState(() { - - launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); - }); - }, - ), - ], + ), + )), + SizedBox( + height: 8, ), + Container( + width: double.infinity, + height: 100, + color: Colors.white, + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + IconButton( + icon: new Image.asset( + 'assets/images/new-design/youtube.png'), + iconSize: 70, + tooltip: 'Youtube', + onPressed: () { + setState(() { + launch( + "https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); + }); + }, + ), + IconButton( + icon: new Image.asset( + 'assets/images/new-design/linkedin.png'), + tooltip: 'LinkedIn', + iconSize: 70, + onPressed: () { + setState(() { + launch( + "https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); + }); + }, + ), + IconButton( + icon: new Image.asset( + 'assets/images/new-design/twitter.png'), + tooltip: 'Twitter', + iconSize: 70, + onPressed: () { + setState(() { + launch("https://twitter.com/HMG"); + }); + }, + ), + IconButton( + icon: new Image.asset( + 'assets/images/new-design/facebook.png'), + tooltip: 'facebook', + iconSize: 70, + onPressed: () { + setState(() { + launch( + "https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); + }); + }, + ), + ], + ), ), ], ), ), ), - ), ); - } } diff --git a/lib/pages/ContactUs/findus/pharmacies_page.dart b/lib/pages/ContactUs/findus/pharmacies_page.dart index f127f842..9ade351d 100644 --- a/lib/pages/ContactUs/findus/pharmacies_page.dart +++ b/lib/pages/ContactUs/findus/pharmacies_page.dart @@ -53,19 +53,37 @@ class _PharmaciesPageState extends State { CrossAxisAlignment.center, children: [ InkWell( - onTap:(){ + onTap: () { showDialog( - context: context,builder: (_) => AssetGiffyDialog( - title: Text(model.FindusPharmaciesModelList[index].locationName, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ),image:Image.network(model.FindusPharmaciesModelList[index].projectImageURL.toString(), fit: BoxFit.cover,), - buttonCancelText:Text('cancel') , - // buttonCancelText:Text(model.user.projectID) , - buttonCancelColor: Colors.grey, - onlyCancelButton: true, - - ) ); + context: context, + builder: (_) => + AssetGiffyDialog( + title: Text( + model + .FindusPharmaciesModelList[ + index] + .locationName, + style: TextStyle( + fontSize: 22.0, + fontWeight: + FontWeight + .w600), + ), + image: Image.network( + model + .FindusPharmaciesModelList[ + index] + .projectImageURL + .toString(), + fit: BoxFit.cover, + ), + buttonCancelText: + Text('cancel'), + // buttonCancelText:Text(model.user.projectID) , + buttonCancelColor: + Colors.grey, + onlyCancelButton: true, + )); }, child: Container( width: 70, @@ -82,13 +100,16 @@ class _PharmaciesPageState extends State { margin: EdgeInsets.only( left: 5, right: 5), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ Texts( '${model.FindusPharmaciesModelList[index].locationName}', textAlign: TextAlign.start, ), - SizedBox(height: 4,), + SizedBox( + height: 4, + ), Texts( '${model.FindusPharmaciesModelList[index].cityName}', textAlign: TextAlign.center, @@ -104,8 +125,7 @@ class _PharmaciesPageState extends State { children: [ IconButton( icon: Icon( - Icons - .person_pin_circle_outlined, + Icons.person_pin_circle, color: Colors.red, ), tooltip: @@ -155,7 +175,6 @@ class _PharmaciesPageState extends State { ), ], ), - Divider( height: 4.5, color: Colors.grey[500], From f543126152217317eb318fad4e2ca03487940b47 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 1 Oct 2020 09:26:26 +0300 Subject: [PATCH 17/37] Ambulance Service --- assets/images/covid-car.png | Bin 0 -> 3140 bytes assets/images/covid_bg_transparent.png | Bin 0 -> 11952 bytes assets/images/home_health_care_icon.png | Bin 0 -> 4679 bytes lib/config/config.dart | 4 +- lib/core/model/er/PatientAllPresOrders.dart | 132 ++++++++++++++++++ lib/core/service/er/am_service.dart | 26 +++- .../viewModels/er/am_request_view_model.dart | 45 ++++-- lib/pages/ErService/AmbulanceReq.dart | 15 +- .../ErService/AmbulanceRequestIndex.dart | 59 ++++++++ lib/pages/ErService/BillAmount.dart | 37 +++++ lib/pages/ErService/PickupLocation.dart | 36 +++++ .../ErService/SelectTransportationMethod.dart | 39 ++++++ lib/pages/ErService/Summary.dart | 37 +++++ .../ErService/widgets/StepesWideget.dart | 114 +++++++++++++++ lib/pages/landing/home_page.dart | 77 ++++++++-- 15 files changed, 577 insertions(+), 44 deletions(-) create mode 100644 assets/images/covid-car.png create mode 100644 assets/images/covid_bg_transparent.png create mode 100644 assets/images/home_health_care_icon.png create mode 100644 lib/core/model/er/PatientAllPresOrders.dart create mode 100644 lib/pages/ErService/AmbulanceRequestIndex.dart create mode 100644 lib/pages/ErService/BillAmount.dart create mode 100644 lib/pages/ErService/PickupLocation.dart create mode 100644 lib/pages/ErService/SelectTransportationMethod.dart create mode 100644 lib/pages/ErService/Summary.dart create mode 100644 lib/pages/ErService/widgets/StepesWideget.dart diff --git a/assets/images/covid-car.png b/assets/images/covid-car.png new file mode 100644 index 0000000000000000000000000000000000000000..01090b744bda40c3e6ae3d0b4d9c1f631099bdc3 GIT binary patch literal 3140 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

yfg5XnJb*p@D*Z@fHI*0Y5N;P^-nM5? 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 json) { + iD = json['ID']; + patientID = json['PatientID']; + patientOutSA = json['PatientOutSA']; + isOutPatient = json['IsOutPatient']; + projectID = json['ProjectID']; + nearestProjectID = json['NearestProjectID']; + longitude = json['Longitude']; + latitude = json['Latitude']; + appointmentNo = json['AppointmentNo']; + dischargeID = json['DischargeID']; + lineItemNo = json['LineItemNo']; + status = json['Status']; + description = json['Description']; + descriptionN = json['DescriptionN']; + createdOn = json['CreatedOn']; + serviceID = json['ServiceID']; + createdBy = json['CreatedBy']; + editedOn = json['EditedOn']; + editedBy = json['EditedBy']; + channel = json['Channel']; + clientRequestID = json['ClientRequestID']; + returnedToQueue = json['ReturnedToQueue']; + pickupDateTime = json['PickupDateTime']; + pickupLocationName = json['PickupLocationName']; + dropoffLocationName = json['DropoffLocationName']; + realRRTHaveTransactions = json['RealRRT_HaveTransactions']; + nearestProjectDescription = json['NearestProjectDescription']; + nearestProjectDescriptionN = json['NearestProjectDescriptionN']; + projectDescription = json['ProjectDescription']; + projectDescriptionN = json['ProjectDescriptionN']; + } + + Map toJson() { + final Map data = new Map(); + data['ID'] = this.iD; + data['PatientID'] = this.patientID; + data['PatientOutSA'] = this.patientOutSA; + data['IsOutPatient'] = this.isOutPatient; + data['ProjectID'] = this.projectID; + data['NearestProjectID'] = this.nearestProjectID; + data['Longitude'] = this.longitude; + data['Latitude'] = this.latitude; + data['AppointmentNo'] = this.appointmentNo; + data['DischargeID'] = this.dischargeID; + data['LineItemNo'] = this.lineItemNo; + data['Status'] = this.status; + data['Description'] = this.description; + data['DescriptionN'] = this.descriptionN; + data['CreatedOn'] = this.createdOn; + data['ServiceID'] = this.serviceID; + data['CreatedBy'] = this.createdBy; + data['EditedOn'] = this.editedOn; + data['EditedBy'] = this.editedBy; + data['Channel'] = this.channel; + data['ClientRequestID'] = this.clientRequestID; + data['ReturnedToQueue'] = this.returnedToQueue; + data['PickupDateTime'] = this.pickupDateTime; + data['PickupLocationName'] = this.pickupLocationName; + data['DropoffLocationName'] = this.dropoffLocationName; + data['RealRRT_HaveTransactions'] = this.realRRTHaveTransactions; + data['NearestProjectDescription'] = this.nearestProjectDescription; + data['NearestProjectDescriptionN'] = this.nearestProjectDescriptionN; + data['ProjectDescription'] = this.projectDescription; + data['ProjectDescriptionN'] = this.projectDescriptionN; + return data; + } +} diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 181ad37b..016cc2df 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -1,25 +1,39 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import '../base_service.dart'; class AmService extends BaseService { - List AmModelList = List(); - Map body = Map(); + List amModelList = List(); + List patientAllPresOrdersList = List(); Future getAllTransportationOrders() async { hasError = false; - await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { - AmModelList.clear(); + amModelList.clear(); response['AmModelList'].forEach((vital) { - AmModelList.add( + amModelList.add( PatientER_RRT_GetAllTransportationMethodListModel.fromJson(vital)); }); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: body); + }, body: Map()); + } + + Future getPatientAllPresOrdersList() async { + hasError = false; + await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, + onSuccess: (dynamic response, int statusCode) { + patientAllPresOrdersList.clear(); + response['PatientER_GetPatientAllPresOrdersList'].forEach((vital) { + patientAllPresOrdersList.add(PatientAllPresOrders.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: Map()); } } diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index db1acbf0..6e08d984 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -1,32 +1,49 @@ - import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/service/er/am_service.dart'; +import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import '../base_view_model.dart'; import '../../../locator.dart'; -class AmRequestViewModel extends BaseViewModel{ +class AmRequestViewModel extends BaseViewModel { + AmService _amService = locator(); + HospitalService _hospitalService = locator(); + List + get amRequestModeList => _amService.amModelList; - AmService _amService = locator(); + List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; - List get AmRequestModeList=> - _amService.AmModelList; - getAmRequestOrders({int id, int projectID}) async { + Future getAmRequestOrders() async { setState(ViewState.Busy); + await _amService.getAllTransportationOrders(); + if (_amService.hasError) { + error = _amService.error; + setState(ViewState.Error); + } else + getHospitals(); + } + Future getHospitals() async { + setState(ViewState.Busy); + await _hospitalService.getHospitals(); + if (_hospitalService.hasError) { + error = _hospitalService.error; + setState(ViewState.Error); + } else + getPatientAllPresOrdersList(); + } - await _amService.getAllTransportationOrders(); - - if ( _amService.hasError) { - error = _amService.error; + Future getPatientAllPresOrdersList()async{ + setState(ViewState.Busy); + await _amService.getPatientAllPresOrdersList(); + if (_hospitalService.hasError) { + error = _hospitalService.error; setState(ViewState.Error); } else setState(ViewState.Idle); } - - - -} \ No newline at end of file +} diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart index 9c4dfa29..8e9f54bc 100644 --- a/lib/pages/ErService/AmbulanceReq.dart +++ b/lib/pages/ErService/AmbulanceReq.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_history_page.dart'; @@ -9,6 +10,8 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'AmbulanceRequestIndex.dart'; + class AmbulanceReq extends StatefulWidget { @override _AmbulanceReqState createState() => _AmbulanceReqState(); @@ -30,8 +33,8 @@ class _AmbulanceReqState extends State } @override Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getPrescriptions(), + return BaseView( + // onModelReady: (model) => model.getAmRequestOrders(), builder: (_, model, widget) => AppScaffold( isShowAppBar: true, appBarTitle: "Ambulance Request", @@ -106,12 +109,8 @@ class _AmbulanceReqState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - PrescriptionsPage( - prescriptionsViewModel: model, - ), - PrescriptionsHistoryPage( - prescriptionsViewModel: model, - ) + AmbulanceRequestIndex(), + Container() ], ), ) diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndex.dart new file mode 100644 index 00000000..863d3b57 --- /dev/null +++ b/lib/pages/ErService/AmbulanceRequestIndex.dart @@ -0,0 +1,59 @@ +import 'package:diplomaticquarterapp/pages/ErService/widgets/StepesWideget.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; + +import 'BillAmount.dart'; +import 'PickupLocation.dart'; +import 'SelectTransportationMethod.dart'; +import 'Summary.dart'; + +class AmbulanceRequestIndex extends StatefulWidget { + @override + _AmbulanceRequestIndexState createState() => _AmbulanceRequestIndexState(); +} + +class _AmbulanceRequestIndexState extends State { + + int currentIndex = 0; + PageController pageController; + + _changeCurrentTab(int tab) { + setState(() { + currentIndex = tab; + }); + pageController.animateToPage(tab, duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart); + } + + @override + void initState() { + super.initState(); + pageController = new PageController(); + + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + body: Column( + children: [ + SizedBox(height: 80,), + Container( + margin: EdgeInsets.only(left: 12,right: 12), + child: StepesWidget(index: currentIndex,changeCurrentTab: _changeCurrentTab,)), + Expanded( + child: PageView( + physics: NeverScrollableScrollPhysics(), + controller: pageController, + children: [ + SelectTransportationMethod(changeCurrentTab: _changeCurrentTab,), + PickupLocation(changeCurrentTab: _changeCurrentTab,), + BillAmount(changeCurrentTab: _changeCurrentTab,), + Summary(changeCurrentTab: _changeCurrentTab,), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/BillAmount.dart new file mode 100644 index 00000000..86b0d181 --- /dev/null +++ b/lib/pages/ErService/BillAmount.dart @@ -0,0 +1,37 @@ +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class BillAmount extends StatefulWidget { + final Function changeCurrentTab; + + BillAmount({Key key, this.changeCurrentTab}); + + @override + _BillAmountState createState() => _BillAmountState(); +} + +class _BillAmountState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('BillAmount 3'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: ()=> widget.changeCurrentTab(3), + label: 'Next', + + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart new file mode 100644 index 00000000..bdb1ea52 --- /dev/null +++ b/lib/pages/ErService/PickupLocation.dart @@ -0,0 +1,36 @@ +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class PickupLocation extends StatefulWidget { + final Function changeCurrentTab; + + PickupLocation({Key key, this.changeCurrentTab}); + + @override + _PickupLocationState createState() => _PickupLocationState(); +} + +class _PickupLocationState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('PickupLocation 2'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: ()=> widget.changeCurrentTab(2), + label: 'Next', + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart new file mode 100644 index 00000000..a5fcbb75 --- /dev/null +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -0,0 +1,39 @@ +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class SelectTransportationMethod extends StatefulWidget { + final Function changeCurrentTab; + + SelectTransportationMethod({Key key, this.changeCurrentTab}); + + @override + _SelectTransportationMethodState createState() => + _SelectTransportationMethodState(); +} + +class _SelectTransportationMethodState + extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('SelectTransportationMethod 1'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: ()=> widget.changeCurrentTab(1), + label: 'Next', + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/Summary.dart new file mode 100644 index 00000000..4f792b68 --- /dev/null +++ b/lib/pages/ErService/Summary.dart @@ -0,0 +1,37 @@ +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class Summary extends StatefulWidget { + final Function changeCurrentTab; + + Summary({Key key, this.changeCurrentTab}); + + @override + _SummaryState createState() => _SummaryState(); +} + +class _SummaryState extends State

{ + @override + Widget build(BuildContext context) { + return Column( + children: [ + Texts('Summary 4'), + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + label: 'Next', + + // onTap: ()=> widget.changeCurrentTab(2), + ), + ) + ], + ); + } +} diff --git a/lib/pages/ErService/widgets/StepesWideget.dart b/lib/pages/ErService/widgets/StepesWideget.dart new file mode 100644 index 00000000..3f6b57a4 --- /dev/null +++ b/lib/pages/ErService/widgets/StepesWideget.dart @@ -0,0 +1,114 @@ +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class StepesWidget extends StatelessWidget { + final int index; + final Function changeCurrentTab; + + StepesWidget({Key key, this.index, this.changeCurrentTab}); + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Container( + height: 50, + width: MediaQuery.of(context).size.width, + color: Colors.transparent, + child: Center( + child: Divider( + color: Colors.black, + height: 3, + thickness: 3, + ), + ), + ), + Positioned( + top: 10, + left: 0, + child: InkWell( + onTap: () => changeCurrentTab(0), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 0 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '1', + color: index == 0 ? Colors.white:Colors.grey[800] , + ), + ), + ), + ), + ), + Positioned( + top: 10, + left: MediaQuery.of(context).size.width *0.3, + child: InkWell( + onTap: () => changeCurrentTab(1), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 1 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '2', + color: index == 1 ? Colors.white:Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + left: MediaQuery.of(context).size.width *0.6, + child: InkWell( + onTap: () => changeCurrentTab(2), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 2 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '3', + color: index == 2 ? Colors.white: Colors.grey[800] , + ), + ), + ), + ), + ), + Positioned( + top: 10, + right: 0, + child: InkWell( + onTap: () => changeCurrentTab(3), + child: Container( + width: 25, + height: 25, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: index == 3 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '4', + color: index == 3 ? Colors.white:Colors.grey[800] , + ), + ), + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 59c0a167..b811ef8f 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -64,6 +64,68 @@ class _HomePageState extends State { MediaQuery.of(context).size.width * 0.8, child: Row( children: [ + Expanded( + child: Container( + height: 110, + // padding: EdgeInsets.all(15), + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + color: + Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all( + Radius.circular(5), + ), + image: DecorationImage( + image: ExactAssetImage( + 'assets/images/covid_bg_transparent.png'), + fit: BoxFit.cover), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox(height: 8,), + Texts('COVID-19 TEST',color: Colors.white,), + SizedBox(height: 15,), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Image.asset( + 'assets/images/covid-car.png',width: 55,height: 55,fit: BoxFit.cover, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Texts('Drove-Thru',color: Colors.white,fontSize: 14,), + SizedBox(height: 4,), + Container( + margin: EdgeInsets.all(2), + width: 90, + height: 30, + decoration: BoxDecoration( + color: Hexcolor('#D81A2E'), + shape: BoxShape.rectangle, + border: Border.all( + color: Colors.transparent, + width: 0.5), + borderRadius: BorderRadius.all( + Radius.circular(5)), + ), + child: Center( + child: Texts('BOOK Now', + color: Colors.white, + fontSize: 12, + ), + ), + ) + ], + ) + ], + ) + ], + ) + ), + ), Expanded( child: InkWell( onTap: () => Navigator.push(context, @@ -83,19 +145,6 @@ class _HomePageState extends State { ), ), ), - Expanded( - child: Container( - height: 110, - padding: EdgeInsets.all(15), - margin: EdgeInsets.all(5), - decoration: BoxDecoration( - color: - Colors.white.withOpacity(0.3), - borderRadius: BorderRadius.all( - Radius.circular(5))), - // child: Image.asset('assets/images/livecare_white_logo.png',), - ), - ), ], ), ), @@ -359,7 +408,7 @@ class _HomePageState extends State { child: Column( children: [ Image.asset( - 'assets/images/Dr_Schedule_report.png', + 'assets/images/home_health_care_icon.png', width: 50, height: 50, ), From c7d396875e13240b960309d6f02d8f70d834de4d Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 4 Oct 2020 10:06:01 +0300 Subject: [PATCH 18/37] Ambulance Service steps --- lib/core/model/er/PatientER.dart | 200 +++++++++++++ ..._all_transportation_method_list_model.dart | 10 +- lib/core/service/er/am_service.dart | 7 +- .../viewModels/er/am_request_view_model.dart | 2 +- lib/pages/ErService/AmbulanceReq.dart | 5 +- .../ErService/AmbulanceRequestIndex.dart | 49 +++- lib/pages/ErService/BillAmount.dart | 6 +- lib/pages/ErService/PickupLocation.dart | 7 +- .../ErService/SelectTransportationMethod.dart | 272 ++++++++++++++++-- lib/pages/ErService/Summary.dart | 6 +- .../{StepesWideget.dart => StepsWidget.dart} | 55 ++-- 11 files changed, 552 insertions(+), 67 deletions(-) create mode 100644 lib/core/model/er/PatientER.dart rename lib/pages/ErService/widgets/{StepesWideget.dart => StepsWidget.dart} (55%) diff --git a/lib/core/model/er/PatientER.dart b/lib/core/model/er/PatientER.dart new file mode 100644 index 00000000..9c2d660e --- /dev/null +++ b/lib/core/model/er/PatientER.dart @@ -0,0 +1,200 @@ +class PatientER { + double versionID; + int channel; + int languageID; + String iPAdress; + String generalid; + int patientOutSA; + String sessionID; + bool isDentalAllowedBackend; + int deviceTypeID; + int patientID; + String tokenID; + int patientTypeID; + int patientType; + int orderServiceID; + String patientIdentificationID; + int direction; + bool haveAppointment; + int tripType; + int pickupUrgency; + int pickupSpot; + String pickupDateTime; + int transportationMethodId; + int selectedAmbulate; + String requesterNote; + int requesterFileNo; + String requesterMobileNo; + bool requesterIsOutSA; + int isOutPatient; + String pickupLocationName; + String dropoffLocationName; + int projectID; + int createdBy; + int lineItemNo; + int cost; + double vAT; + double totalPrice; + String pickupLocationLattitude; + String pickupLocationLongitude; + String dropoffLocationLattitude; + String dropoffLocationLongitude; + String latitude; + String longitude; + String appointmentNo; + dynamic appointmentClinicName; + dynamic appointmentDoctorName; + dynamic appointmentBranch; + dynamic appointmentTime; + + PatientER( + {this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType, + this.orderServiceID = 4, + this.patientIdentificationID, + this.direction, + this.haveAppointment, + this.tripType, + this.pickupUrgency, + this.pickupSpot, + this.pickupDateTime, + this.transportationMethodId, + this.selectedAmbulate, + this.requesterNote, + this.requesterFileNo, + this.requesterMobileNo, + this.requesterIsOutSA, + this.isOutPatient, + this.pickupLocationName, + this.dropoffLocationName, + this.projectID, + this.createdBy, + this.lineItemNo, + this.cost, + this.vAT, + this.totalPrice, + this.pickupLocationLattitude, + this.pickupLocationLongitude, + this.dropoffLocationLattitude, + this.dropoffLocationLongitude, + this.latitude, + this.longitude, + this.appointmentNo, + this.appointmentClinicName, + this.appointmentDoctorName, + this.appointmentBranch, + this.appointmentTime}); + + PatientER.fromJson(Map json) { + versionID = json['VersionID']; + channel = json['Channel']; + languageID = json['LanguageID']; + iPAdress = json['IPAdress']; + generalid = json['generalid']; + patientOutSA = json['PatientOutSA']; + sessionID = json['SessionID']; + isDentalAllowedBackend = json['isDentalAllowedBackend']; + deviceTypeID = json['DeviceTypeID']; + patientID = json['PatientID']; + tokenID = json['TokenID']; + patientTypeID = json['PatientTypeID']; + patientType = json['PatientType']; + orderServiceID = json['OrderServiceID']; + patientIdentificationID = json['PatientIdentificationID']; + direction = json['Direction']; + haveAppointment = json['HaveAppointment']; + tripType = json['TripType']; + pickupUrgency = json['PickupUrgency']; + pickupSpot = json['PickupSpot']; + pickupDateTime = json['PickupDateTime']; + transportationMethodId = json['TransportationMethodId']; + selectedAmbulate = json['SelectedAmbulate']; + requesterNote = json['RequesterNote']; + requesterFileNo = json['RequesterFileNo']; + requesterMobileNo = json['RequesterMobileNo']; + requesterIsOutSA = json['RequesterIsOutSA']; + isOutPatient = json['IsOutPatient']; + pickupLocationName = json['PickupLocationName']; + dropoffLocationName = json['DropoffLocationName']; + projectID = json['ProjectID']; + createdBy = json['CreatedBy']; + lineItemNo = json['LineItemNo']; + cost = json['Cost']; + vAT = json['VAT']; + totalPrice = json['TotalPrice']; + pickupLocationLattitude = json['PickupLocationLattitude']; + pickupLocationLongitude = json['PickupLocationLongitude']; + dropoffLocationLattitude = json['DropoffLocationLattitude']; + dropoffLocationLongitude = json['DropoffLocationLongitude']; + latitude = json['Latitude']; + longitude = json['Longitude']; + appointmentNo = json['AppointmentNo']; + appointmentClinicName = json['AppointmentClinicName']; + appointmentDoctorName = json['AppointmentDoctorName']; + appointmentBranch = json['AppointmentBranch']; + appointmentTime = json['AppointmentTime']; + } + + Map toJson() { + final Map data = new Map(); + data['VersionID'] = this.versionID; + data['Channel'] = this.channel; + data['LanguageID'] = this.languageID; + data['IPAdress'] = this.iPAdress; + data['generalid'] = this.generalid; + data['PatientOutSA'] = this.patientOutSA; + data['SessionID'] = this.sessionID; + data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; + data['DeviceTypeID'] = this.deviceTypeID; + data['PatientID'] = this.patientID; + data['TokenID'] = this.tokenID; + data['PatientTypeID'] = this.patientTypeID; + data['PatientType'] = this.patientType; + data['OrderServiceID'] = this.orderServiceID; + data['PatientIdentificationID'] = this.patientIdentificationID; + data['Direction'] = this.direction; + data['HaveAppointment'] = this.haveAppointment; + data['TripType'] = this.tripType; + data['PickupUrgency'] = this.pickupUrgency; + data['PickupSpot'] = this.pickupSpot; + data['PickupDateTime'] = this.pickupDateTime; + data['TransportationMethodId'] = this.transportationMethodId; + data['SelectedAmbulate'] = this.selectedAmbulate; + data['RequesterNote'] = this.requesterNote; + data['RequesterFileNo'] = this.requesterFileNo; + data['RequesterMobileNo'] = this.requesterMobileNo; + data['RequesterIsOutSA'] = this.requesterIsOutSA; + data['IsOutPatient'] = this.isOutPatient; + data['PickupLocationName'] = this.pickupLocationName; + data['DropoffLocationName'] = this.dropoffLocationName; + data['ProjectID'] = this.projectID; + data['CreatedBy'] = this.createdBy; + data['LineItemNo'] = this.lineItemNo; + data['Cost'] = this.cost; + data['VAT'] = this.vAT; + data['TotalPrice'] = this.totalPrice; + data['PickupLocationLattitude'] = this.pickupLocationLattitude; + data['PickupLocationLongitude'] = this.pickupLocationLongitude; + data['DropoffLocationLattitude'] = this.dropoffLocationLattitude; + data['DropoffLocationLongitude'] = this.dropoffLocationLongitude; + data['Latitude'] = this.latitude; + data['Longitude'] = this.longitude; + data['AppointmentNo'] = this.appointmentNo; + data['AppointmentClinicName'] = this.appointmentClinicName; + data['AppointmentDoctorName'] = this.appointmentDoctorName; + data['AppointmentBranch'] = this.appointmentBranch; + data['AppointmentTime'] = this.appointmentTime; + return data; + } +} diff --git a/lib/core/model/er/get_all_transportation_method_list_model.dart b/lib/core/model/er/get_all_transportation_method_list_model.dart index 3402873e..b149e296 100644 --- a/lib/core/model/er/get_all_transportation_method_list_model.dart +++ b/lib/core/model/er/get_all_transportation_method_list_model.dart @@ -1,5 +1,5 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -class PatientER_RRT_GetAllTransportationMethodListModel { +class PatientERTransportationMethod { int id; DateTime createDate; DateTime lastEditDate; @@ -9,15 +9,15 @@ class PatientER_RRT_GetAllTransportationMethodListModel { String title; String titleAR; int price; - Null isDefault; + dynamic isDefault; int visibility; - Null durationId; + dynamic durationId; String description; String descriptionAR; int totalPrice; int vAT; - PatientER_RRT_GetAllTransportationMethodListModel( + PatientERTransportationMethod( { this.id, this.createDate, @@ -36,7 +36,7 @@ class PatientER_RRT_GetAllTransportationMethodListModel { this.totalPrice, this.vAT}); - PatientER_RRT_GetAllTransportationMethodListModel.fromJson( + PatientERTransportationMethod.fromJson( Map json) { id = json['Id']; createDate = DateUtil.convertStringToDate(json['CreateDate']); diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 016cc2df..6c9704ae 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -5,17 +5,20 @@ import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method import '../base_service.dart'; class AmService extends BaseService { - List amModelList = List(); + List amModelList = List(); List patientAllPresOrdersList = List(); Future getAllTransportationOrders() async { hasError = false; + Map body = Map(); + body['isDentalAllowedBackend']= false; + body['IdentificationNo'] = user.patientIdentificationNo; await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { amModelList.clear(); response['AmModelList'].forEach((vital) { amModelList.add( - PatientER_RRT_GetAllTransportationMethodListModel.fromJson(vital)); + PatientERTransportationMethod.fromJson(vital)); }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index 6e08d984..9045ee90 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -11,7 +11,7 @@ class AmRequestViewModel extends BaseViewModel { AmService _amService = locator(); HospitalService _hospitalService = locator(); - List + List get amRequestModeList => _amService.amModelList; List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart index 8e9f54bc..c50093be 100644 --- a/lib/pages/ErService/AmbulanceReq.dart +++ b/lib/pages/ErService/AmbulanceReq.dart @@ -34,10 +34,11 @@ class _AmbulanceReqState extends State @override Widget build(BuildContext context) { return BaseView( - // onModelReady: (model) => model.getAmRequestOrders(), + onModelReady: (model) => model.getAmRequestOrders(), builder: (_, model, widget) => AppScaffold( isShowAppBar: true, appBarTitle: "Ambulance Request", + baseViewModel: model, body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( @@ -109,7 +110,7 @@ class _AmbulanceReqState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - AmbulanceRequestIndex(), + AmbulanceRequestIndex(amRequestViewModel: model,), Container() ], ), diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndex.dart index 863d3b57..46d803cd 100644 --- a/lib/pages/ErService/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndex.dart @@ -1,4 +1,6 @@ -import 'package:diplomaticquarterapp/pages/ErService/widgets/StepesWideget.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/StepsWidget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; @@ -8,27 +10,31 @@ import 'SelectTransportationMethod.dart'; import 'Summary.dart'; class AmbulanceRequestIndex extends StatefulWidget { + final AmRequestViewModel amRequestViewModel; + + AmbulanceRequestIndex({Key key, this.amRequestViewModel}); + @override _AmbulanceRequestIndexState createState() => _AmbulanceRequestIndexState(); } class _AmbulanceRequestIndexState extends State { - int currentIndex = 0; PageController pageController; + PatientER _patientER = PatientER(); _changeCurrentTab(int tab) { setState(() { currentIndex = tab; }); - pageController.animateToPage(tab, duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart); + pageController.animateToPage(tab, + duration: Duration(milliseconds: 800), curve: Curves.easeOutQuart); } @override void initState() { super.initState(); pageController = new PageController(); - } @override @@ -36,19 +42,40 @@ class _AmbulanceRequestIndexState extends State { return AppScaffold( body: Column( children: [ - SizedBox(height: 80,), + SizedBox( + height: 80, + ), Container( - margin: EdgeInsets.only(left: 12,right: 12), - child: StepesWidget(index: currentIndex,changeCurrentTab: _changeCurrentTab,)), + margin: EdgeInsets.only(left: 12, right: 12), + child: StepsWidget( + index: currentIndex, + changeCurrentTab: _changeCurrentTab, + )), Expanded( child: PageView( physics: NeverScrollableScrollPhysics(), controller: pageController, children: [ - SelectTransportationMethod(changeCurrentTab: _changeCurrentTab,), - PickupLocation(changeCurrentTab: _changeCurrentTab,), - BillAmount(changeCurrentTab: _changeCurrentTab,), - Summary(changeCurrentTab: _changeCurrentTab,), + SelectTransportationMethod( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), + PickupLocation( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), + BillAmount( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), + Summary( + changeCurrentTab: _changeCurrentTab, + patientER: _patientER, + amRequestViewModel: widget.amRequestViewModel, + ), ], ), ), diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/BillAmount.dart index 86b0d181..3dca195f 100644 --- a/lib/pages/ErService/BillAmount.dart +++ b/lib/pages/ErService/BillAmount.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -5,8 +7,10 @@ import 'package:flutter/material.dart'; class BillAmount extends StatefulWidget { final Function changeCurrentTab; + final PatientER patientER; + final AmRequestViewModel amRequestViewModel; - BillAmount({Key key, this.changeCurrentTab}); + BillAmount({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); @override _BillAmountState createState() => _BillAmountState(); diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart index bdb1ea52..2b44d4cb 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/PickupLocation.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -5,8 +7,9 @@ import 'package:flutter/material.dart'; class PickupLocation extends StatefulWidget { final Function changeCurrentTab; - - PickupLocation({Key key, this.changeCurrentTab}); + final PatientER patientER; + PickupLocation({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); + final AmRequestViewModel amRequestViewModel; @override _PickupLocationState createState() => _PickupLocationState(); diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart index a5fcbb75..d8148b3c 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -1,13 +1,24 @@ -import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +enum Direction { ToHospital, FromHospital } +enum Way { OneWay, TwoWays } + class SelectTransportationMethod extends StatefulWidget { final Function changeCurrentTab; + final PatientER patientER; + final AmRequestViewModel amRequestViewModel; - SelectTransportationMethod({Key key, this.changeCurrentTab}); + SelectTransportationMethod( + {Key key, + this.changeCurrentTab, + this.patientER, + this.amRequestViewModel}); @override _SelectTransportationMethodState createState() => @@ -16,24 +27,251 @@ class SelectTransportationMethod extends StatefulWidget { class _SelectTransportationMethodState extends State { + PatientERTransportationMethod _erTransportationMethod = + PatientERTransportationMethod(); + Direction _direction = Direction.FromHospital; + Way _way = Way.OneWay; + @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('SelectTransportationMethod 1'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: ()=> widget.changeCurrentTab(1), - label: 'Next', + return Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + Texts('Select Transportation Method'), + ...List.generate( + widget.amRequestViewModel.amRequestModeList.length, + (index) => InkWell( + onTap: () { + setState(() { + _erTransportationMethod = + widget.amRequestViewModel.amRequestModeList[index]; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + Expanded( + flex: 3, + child: ListTile( + title: Text(widget + .amRequestViewModel.amRequestModeList[index].title), + leading: Radio( + value: widget + .amRequestViewModel.amRequestModeList[index], + groupValue: _erTransportationMethod, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _erTransportationMethod = value; + }); + }, + ), + ), + ), + Expanded( + flex: 1, + child: Texts( + 'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), + ) + ], + ), + ), + ), + ), + SizedBox( + height: 12, + ), + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.ToHospital; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('To Hospital'), + leading: Radio( + value: Direction.ToHospital, + groupValue: _direction, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _direction = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.FromHospital; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('To Hospital'), + leading: Radio( + value: Direction.FromHospital, + groupValue: _direction, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _direction = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + ], + ), + if (_direction == Direction.ToHospital) + Column( + children: [ + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.OneWay; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('One Way'), + leading: Radio( + value: Way.OneWay, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.TwoWays; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + ListTile( + title: Text('Two Ways'), + leading: Radio( + value: Way.TwoWays, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, + ), + ), + ], + ), + ), + ), + ), + ], + ), + ], + ), + SizedBox( + height: 15, ), - ) - ], + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () { + setState(() { + widget.patientER.direction = _direction == Direction.ToHospital ? 1 : 2; + widget.patientER.tripType = _way == Way.TwoWays ? 1 : 2; + widget.patientER.selectedAmbulate = (widget.amRequestViewModel.amRequestModeList.indexOf(_erTransportationMethod)+1); + widget.changeCurrentTab(1); + }); + }, + label: 'Next', + ), + ) + ], + ), ); } } diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/Summary.dart index 4f792b68..13beee8c 100644 --- a/lib/pages/ErService/Summary.dart +++ b/lib/pages/ErService/Summary.dart @@ -1,3 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; @@ -5,8 +7,10 @@ import 'package:flutter/material.dart'; class Summary extends StatefulWidget { final Function changeCurrentTab; + final PatientER patientER; + final AmRequestViewModel amRequestViewModel; - Summary({Key key, this.changeCurrentTab}); + Summary({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); @override _SummaryState createState() => _SummaryState(); diff --git a/lib/pages/ErService/widgets/StepesWideget.dart b/lib/pages/ErService/widgets/StepsWidget.dart similarity index 55% rename from lib/pages/ErService/widgets/StepesWideget.dart rename to lib/pages/ErService/widgets/StepsWidget.dart index 3f6b57a4..1e4077cb 100644 --- a/lib/pages/ErService/widgets/StepesWideget.dart +++ b/lib/pages/ErService/widgets/StepsWidget.dart @@ -2,11 +2,11 @@ import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -class StepesWidget extends StatelessWidget { +class StepsWidget extends StatelessWidget { final int index; final Function changeCurrentTab; - StepesWidget({Key key, this.index, this.changeCurrentTab}); + StepsWidget({Key key, this.index, this.changeCurrentTab}); @override Widget build(BuildContext context) { @@ -18,9 +18,9 @@ class StepesWidget extends StatelessWidget { color: Colors.transparent, child: Center( child: Divider( - color: Colors.black, - height: 3, - thickness: 3, + color: Colors.grey, + height: 0.75, + thickness: 0.75, ), ), ), @@ -30,16 +30,17 @@ class StepesWidget extends StatelessWidget { child: InkWell( onTap: () => changeCurrentTab(0), child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( + border: index > 0 ? null:Border.all(color: Colors.black,width: 0.75), shape: BoxShape.circle, - color: index == 0 ? Colors.grey[800] : Colors.white, + color: index == 0 ? Colors.grey[800] : index > 0 ?Colors.green: Colors.white, ), child: Center( child: Texts( '1', - color: index == 0 ? Colors.white:Colors.grey[800] , + color: index == 0 ? Colors.white : index > 0 ?Colors.white: Colors.grey[800], ), ), ), @@ -47,20 +48,21 @@ class StepesWidget extends StatelessWidget { ), Positioned( top: 10, - left: MediaQuery.of(context).size.width *0.3, + left: MediaQuery.of(context).size.width * 0.3, child: InkWell( - onTap: () => changeCurrentTab(1), + onTap: () => index >= 2 ? changeCurrentTab(1) : null, child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( + border: index > 1 ? null:Border.all(color: Colors.black,width: 0.75), shape: BoxShape.circle, - color: index == 1 ? Colors.grey[800] : Colors.white, + color: index == 1 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, ), child: Center( child: Texts( '2', - color: index == 1 ? Colors.white:Colors.grey[800], + color: index == 1? Colors.white : index > 1 ?Colors.white: Colors.grey[800], ), ), ), @@ -68,20 +70,21 @@ class StepesWidget extends StatelessWidget { ), Positioned( top: 10, - left: MediaQuery.of(context).size.width *0.6, + left: MediaQuery.of(context).size.width * 0.6, child: InkWell( - onTap: () => changeCurrentTab(2), + onTap: () => index >= 3 ? changeCurrentTab(2) : null, child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( shape: BoxShape.circle, - color: index == 2 ? Colors.grey[800] : Colors.white, + border: index > 2 ? null:Border.all(color: Colors.black,width: 0.75), + color: index == 2 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, ), child: Center( child: Texts( '3', - color: index == 2 ? Colors.white: Colors.grey[800] , + color: index == 2? Colors.white : index > 1 ?Colors.white: Colors.grey[800], ), ), ), @@ -91,18 +94,20 @@ class StepesWidget extends StatelessWidget { top: 10, right: 0, child: InkWell( - onTap: () => changeCurrentTab(3), + onTap: () => index == 2 ?changeCurrentTab(3):null, child: Container( - width: 25, - height: 25, + width: 35, + height: 35, decoration: BoxDecoration( + border: Border.all(color: Colors.black,width: 0.75), + shape: BoxShape.circle, color: index == 3 ? Colors.grey[800] : Colors.white, ), child: Center( child: Texts( '4', - color: index == 3 ? Colors.white:Colors.grey[800] , + color: index == 3 ? Colors.white : Colors.grey[800], ), ), ), From 5c859034d610a6b87c69e682bcd9d9ad04640009 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 4 Oct 2020 12:58:43 +0300 Subject: [PATCH 19/37] voice search --- assets/images/CloseIcon.png | Bin 0 -> 1285 bytes assets/images/book.svg | 1 + assets/images/robort_svg.svg | 82 ++++++++++++++++ assets/images/symptom.svg | 30 ++++++ .../all_habib_medical_service_page.dart | 6 +- lib/pages/BookAppointment/DoctorProfile.dart | 20 ++-- lib/pages/BookAppointment/SearchResults.dart | 16 +-- .../components/SearchByClinic.dart | 2 +- lib/pages/landing/landing_page.dart | 21 +++- lib/pages/symptom-checker/symtom-checker.dart | 43 ++++++++ lib/routes.dart | 5 +- lib/widgets/others/app_scaffold_widget.dart | 76 ++++++++------- .../others/floating_button_search.dart | 92 ++++++++++++++++-- lib/widgets/robo-search/search.dart | 24 ++--- pubspec.yaml | 4 +- 15 files changed, 342 insertions(+), 80 deletions(-) create mode 100644 assets/images/CloseIcon.png create mode 100644 assets/images/book.svg create mode 100644 assets/images/robort_svg.svg create mode 100644 assets/images/symptom.svg create mode 100644 lib/pages/symptom-checker/symtom-checker.dart diff --git a/assets/images/CloseIcon.png b/assets/images/CloseIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..b8e68fea9bd77bfc622d9fc0036ea59eb7f2742e GIT binary patch literal 1285 zcmV+g1^W7lP)V;^%5U;ff5j^(Ux zf0>!x+1b6B^Ye2^OM|L02LN@t=IE;XzW#tNR2N^Hj(w2UJthi-09XLfple>SsUgAH z!JkP2N(9KDY9NF)0C>#a_snVUojV@e|`(8jsUGzCx*p_RAkA04PrAT-a&`_QVQC7MhI zD$r#pZv4o3$8@z~I`)pgjW7$@$aPnE6zDn^fY9(%L|5^vObO|PF1XB~Y8(_Skj80o ze8FkLLdZHU6AbWM$%KV)TF2~zdvN_u4Thh;!k>Mcqe-|{GobwNKKwmBh2LA-ENzl1 zUS@pNdxw_&SYTA1Sa9?08~62%<|_PpwyF&UVcdGR4OeDo-QTa*YH;-8702xYEqA&D zNy+!7w$L&>7%1!jb_6@5DnATV<>`tGn@KIN85al*KP(Hv=q7&YKna53Dd;^#&C}d# zWFZZ%mN90aj|bhnER-l1sI$F&t$XzeL&gY*#nmdt3XB=LP~u=5J%0(OU%s*2Gid?{ zn}q-a6cHH5A1=(gb>%LU&-52>WBfSgZauDJ2rFpx$q0t0=nqlqWogiuu_Dng|qQ5e9KC95bk3z320DGMkFgk>vIltd<7 zKOb3aS+a(DB`Q@WCeaxvSC*`)lSF~YPRDZqrRy#-CsBIP$xT$UWF}R-pvpSZ=q73z zSxO&Q-r0e0Wvv-NaT$0(*yhMsH{nXu;-KJnG0NQ$-~yo{%_okw!xny3bCW12qDi8F z4!un@;}bI$E5U_d?EJWN6SW{H$L~LKR_{hP=PzZRaP1}YN||UeT&v>=mNG{LZ$FSc z?@mri9n-N#RZD*^vq2lvE|Vsz{}VtcxL$_cL!LVR!$@I!%r3*G8T5p@A4pjG&$1IB z=UNXssul=@cKdD?7{;#Y*ny!Tbb-ip>=qrdD4K>*#r?PyGpm53jumyVC=v+ySffBt znsJ-|W7kw^j^B#=+!UxOa;#Nok(nB5799pC9xdt6&|Wf@!0Vq2LWbsyKD zYAjGHZKVvR6PA~#i2ZRHWHD=WCG|{zLs}GWb3aQY=?ALRDF9mxhm!g< \ No newline at end of file diff --git a/assets/images/robort_svg.svg b/assets/images/robort_svg.svg new file mode 100644 index 00000000..07d3d4b4 --- /dev/null +++ b/assets/images/robort_svg.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/symptom.svg b/assets/images/symptom.svg new file mode 100644 index 00000000..aa670da1 --- /dev/null +++ b/assets/images/symptom.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart index 616b5fd8..24df0bf6 100644 --- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart +++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart @@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dar import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; +import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -199,9 +200,8 @@ class _AllHabibMedicalServiceState extends State { title: TranslationBase.of(context).todoList, ), ServicesContainer( - onTap: () => Navigator.push( - context, - FadePage(), + onTap: () => Navigator.of(context).pushNamed( + SYMPTOM_CHECKER, ), imageLocation: 'assets/images/new-design/body_icon.png', title: 'Symptom Checker'), diff --git a/lib/pages/BookAppointment/DoctorProfile.dart b/lib/pages/BookAppointment/DoctorProfile.dart index d3b6fc7c..c51ce5a6 100644 --- a/lib/pages/BookAppointment/DoctorProfile.dart +++ b/lib/pages/BookAppointment/DoctorProfile.dart @@ -42,16 +42,16 @@ class _DoctorProfileState extends State vsync: this, initialIndex: widget.isOpenAppt == true ? 1 : 0); - event.controller.stream.listen((p) { - if (p['clinic_id'] != null && - p['doctor_id'] != null && - p['project_id'] != null) { - setState(() { - // need to take the data from here - // dropdownValue = p['clinic_id']; - }); - } - }); + // event.controller.stream.listen((p) { + // if (p['clinic_id'] != null && + // p['doctor_id'] != null && + // p['project_id'] != null) { + // setState(() { + // // need to take the data from here + // // dropdownValue = p['clinic_id']; + // }); + // } + // }); _tabController = new TabController(length: 2, vsync: this); widget.authUser = new AuthenticatedUser(); getPatientData(); diff --git a/lib/pages/BookAppointment/SearchResults.dart b/lib/pages/BookAppointment/SearchResults.dart index 2b5fac17..e9767072 100644 --- a/lib/pages/BookAppointment/SearchResults.dart +++ b/lib/pages/BookAppointment/SearchResults.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DoctorView.dart'; -import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; +// import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -18,12 +18,12 @@ class SearchResults extends StatefulWidget { } class _SearchResultsState extends State { - var event = RobotProvider(); + // var event = RobotProvider(); List tempList = []; @override void initState() { - event.controller.stream.listen((p) {}); + // event.controller.stream.listen((p) {}); super.initState(); } @@ -41,9 +41,13 @@ class _SearchResultsState extends State { ...List.generate( widget.patientDoctorAppointmentListHospital.length, (index) => AppExpandableNotifier( - title: widget - .patientDoctorAppointmentListHospital[index].filterName + " - " +widget - .patientDoctorAppointmentListHospital[index].distanceInKMs + " " + TranslationBase.of(context).km, + title: widget.patientDoctorAppointmentListHospital[index] + .filterName + + " - " + + widget.patientDoctorAppointmentListHospital[index] + .distanceInKMs + + " " + + TranslationBase.of(context).km, bodyWidget: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index e844d4d1..9d833db1 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -26,7 +26,7 @@ class _SearchByClinicState extends State { bool nearestAppo = false; String dropdownValue; String projectDropdownValue; - var event = RobotProvider(); + // var event = RobotProvider(); List clinicsList = []; List projectsList = []; bool isMobileAppDentalAllow = false; diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index ad8ae6a5..abe89a30 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -12,6 +12,7 @@ import 'package:diplomaticquarterapp/pages/livecare/incoming_call.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; +import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; @@ -19,6 +20,7 @@ import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:permission_handler/permission_handler.dart'; import 'home_page.dart'; @@ -38,7 +40,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { ProjectViewModel projectProvider; final FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); final authService = new AuthProvider(); - + var event = RobotProvider(); bool isPageNavigated = false; _changeCurrentTab(int tab) { @@ -280,6 +282,19 @@ class _LandingPageState extends State with WidgetsBindingObserver { ); }, ), + actions: [ + IconButton( + iconSize: 50, + icon: SvgPicture.asset( + 'assets/images/robort_svg.svg', + height: 100, + width: 100, + ), + onPressed: () { + triggerRobot(); + } //do something, + ) + ], centerTitle: true, ), drawer: SafeArea(child: AppDrawer()), @@ -306,6 +321,10 @@ class _LandingPageState extends State with WidgetsBindingObserver { ); } + triggerRobot() { + // event.setValue({"doctor_id": '40036'}); + } + getText(currentTab) { switch (currentTab) { case 0: diff --git a/lib/pages/symptom-checker/symtom-checker.dart b/lib/pages/symptom-checker/symtom-checker.dart new file mode 100644 index 00000000..f7475abf --- /dev/null +++ b/lib/pages/symptom-checker/symtom-checker.dart @@ -0,0 +1,43 @@ +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class SymptomChecker extends StatelessWidget { + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Symptom Checker', + body: Center( + child: SvgPicture.string( + ''' + + + + + + + + + + + + + + + + + + + + + + + + + + +'''))); + } +} diff --git a/lib/routes.dart b/lib/routes.dart index 27161669..8d109983 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/pages/login/login.dart'; import 'package:diplomaticquarterapp/pages/login/register.dart'; import 'package:diplomaticquarterapp/pages/family/add-family_type.dart'; import 'package:diplomaticquarterapp/pages/family/add-family-member.dart'; +import 'package:diplomaticquarterapp/pages/symptom-checker/symtom-checker.dart'; const String INIT_ROUTE = '/'; const String HOME = '/'; @@ -25,6 +26,7 @@ const String MY_FAMILIY = 'my-family'; const String ADD_FAMILY_MEMBER_TYPE = 'add-family-member-type'; const String ADD_FAMILY_MEMBER = 'add-family-member'; const String LIVE_CARE = 'live-care'; +const String SYMPTOM_CHECKER = 'symptom-checker'; var routes = { HOME: (_) => LandingPage(), WELCOME_LOGIN: (_) => WelcomeLogin(), @@ -37,5 +39,6 @@ var routes = { MY_FAMILIY: (_) => MyFamily(), ADD_FAMILY_MEMBER_TYPE: (_) => AddFamilyMemberType(), ADD_FAMILY_MEMBER: (_) => AddMember(), - LIVE_CARE: (_) => LiveCareHome() + LIVE_CARE: (_) => LiveCareHome(), + SYMPTOM_CHECKER: (_) => SymptomChecker() }; diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index eda27361..0c9c12ed 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/robosearch.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/search.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; @@ -41,44 +42,44 @@ class AppScaffold extends StatelessWidget { AppGlobal.context = context; return Scaffold( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - appBar: isShowAppBar - ? AppBar( - elevation: 0, - backgroundColor: Theme.of(context).appBarTheme.color, - textTheme: TextTheme( - headline6: TextStyle( - color: Colors.white, fontWeight: FontWeight.bold), - ), - title: Text(appBarTitle.toUpperCase()), - leading: Builder( - builder: (BuildContext context) { - return ArrowBack(); + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + appBar: isShowAppBar + ? AppBar( + elevation: 0, + backgroundColor: Theme.of(context).appBarTheme.color, + textTheme: TextTheme( + headline6: + TextStyle(color: Colors.white, fontWeight: FontWeight.bold), + ), + title: Text(appBarTitle.toUpperCase()), + leading: Builder( + builder: (BuildContext context) { + return ArrowBack(); + }, + ), + centerTitle: true, + actions: [ + IconButton( + icon: Icon(FontAwesomeIcons.home), + color: Colors.white, + onPressed: () { + Navigator.of(context).popUntil(ModalRoute.withName('/')); }, ), - centerTitle: true, - actions: [ - IconButton( - icon: Icon(FontAwesomeIcons.home), - color: Colors.white, - onPressed: () { - Navigator.of(context).popUntil(ModalRoute.withName('/')); - }, - ), - ], - ) - : null, - body: baseViewModel != null - ? NetworkBaseView( - child: buildBodyWidget(), - baseViewModel: baseViewModel, - ) - : buildBodyWidget(), - bottomSheet: bottomSheet, - bottomNavigationBar: - this.isBottomBar == true ? BottomBarSearch() : SizedBox() - //floatingActionButton: FloatingSearchButton(), - ); + ], + ) + : null, + body: baseViewModel != null + ? NetworkBaseView( + child: buildBodyWidget(), + baseViewModel: baseViewModel, + ) + : buildBodyWidget(), + bottomSheet: bottomSheet, + // bottomNavigationBar: + // this.isBottomBar == true ? BottomBarSearch() : SizedBox() + // floatingActionButton: FloatingSearchButton(), + ); } buildAppLoaderWidget(bool isLoading) { @@ -86,6 +87,7 @@ class AppScaffold extends StatelessWidget { } buildBodyWidget() { - return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]); + // return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]); + return Stack(children: [body, FloatingSearchButton()]); } } diff --git a/lib/widgets/others/floating_button_search.dart b/lib/widgets/others/floating_button_search.dart index 34b1240e..37a3e3c0 100644 --- a/lib/widgets/others/floating_button_search.dart +++ b/lib/widgets/others/floating_button_search.dart @@ -1,17 +1,93 @@ import 'package:diplomaticquarterapp/widgets/robo-search/robosearch.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/search.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class FloatingSearchButton extends StatefulWidget { + @override + _FloatingSearchButton createState() => _FloatingSearchButton(); +} + +class _FloatingSearchButton extends State + with TickerProviderStateMixin { + Offset position = Offset(30.0, 40.0); + AlignmentDirectional _ironManAlignment = AlignmentDirectional(0.0, 0.7); + + @override + void initState() { + // TODO: implement initState + super.initState(); + } -class FloatingSearchButton extends StatelessWidget { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.only(bottom: 80), - child: FloatingActionButton( - child: Icon(Icons.mic), - onPressed: () { - SearchBot(); - }, + return Positioned( + left: position.dx, + top: position.dy, + child: Draggable( + feedback: Container(child: getStack()), + child: Container( + child: AnimatedContainer( + duration: Duration(seconds: 2), + alignment: _ironManAlignment, + child: getStack(), + )), + childWhenDragging: Container( + color: Colors.transparent, + ), + onDragEnd: (details) { + setState(() { + position = details.offset; + }); + })); + + // Draggable( + // feedback: getStack(), + // childWhenDragging: Container(), + // child: getStack(), + // onDragEnd: (drag) { + // setState(() { + // top = top + drag.offset.dy < 0 ? 0 : top + drag.offset.dy; + // left = left + drag.offset.dx < 0 ? 0 : left + drag.offset.dx; + // }); + // }); + } + + Widget getStack() { + return Container( + height: 150, + width: 150, + child: Stack( + children: [ + Positioned( + top: 10, + right: 0, + child: GestureDetector( + onTap: () { + print("hi"); + setState(() { + _ironManAlignment = AlignmentDirectional(0.0, -0.20); + }); + }, // handle your image tap here + child: Image.asset( + 'assets/images/CloseIcon.png', + fit: BoxFit.cover, // this is the solution for border + width: 30.0, + height: 30.0, + )), + ), + GestureDetector( + onTap: () { + // animationController.forward(); + }, // handle your image tap here + child: SvgPicture.asset('assets/images/robort_svg.svg')) + // new RawMaterialButton( + // // shape: new CircleBorder(), + // elevation: 1.0, + // child: SvgPicture.asset('assets/images/robort_svg.svg'), + // onPressed: () {}, + // ), + ], )); } diff --git a/lib/widgets/robo-search/search.dart b/lib/widgets/robo-search/search.dart index b6426b6d..c1ce33d1 100644 --- a/lib/widgets/robo-search/search.dart +++ b/lib/widgets/robo-search/search.dart @@ -30,7 +30,7 @@ class SearchBot with ChangeNotifier { } SearchProvider searchProvider = new SearchProvider(); - RobotProvider eventProvider = RobotProvider(); + // RobotProvider eventProvider = RobotProvider(); bool isLoading = false; bool isError = false; final SpeechToText speech = SpeechToText(); @@ -203,19 +203,19 @@ class SearchBot with ChangeNotifier { type: 1, ))); break; - case '103': - eventProvider.setValue({"clinic_id": understand}); - break; - - case '104': - eventProvider.setValue({"project_id": understand}); - break; - case '105': - eventProvider.setValue({"doctor_id": understand}); - break; + // case '103': + // eventProvider.setValue({"clinic_id": understand}); + // break; + + // case '104': + // eventProvider.setValue({"project_id": understand}); + // break; + // case '105': + // eventProvider.setValue({"doctor_id": understand}); + // break; default: { - eventProvider.setValue({"doctor_id": '40036'}); + //eventProvider.setValue({"doctor_id": '40036'}); //eventProvider.setValue(); // if (result['CommandNumber'] == '0') { // searchProvider.setData(understand); diff --git a/pubspec.yaml b/pubspec.yaml index 9b9588fd..75d9b1fd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -146,7 +146,9 @@ flutter: - assets/images/login/ - assets/json/ - assets/sounds/ - + - assets/images/symptom.svg + - assets/images/robort_svg.svg + fonts: - family: WorkSans From 3d6eafe4731c72a7a24dd0ee32373aa308c8c97b Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 4 Oct 2020 15:05:10 +0300 Subject: [PATCH 20/37] Ambulance Service first step --- ..._all_transportation_method_list_model.dart | 14 +- lib/core/service/er/am_service.dart | 7 +- .../ErService/AmbulanceRequestIndex.dart | 1 + lib/pages/ErService/PickupLocation.dart | 277 +++++++++++- .../ErService/SelectTransportationMethod.dart | 408 +++++++++--------- 5 files changed, 484 insertions(+), 223 deletions(-) diff --git a/lib/core/model/er/get_all_transportation_method_list_model.dart b/lib/core/model/er/get_all_transportation_method_list_model.dart index b149e296..ebc9caf7 100644 --- a/lib/core/model/er/get_all_transportation_method_list_model.dart +++ b/lib/core/model/er/get_all_transportation_method_list_model.dart @@ -1,21 +1,21 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class PatientERTransportationMethod { - int id; + dynamic id; DateTime createDate; DateTime lastEditDate; - int createdBy; - int lastEditBy; + dynamic createdBy; + dynamic lastEditBy; bool isActive; String title; String titleAR; - int price; + dynamic price; dynamic isDefault; - int visibility; + dynamic visibility; dynamic durationId; String description; String descriptionAR; - int totalPrice; - int vAT; + dynamic totalPrice; + dynamic vAT; PatientERTransportationMethod( { diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 6c9704ae..b6a91871 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -16,14 +16,13 @@ class AmService extends BaseService { await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { amModelList.clear(); - response['AmModelList'].forEach((vital) { - amModelList.add( - PatientERTransportationMethod.fromJson(vital)); + response['PatientER_RRT_GetAllTransportationMethodList'].forEach((vital) { + amModelList.add(PatientERTransportationMethod.fromJson(vital)); }); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: Map()); + }, body: body); } Future getPatientAllPresOrdersList() async { diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndex.dart index 46d803cd..16d07b88 100644 --- a/lib/pages/ErService/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndex.dart @@ -56,6 +56,7 @@ class _AmbulanceRequestIndexState extends State { physics: NeverScrollableScrollPhysics(), controller: pageController, children: [ + //Container(), SelectTransportationMethod( changeCurrentTab: _changeCurrentTab, patientER: _patientER, diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart index 2b44d4cb..46a8928b 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/PickupLocation.dart @@ -4,11 +4,20 @@ import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +enum HaveAppointment { YES, NO } class PickupLocation extends StatefulWidget { final Function changeCurrentTab; final PatientER patientER; - PickupLocation({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); + + PickupLocation( + {Key key, + this.changeCurrentTab, + this.patientER, + this.amRequestViewModel}); + final AmRequestViewModel amRequestViewModel; @override @@ -16,24 +25,258 @@ class PickupLocation extends StatefulWidget { } class _PickupLocationState extends State { + bool _isInsideHome = false; + HaveAppointment _haveAppointment = HaveAppointment.NO; + @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('PickupLocation 2'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: ()=> widget.changeCurrentTab(2), - label: 'Next', - ), - ) - ], + return SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (widget.patientER.direction == 1) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Pickup Location'), + SizedBox( + height: 15, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Select From Map'), + Icon( + FontAwesomeIcons.mapMarkerAlt, + size: 24, + color: Colors.black, + ) + ], + ), + ), + SizedBox( + height: 12, + ), + Texts('Pickup Spot'), + SizedBox( + height: 5, + ), + InkWell( + onTap: () { + setState(() { + _isInsideHome = !_isInsideHome; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Texts('Inside Home'), + leading: Checkbox( + activeColor: Colors.red[800], + value: _isInsideHome, + onChanged: (value) { + setState(() { + _isInsideHome = value; + }); + }, + ), + ), + ), + ), + SizedBox( + height: 12, + ), + Texts('Do you have an appointment ?'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _haveAppointment = HaveAppointment.YES; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Yes'), + leading: Radio( + value: HaveAppointment.YES, + groupValue: _haveAppointment, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _haveAppointment = value; + }); + }, + ), + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _haveAppointment = HaveAppointment.NO; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('No'), + leading: Radio( + value: HaveAppointment.NO, + groupValue: _haveAppointment, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _haveAppointment = value; + }); + }, + ), + ), + ), + ), + ), + ], + ), + SizedBox( + height: 12, + ), + Texts('Drop off Location'), + SizedBox( + height: 8, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Pickup Location'), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), + ), + ], + ), + if (widget.patientER.direction == 2) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Pickup Location'), + SizedBox( + height: 15, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Pickup Location'), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), + ), + SizedBox( + height: 12, + ), + Texts('Drop off Location'), + SizedBox( + height: 8, + ), + Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Select From Map'), + Icon( + FontAwesomeIcons.mapMarkerAlt, + size: 24, + color: Colors.black, + ) + ], + ), + ), + ], + ), + //TODO show dialog projects + + SizedBox( + height: 45, + ), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () => widget.changeCurrentTab(2), + label: 'Next', + ), + ) + ], + ), + ), ); } } diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart index d8148b3c..38eec5b4 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -32,89 +32,108 @@ class _SelectTransportationMethodState Direction _direction = Direction.FromHospital; Way _way = Way.OneWay; + @override + void initState() { + super.initState(); + if (widget.patientER.direction != null) { + _direction = widget.patientER.direction == 1 + ? Direction.ToHospital + : Direction.FromHospital; + _way = widget.patientER.tripType == 1 ? Way.OneWay : Way.TwoWays; + _erTransportationMethod = widget.amRequestViewModel + .amRequestModeList[(widget.patientER.selectedAmbulate - 1)]; + } + } + @override Widget build(BuildContext context) { - return Container( - margin: EdgeInsets.only(left: 12, right: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 12, - ), - Texts('Select Transportation Method'), - ...List.generate( - widget.amRequestViewModel.amRequestModeList.length, - (index) => InkWell( - onTap: () { - setState(() { - _erTransportationMethod = - widget.amRequestViewModel.amRequestModeList[index]; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - Expanded( - flex: 3, - child: ListTile( - title: Text(widget - .amRequestViewModel.amRequestModeList[index].title), - leading: Radio( - value: widget - .amRequestViewModel.amRequestModeList[index], - groupValue: _erTransportationMethod, - activeColor: Colors.red[800], - onChanged: (value) { - setState(() { - _erTransportationMethod = value; - }); - }, + return SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + Texts('Select Transportation Method'), + ...List.generate( + widget.amRequestViewModel.amRequestModeList.length, + (index) => InkWell( + onTap: () { + setState(() { + _erTransportationMethod = + widget.amRequestViewModel.amRequestModeList[index]; + }); + }, + child: Container( + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + children: [ + Expanded( + flex: 3, + child: ListTile( + title: Text(widget.amRequestViewModel + .amRequestModeList[index].title), + leading: Radio( + value: widget + .amRequestViewModel.amRequestModeList[index], + groupValue: _erTransportationMethod, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _erTransportationMethod = value; + }); + }, + ), ), ), - ), - Expanded( - flex: 1, - child: Texts( - 'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), - ) - ], + Expanded( + flex: 1, + child: Texts( + 'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), + ) + ], + ), ), ), ), - ), - SizedBox( - height: 12, - ), - Texts('Select Direction'), - SizedBox( - height: 5, - ), - Row( - children: [ - Expanded( - child: InkWell( - onTap: () { - setState(() { - _direction = Direction.ToHospital; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( + SizedBox( + height: 12, + ), + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Container( + width: double.maxFinite, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.ToHospital; + }); + }, + child: Container( + width: double.maxFinite, + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( title: Text('To Hospital'), leading: Radio( value: Direction.ToHospital, @@ -127,29 +146,26 @@ class _SelectTransportationMethodState }, ), ), - ], + ), ), ), - ), - ), - Expanded( - child: InkWell( - onTap: () { - setState(() { - _direction = Direction.FromHospital; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( - title: Text('To Hospital'), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _direction = Direction.FromHospital; + }); + }, + child: Container( + width: double.maxFinite, + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Form Hospital'), leading: Radio( value: Direction.FromHospital, groupValue: _direction, @@ -161,116 +177,118 @@ class _SelectTransportationMethodState }, ), ), - ], + ), ), ), - ), + ], ), - ], - ), - if (_direction == Direction.ToHospital) - Column( - children: [ - Texts('Select Direction'), - SizedBox( - height: 5, - ), - Row( - children: [ - Expanded( - child: InkWell( - onTap: () { - setState(() { - _way = Way.OneWay; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( - title: Text('One Way'), - leading: Radio( - value: Way.OneWay, - groupValue: _way, - activeColor: Colors.red[800], - onChanged: (value) { - setState(() { - _way = value; - }); - }, - ), + ), + if (_direction == Direction.ToHospital) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, + ), + Texts('Select Direction'), + SizedBox( + height: 5, + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.OneWay; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('One Way'), + leading: Radio( + value: Way.OneWay, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, ), - ], + ), ), ), ), - ), - Expanded( - child: InkWell( - onTap: () { - setState(() { - _way = Way.TwoWays; - }); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - children: [ - ListTile( - title: Text('Two Ways'), - leading: Radio( - value: Way.TwoWays, - groupValue: _way, - activeColor: Colors.red[800], - onChanged: (value) { - setState(() { - _way = value; - }); - }, - ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _way = Way.TwoWays; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Two Ways'), + leading: Radio( + value: Way.TwoWays, + groupValue: _way, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _way = value; + }); + }, ), - ], + ), ), ), ), - ), - ], - ), - ], - ), - SizedBox( - height: 15, - ), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child: SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: () { - setState(() { - widget.patientER.direction = _direction == Direction.ToHospital ? 1 : 2; - widget.patientER.tripType = _way == Way.TwoWays ? 1 : 2; - widget.patientER.selectedAmbulate = (widget.amRequestViewModel.amRequestModeList.indexOf(_erTransportationMethod)+1); - widget.changeCurrentTab(1); - }); - }, - label: 'Next', + ], + ), + ], + ), + SizedBox( + height: 15, ), - ) - ], + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () { + setState(() { + widget.patientER.direction = + _direction == Direction.ToHospital ? 1 : 2; + widget.patientER.tripType = _way == Way.TwoWays ? 2 : 1; + widget.patientER.selectedAmbulate = (widget + .amRequestViewModel.amRequestModeList + .indexOf(_erTransportationMethod) + + 1); + widget.changeCurrentTab(1); + }); + }, + label: 'Next', + ), + ) + ], + ), ), ); } From 227731f8f8c3ac9f9f39aee709acf5a80a0a35a7 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 6 Oct 2020 12:16:51 +0300 Subject: [PATCH 21/37] Merge --- lib/config/config.dart | 125 ++-- lib/pages/landing/landing_page.dart | 11 +- lib/pages/login/confirm-login.dart | 69 +- lib/pages/login/login.dart | 37 +- lib/pages/login/welcome.dart | 2 +- .../medical/ask_doctor/doctor_response.dart | 4 +- lib/uitl/LocalNotification.dart | 62 +- lib/widgets/mobile-no/mobile_no.dart | 2 + .../others/floating_button_search.dart | 671 ++++++++++++++++-- lib/widgets/otp/sms-popup.dart | 24 +- lib/widgets/robo-search/robosearch.dart | 44 +- pubspec.yaml | 2 +- 12 files changed, 821 insertions(+), 232 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 02b58b34..e6e40d80 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -6,7 +6,7 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart'; const MAX_SMALL_SCREEN = 660; -const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; const GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; @@ -29,8 +29,10 @@ const GET_PRESCRIPTION_REPORT_ENH = ///Lab Order const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders'; -const GET_Patient_LAB_SPECIAL_RESULT = 'Services/Patients.svc/REST/GetPatientLabSpecialResults'; -const GET_Patient_LAB_RESULT = '/Services/Patients.svc/REST/GetPatientLabResults'; +const GET_Patient_LAB_SPECIAL_RESULT = + 'Services/Patients.svc/REST/GetPatientLabSpecialResults'; +const GET_Patient_LAB_RESULT = + '/Services/Patients.svc/REST/GetPatientLabResults'; /// const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders'; @@ -43,8 +45,7 @@ const SEND_RAD_REPORT_EMAIL = ///Feedback const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList'; const GET_STATUS_FOR_COCO = 'Services/COCWS.svc/REST/GetStatusforCOC'; -const GET_PATIENT_AppointmentHistory = - 'Services' +const GET_PATIENT_AppointmentHistory = 'Services' '/Doctors.svc/REST/PateintHasAppoimentHistory'; ///VITAL SIGN @@ -52,31 +53,26 @@ const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign'; ///Er Nearest -const GET_NEAREST_HOSPITAL= +const GET_NEAREST_HOSPITAL = 'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime'; ///Er Nearest -const GET_AMBULANCE_REQUEST= +const GET_AMBULANCE_REQUEST = 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod'; - ///FindUs -const GET_FINDUS_REQUEST= - 'Services/Lists.svc/REST/Get_HMG_Locations'; - +const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations'; ///LiveChat -const GET_LIVECHAT_REQUEST= - 'Services/Patients.svc/REST/GetPatientICProjects'; +const GET_LIVECHAT_REQUEST = 'Services/Patients.svc/REST/GetPatientICProjects'; + ///BloodDenote -const GET_CITIES_REQUEST= - 'Services/Lists.svc/REST/GetAllCities'; +const GET_CITIES_REQUEST = 'Services/Lists.svc/REST/GetAllCities'; ///BloodDetails -const GET_BLOOD_REQUEST= +const GET_BLOOD_REQUEST = 'services/PatientVarification.svc/REST/BloodDonation_GetBloodGroupDetails'; - ///Reports const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo'; const INSERT_REQUEST_FOR_MEDICAL_REPORT = @@ -104,7 +100,8 @@ const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject'; const GET_DOCTORS_LIST_URL = "Services/Doctors.svc/REST/SearchDoctorsByTime"; //URL to dental doctors list -const GET_DENTAL_DOCTORS_LIST_URL = "Services/Doctors.svc/REST/Dental_DoctorChiefComplaintMapping"; +const GET_DENTAL_DOCTORS_LIST_URL = + "Services/Doctors.svc/REST/Dental_DoctorChiefComplaintMapping"; //URL to get doctor free slots const GET_DOCTOR_FREE_SLOTS = "Services/Doctors.svc/REST/GetDoctorFreeSlots"; @@ -175,16 +172,16 @@ const CANCEL_LIVECARE_REQUEST = const SEND_LIVECARE_INVOICE_EMAIL = 'Services/Notifications.svc/REST/SendInvoiceForLiveCare'; - -const GET_USER_TERMS ='/Services/Patients.svc/REST/GetUserTermsAndConditions'; -const UPDATE_HEALTH_TERMS ='/services/Patients.svc/REST/UpdatePateintHealthSummaryReport'; +const GET_USER_TERMS = '/Services/Patients.svc/REST/GetUserTermsAndConditions'; +const UPDATE_HEALTH_TERMS = + '/services/Patients.svc/REST/UpdatePateintHealthSummaryReport'; //URL to get medicine and pharmacies list const CHANNEL = 3; const GENERAL_ID = 'Cs2020@2016\$2958'; const IP_ADDRESS = '10.20.10.20'; const VERSION_ID = 5.6; -const SETUP_ID = '91877'; +const SETUP_ID = '91877'; const LANGUAGE = 2; const PATIENT_OUT_SA = 0; const SESSION_ID = 'TMRhVmkGhOsvamErw'; @@ -212,54 +209,66 @@ const GET_PATIENT_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave'; const SendSickLeaveEmail = 'Services/Notifications.svc/REST/SendSickLeaveEmail'; -const GET_PATIENT_AdVANCE_BALANCE_AMOUNT = 'Services/Patients.svc/REST/GetPatientAdvanceBalanceAmount'; -const GET_PATIENT_INFO_BY_ID = 'Services/Doctors.svc/REST/GetPatientInfoByPatientID'; -const GET_PATIENT_INFO_BY_ID_AND_MOBILE_NUMBER = 'Services/Patients.svc/REST/AP_GetPatientInfoByPatientIDandMobileNumber'; -const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment'; -const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment'; +const GET_PATIENT_AdVANCE_BALANCE_AMOUNT = + 'Services/Patients.svc/REST/GetPatientAdvanceBalanceAmount'; +const GET_PATIENT_INFO_BY_ID = + 'Services/Doctors.svc/REST/GetPatientInfoByPatientID'; +const GET_PATIENT_INFO_BY_ID_AND_MOBILE_NUMBER = + 'Services/Patients.svc/REST/AP_GetPatientInfoByPatientIDandMobileNumber'; +const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = + 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment'; +const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = + 'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment'; ///My Trackers -const GET_DIABETIC_RESULT_AVERAGE='Services/Patients.svc/REST/Patient_GetDiabeticResultAverage'; -const GET_DIABTEC_RESULT='Services/Patients.svc/REST/Patient_GetDiabtecResults'; -const ADD_DIABTEC_RESULT='Services/Patients.svc/REST/Patient_AddDiabtecResult'; - - -const GET_BLOOD_PRESSURE_RESULT_AVERAGE='Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage'; -const GET_BLOOD_PRESSURE_RESULT='Services/Patients.svc/REST/Patient_GetBloodPressureResult'; -const ADD_BLOOD_PRESSURE_RESULT='Services/Patients.svc/REST/Patient_AddBloodPressureResult'; - -const GET_WEIGHT_PRESSURE_RESULT_AVERAGE='Services/Patients.svc/REST/Patient_GetWeightMeasurementResultAverage'; -const GET_WEIGHT_PRESSURE_RESULT='Services/Patients.svc/REST/Patient_GetWeightMeasurementResult'; -const ADD_WEIGHT_PRESSURE_RESULT='Services/Patients.svc/REST/Patient_AddWeightMeasurementResult'; - - -const ADD_ACTIVE_PRESCRIPTIONS_REPORT_BY_PATIENT_ID='Services/Patients.svc/Rest/GetActivePrescriptionReportByPatientID'; - -const GET_CALL_INFO_HOURS_RESULT = 'Services/Doctors.svc/REST/GetCallInfoHoursResult'; -const GET_CALL_REQUEST_TYPE_LOV = 'Services/Doctors.svc/REST/GetCallRequestType_LOV'; +const GET_DIABETIC_RESULT_AVERAGE = + 'Services/Patients.svc/REST/Patient_GetDiabeticResultAverage'; +const GET_DIABTEC_RESULT = + 'Services/Patients.svc/REST/Patient_GetDiabtecResults'; +const ADD_DIABTEC_RESULT = + 'Services/Patients.svc/REST/Patient_AddDiabtecResult'; + +const GET_BLOOD_PRESSURE_RESULT_AVERAGE = + 'Services/Patients.svc/REST/Patient_GetBloodPressureResultAverage'; +const GET_BLOOD_PRESSURE_RESULT = + 'Services/Patients.svc/REST/Patient_GetBloodPressureResult'; +const ADD_BLOOD_PRESSURE_RESULT = + 'Services/Patients.svc/REST/Patient_AddBloodPressureResult'; + +const GET_WEIGHT_PRESSURE_RESULT_AVERAGE = + 'Services/Patients.svc/REST/Patient_GetWeightMeasurementResultAverage'; +const GET_WEIGHT_PRESSURE_RESULT = + 'Services/Patients.svc/REST/Patient_GetWeightMeasurementResult'; +const ADD_WEIGHT_PRESSURE_RESULT = + 'Services/Patients.svc/REST/Patient_AddWeightMeasurementResult'; + +const ADD_ACTIVE_PRESCRIPTIONS_REPORT_BY_PATIENT_ID = + 'Services/Patients.svc/Rest/GetActivePrescriptionReportByPatientID'; + +const GET_CALL_INFO_HOURS_RESULT = + 'Services/Doctors.svc/REST/GetCallInfoHoursResult'; +const GET_CALL_REQUEST_TYPE_LOV = + 'Services/Doctors.svc/REST/GetCallRequestType_LOV'; const GET_DOCTOR_RESPONSE = 'Services/Patients.svc/REST/GetDoctorResponse'; const UPDATE_READ_STATUS = 'Services/Patients.svc/REST/UpdateReadStatus'; const INSERT_CALL_INFO = 'Services/Doctors.svc/REST/InsertCallInfo'; const GET_PATIENT_ALLERGIES = 'Services/Patients.svc/REST/GetPatientAllergies'; - - - - // H2O -const H2O_GET_USER_PROGRESS = "Services/H2ORemainder.svc/REST/H2O_GetUserProgress"; -const H2O_INSERT_USER_ACTIVITY="Services/H2ORemainder.svc/REST/H2O_InsertUserActivity"; - - - - +const H2O_GET_USER_PROGRESS = + "Services/H2ORemainder.svc/REST/H2O_GetUserProgress"; +const H2O_INSERT_USER_ACTIVITY = + "Services/H2ORemainder.svc/REST/H2O_InsertUserActivity"; //E_Referral Services -const GET_ALL_RELATIONSHIP_TYPES = "Services/Patients.svc/REST/GetAllRelationshipTypes"; -const SEND_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/SendActivationCodeForEReferral'; -const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL = 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral'; +const GET_ALL_RELATIONSHIP_TYPES = + "Services/Patients.svc/REST/GetAllRelationshipTypes"; +const SEND_ACTIVATION_CODE_FOR_E_REFERRAL = + 'Services/Authentication.svc/REST/SendActivationCodeForEReferral'; +const CHECK_ACTIVATION_CODE_FOR_E_REFERRAL = + 'Services/Authentication.svc/REST/CheckActivationCodeForEReferral'; const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities'; const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral"; const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals"; diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 0fdb57ff..23d1645c 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -347,12 +347,9 @@ class _LandingPageState extends State with WidgetsBindingObserver { ), actions: [ IconButton( - iconSize: 50, - icon: SvgPicture.asset( - 'assets/images/robort_svg.svg', - height: 100, - width: 100, - ), + iconSize: 70, + icon: SvgPicture.asset('assets/images/robort_svg.svg', + height: 100, width: 100, fit: BoxFit.cover), onPressed: () { triggerRobot(); } //do something, @@ -385,7 +382,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { } triggerRobot() { - // event.setValue({"doctor_id": '40036'}); + event.setValue({"isRobot": 'true'}); } getText(currentTab) { diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ac36c7d6..cc3ed1e8 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -21,7 +21,7 @@ import 'package:diplomaticquarterapp/routes.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; import 'package:local_auth/local_auth.dart'; - +import 'package:smart_progress_bar/smart_progress_bar.dart'; class ConfirmLogin extends StatefulWidget { @override _ConfirmLogin createState() => _ConfirmLogin(); @@ -74,8 +74,7 @@ class _ConfirmLogin extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).confirm, isShowAppBar: true, - body: isLoading == false - ? SingleChildScrollView( + body: SingleChildScrollView( child: Container( padding: EdgeInsets.all(20), height: SizeConfig.realScreenHeight * .9, @@ -101,11 +100,11 @@ class _ConfirmLogin extends State { .welcomeBack + ' ' + user.name, - fontSize: SizeConfig.textMultiplier * 4, + fontSize: SizeConfig.textMultiplier * 3.5, ), AppText( TranslationBase.of(context).accountInfo, - fontSize: SizeConfig.textMultiplier * 3, + fontSize: SizeConfig.textMultiplier * 2.5, ), Card( color: Colors.grey[300], @@ -250,7 +249,7 @@ class _ConfirmLogin extends State { )) ], ))) - : AppCircularProgressIndicator()); + ); } Future _getAvailableBiometrics() async { @@ -328,18 +327,25 @@ class _ConfirmLogin extends State { { if (value['IsAuthenticated']) {this.checkActivationCode()} } - }); + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } sendActivationCode(type) { var request = this.getCommonRequest(); - loading(true); + // loading(true); this.authService.sendActivationCode(request).then((result) => { if (result != null && result['isSMSSent'] == true) {loading(false), this.startSMSService(type)} else {loading(false)} - }); + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + // SMSOTP.showLoadingDialog(context, false), } startSMSService(type) { @@ -405,7 +411,10 @@ class _ConfirmLogin extends State { // // this.cs.presentAlert(result.ErrorEndUserMessage); // } } - }); + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));; } setUser() async {} @@ -512,7 +521,10 @@ class _ConfirmLogin extends State { AppToast.showErrorToast(message: result); }), } - }); + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));; } checkIfUserAgreedBefore(CheckActivationCode result) { @@ -525,42 +537,15 @@ class _ConfirmLogin extends State { } insertIMEI() { - authService.insertDeviceImei(selectedOption).then((value) => {goToHome()}); + authService.insertDeviceImei(selectedOption).then((value) => {goToHome()}).catchError((err) { + print(err); + }); } goToHome() { // authService.insertDeviceImei().then((value) => print(value)); Navigator.of(context).pushNamed(HOME); - // const request = new LoginRequest(); - // if (this.loginType === AuthenticationService.IDENTIFCIATION_LOGIN_TYPE) { - // request.PatientID = 0; - // } else { - // request.PatientID = Number(this.id); - // } - // this.newRating(request); - // } - // public newRating(request: any) { - // this.authService - // .checkIfRated( - // request, - // () => { - // this.gotoHome(); - // }, - // this.ts.trPK("general", "retry") - // ) - // .subscribe((result: CheckUserRatingResponse) => { - // if (this.cs.validResponse(result)) { - // this.cs.sharedService.setSharedData(result, AuthenticationService.SURVEY_DATA); - // if (result.IsLastAppoitmentRatedList.length === 0) { - // this.cs.openHome(); - // } else { - // this.ProjectID = result.IsLastAppoitmentRatedList[0].ProjectID; - // this.AppointmentNo = result.IsLastAppoitmentRatedList[0].AppointmentNo; - // this.cs.sharedService.setSharedData(true, "ratePage"); - // this.showRateModal(); - // } - // } - // }); + } loading(flag) { diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 146d47bc..1fa0f042 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -21,7 +21,7 @@ import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - +import 'package:smart_progress_bar/smart_progress_bar.dart'; class Login extends StatefulWidget { @override _Login createState() => _Login(); @@ -57,9 +57,7 @@ class _Login extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).login, isShowAppBar: true, - body: isLoading == true - ? AppCircularProgressIndicator() - : SingleChildScrollView( + body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30), @@ -84,6 +82,7 @@ class _Login extends State { onCountryChange: (value) => countryCode = value), Container( child: TextFields( + fontWeight: FontWeight.normal, controller: nationalIDorFile, onChanged: (value) => {validateForm()}, prefixIcon: Icon( @@ -146,7 +145,7 @@ class _Login extends State { } checkUserAuthentication() { - showLoader(true); + // showLoader(true); var request = CheckPatientAuthenticationReq(); request.isRegister = false; request.patientMobileNumber = int.parse(mobileNo); @@ -162,7 +161,7 @@ class _Login extends State { } sharedPref.setObject(REGISTER_DATA_FOR_REGISTER, request); authService.checkPatientAuthentication(request).then((value) => { - showLoader(false), + //showLoader(false), if (value['isSMSSent']) { sharedPref.setString(LOGIN_TOKEN_ID, value['LogInTokenID']), @@ -173,7 +172,11 @@ class _Login extends State { { if (value['IsAuthenticated']) {this.checkActivationCode()} } - }); + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + // SMSOTP.showLoadingDialog(context, false), } checkActivationCode({code}) async { @@ -181,7 +184,8 @@ class _Login extends State { // request.logInTokenID = await sharedPref.getString(LOGIN_TOKEN_ID); // request.activationCode = code ?? "0000"; // request.isSilentLogin = code != null ? false : true; - if (code == null) showLoader(true); + if (code == null) + //showLoader(true); request['PatientMobileNumber'] = int.parse(mobileNo); request['ZipCode'] = countryCode; request['SearchType'] = loginType; @@ -203,7 +207,7 @@ class _Login extends State { Navigator.of(context).pushNamed( HOME, ), - showLoader(false), + //showLoader(false), appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { @@ -225,14 +229,17 @@ class _Login extends State { ), ) } - }) + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) // SMSOTP.showLoadingDialog(context, false), }); } - showLoader(bool isTrue) { - setState(() { - isLoading = isTrue; - }); - } + // showLoader(bool isTrue) { + // setState(() { + // isLoading = isTrue; + // }); + // } } diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index b4b05900..8fe6ece1 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -60,7 +60,7 @@ class _WelcomeLogin extends State { textAlign: TextAlign.left, ), SizedBox( - height: SizeConfig.realScreenHeight * .2, + height: SizeConfig.realScreenHeight * .15, ) ]), ), diff --git a/lib/pages/medical/ask_doctor/doctor_response.dart b/lib/pages/medical/ask_doctor/doctor_response.dart index b6071a4c..846c9a05 100644 --- a/lib/pages/medical/ask_doctor/doctor_response.dart +++ b/lib/pages/medical/ask_doctor/doctor_response.dart @@ -30,7 +30,7 @@ class DoctorResponse extends StatelessWidget { height: 65, ), AppExpandableNotifier( - header: Padding( + headerWidget: Padding( padding: const EdgeInsets.all(8.0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -110,7 +110,7 @@ class DoctorResponse extends StatelessWidget { ), ), AppExpandableNotifier( - header: Padding( + headerWidget: Padding( padding: const EdgeInsets.all(8.0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, diff --git a/lib/uitl/LocalNotification.dart b/lib/uitl/LocalNotification.dart index ac4f5860..5b826f00 100644 --- a/lib/uitl/LocalNotification.dart +++ b/lib/uitl/LocalNotification.dart @@ -4,16 +4,14 @@ import 'dart:ui'; import 'package:flutter/cupertino.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; -final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); +final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = + FlutterLocalNotificationsPlugin(); class LocalNotification { - - static Future scheduleNotification( {@required DateTime scheduledNotificationDateTime, @required String title, @required String description}) async { - ///vibrationPattern var vibrationPattern = Int64List(4); vibrationPattern[0] = 0; @@ -26,8 +24,10 @@ class LocalNotification { 'ActivePrescriptions', 'ActivePrescriptionsDescription', // icon: 'secondary_icon', - sound: RawResourceAndroidNotificationSound('slow_spring_board'),///change it to be as ionic - // largeIcon: DrawableResourceAndroidBitmap('sample_large_icon'),///change it to be as ionic + sound: RawResourceAndroidNotificationSound('slow_spring_board'), + + ///change it to be as ionic + // largeIcon: DrawableResourceAndroidBitmap('sample_large_icon'),///change it to be as ionic vibrationPattern: vibrationPattern, enableLights: true, color: const Color.fromARGB(255, 255, 0, 0), @@ -35,15 +35,13 @@ class LocalNotification { ledOnMs: 1000, ledOffMs: 500); var iOSPlatformChannelSpecifics = - IOSNotificationDetails(sound: 'slow_spring_board.aiff');///change it to be as ionic - var platformChannelSpecifics = NotificationDetails( - androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics); - await flutterLocalNotificationsPlugin.schedule( - 0, - title, - description, - scheduledNotificationDateTime, - platformChannelSpecifics); + IOSNotificationDetails(sound: 'slow_spring_board.aiff'); + + ///change it to be as ionic + // var platformChannelSpecifics = NotificationDetails( + // androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics); + // await flutterLocalNotificationsPlugin.schedule(0, title, description, + // scheduledNotificationDateTime, platformChannelSpecifics); } ///Repeat notification every day at approximately 10:00:00 am @@ -54,14 +52,14 @@ class LocalNotification { 'repeatDailyAtTime channel name', 'repeatDailyAtTime description'); var iOSPlatformChannelSpecifics = IOSNotificationDetails(); - var platformChannelSpecifics = NotificationDetails( - androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics); - await flutterLocalNotificationsPlugin.showDailyAtTime( - 0, - 'show daily title', - 'Daily notification shown at approximately ${_toTwoDigitString(time.hour)}:${_toTwoDigitString(time.minute)}:${_toTwoDigitString(time.second)}', - time, - platformChannelSpecifics); + // var platformChannelSpecifics = NotificationDetails( + // androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics); + // await flutterLocalNotificationsPlugin.showDailyAtTime( + // 0, + // 'show daily title', + // 'Daily notification shown at approximately ${_toTwoDigitString(time.hour)}:${_toTwoDigitString(time.minute)}:${_toTwoDigitString(time.second)}', + // time, + // platformChannelSpecifics); } ///Repeat notification weekly on Monday at approximately 10:00:00 am @@ -72,15 +70,15 @@ class LocalNotification { 'show weekly channel name', 'show weekly description'); var iOSPlatformChannelSpecifics = IOSNotificationDetails(); - var platformChannelSpecifics = NotificationDetails( - androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics); - await flutterLocalNotificationsPlugin.showWeeklyAtDayAndTime( - 0, - 'show weekly title', - 'Weekly notification shown on Monday at approximately ${_toTwoDigitString(time.hour)}:${_toTwoDigitString(time.minute)}:${_toTwoDigitString(time.second)}', - Day.Monday, - time, - platformChannelSpecifics); + // var platformChannelSpecifics = NotificationDetails( + // androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics); + // await flutterLocalNotificationsPlugin.showWeeklyAtDayAndTime( + // 0, + // 'show weekly title', + // 'Weekly notification shown on Monday at approximately ${_toTwoDigitString(time.hour)}:${_toTwoDigitString(time.minute)}:${_toTwoDigitString(time.second)}', + // Day.Monday, + // time, + // platformChannelSpecifics); } static String _toTwoDigitString(int value) { diff --git a/lib/widgets/mobile-no/mobile_no.dart b/lib/widgets/mobile-no/mobile_no.dart index d916f570..399e346d 100644 --- a/lib/widgets/mobile-no/mobile_no.dart +++ b/lib/widgets/mobile-no/mobile_no.dart @@ -74,6 +74,7 @@ class _MobileNo extends State { Container( padding: EdgeInsets.all(5), decoration: BoxDecoration( + color: Colors.white, border: Border.all(color: Colors.grey), borderRadius: BorderRadius.circular(10)), child: Row(children: [ @@ -88,6 +89,7 @@ class _MobileNo extends State { child: Text( countryCode, overflow: TextOverflow.clip, + )), Expanded( flex: 4, diff --git a/lib/widgets/others/floating_button_search.dart b/lib/widgets/others/floating_button_search.dart index 37a3e3c0..2d5b6071 100644 --- a/lib/widgets/others/floating_button_search.dart +++ b/lib/widgets/others/floating_button_search.dart @@ -1,7 +1,43 @@ +import 'dart:collection'; +import 'dart:math'; +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; +import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; +import 'package:diplomaticquarterapp/pages/ErService/NearestEr.dart'; +import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; +import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; +import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart'; +import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; +import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; +import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/patient_sick_leave_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/reports/report_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart'; +import 'package:diplomaticquarterapp/pages/vaccine/my_vaccines_screen.dart'; +import 'package:diplomaticquarterapp/routes.dart'; +import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; +import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; +import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/robosearch.dart'; -import 'package:diplomaticquarterapp/widgets/robo-search/search.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:flutter_tts/flutter_tts.dart'; +import 'package:permission_handler/permission_handler.dart'; +import 'package:speech_to_text/speech_recognition_error.dart'; +import 'package:speech_to_text/speech_recognition_result.dart'; +import 'package:speech_to_text/speech_to_text.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:flutter/cupertino.dart'; + +import 'package:smart_progress_bar/smart_progress_bar.dart'; class FloatingSearchButton extends StatefulWidget { @override @@ -10,36 +46,77 @@ class FloatingSearchButton extends StatefulWidget { class _FloatingSearchButton extends State with TickerProviderStateMixin { - Offset position = Offset(30.0, 40.0); - AlignmentDirectional _ironManAlignment = AlignmentDirectional(0.0, 0.7); + Offset position = Offset(250, 400); + bool activeAnimation = false; + bool isShow = true; + SearchProvider searchProvider = new SearchProvider(); + RobotProvider eventProvider = RobotProvider(); + bool isLoading = false; + bool isError = false; + final SpeechToText speech = SpeechToText(); + String error = ''; + String _currentLocaleId = ""; + String lastError; + double level = 0.0; + var searchText; + double minSoundLevel = 50000; + double maxSoundLevel = -50000; + String reconizedWord = ''; + FlutterTts flutterTts = FlutterTts(); + var selectedLang; + bool isSearching = false; + Map results = {}; + String lastStatus; + + bool _isInit = true; + var event = RobotProvider(); + bool _hasSpeech = false; @override void initState() { - // TODO: implement initState super.initState(); + event.controller.stream.listen((p) { + if (p['isRobot'] == 'true') { + setState(() { + position = Offset(250, 400); + activeAnimation = false; + }); + } + }); + requestPermissions(); + // Future.delayed(const Duration(seconds: 10), () { + initSpeechState().then((value) => {}); + // }); } @override Widget build(BuildContext context) { - return Positioned( - left: position.dx, - top: position.dy, - child: Draggable( - feedback: Container(child: getStack()), - child: Container( - child: AnimatedContainer( - duration: Duration(seconds: 2), - alignment: _ironManAlignment, - child: getStack(), - )), - childWhenDragging: Container( - color: Colors.transparent, - ), - onDragEnd: (details) { - setState(() { - position = details.offset; - }); - })); + return AnimatedPositioned( + onEnd: () { + // setState(() { + // this.isShow = false; + // position = Offset(250, 400); + // }); + }, + left: activeAnimation ? 300 : position.dx, + top: activeAnimation ? -150 : position.dy, + duration: activeAnimation + ? const Duration(seconds: 1) + : const Duration(seconds: 0), + // curve: Curves.bounceOut, + child: isShow + ? Draggable( + feedback: Container(child: getStack()), + child: getStack(), + childWhenDragging: Container( + color: Colors.transparent, + ), + onDragEnd: (details) { + setState(() { + position = details.offset; + }); + }) + : Container()); // Draggable( // feedback: getStack(), @@ -57,42 +134,518 @@ class _FloatingSearchButton extends State return Container( height: 150, width: 150, - child: Stack( - children: [ - Positioned( - top: 10, - right: 0, - child: GestureDetector( - onTap: () { - print("hi"); - setState(() { - _ironManAlignment = AlignmentDirectional(0.0, -0.20); - }); - }, // handle your image tap here - child: Image.asset( - 'assets/images/CloseIcon.png', - fit: BoxFit.cover, // this is the solution for border - width: 30.0, - height: 30.0, - )), + child: Stack(children: [ + // Column( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.stretch, + // children: [ + GestureDetector( + child: Container( + child: SvgPicture.asset('assets/images/robort_svg.svg'), + ), + onTap: () { + new RoboSearch(context: context).showAlertDialog(context); + startVoiceSearch(); + }, + ), + // ], + // ), + Positioned( + right: 0.0, + top: 10, + child: GestureDetector( + onTap: () { + setState(() { + activeAnimation = true; + }); + }, + child: Align( + alignment: Alignment.topRight, + child: CircleAvatar( + radius: 14.0, + backgroundColor: Colors.red, + child: Icon(Icons.close, color: Colors.white), + ), + ), ), - GestureDetector( - onTap: () { - // animationController.forward(); - }, // handle your image tap here - child: SvgPicture.asset('assets/images/robort_svg.svg')) - // new RawMaterialButton( - // // shape: new CircleBorder(), - // elevation: 1.0, - // child: SvgPicture.asset('assets/images/robort_svg.svg'), - // onPressed: () {}, - // ), - ], - )); - } - - roboSearch(context) { - var dialog = RoboSearch(context: context); - dialog.showAlertDialog(context); + ), + ]) + + // Stack( + // fit: StackFit.loose, + // overflow: Overflow.visible, + // children: [ + // Container(), + // Positioned( + // child: GestureDetector( + // behavior: HitTestBehavior.translucent, + // onTapDown: (TapDownDetails details) => { + // setState(() { + // activeAnimation = true; + // }) + // }, // handle your image tap here + // child: Image.asset( + // 'assets/images/CloseIcon.png', + // fit: BoxFit.cover, // this is the solution for border + // width: 30.0, + // height: 30.0, + // ), + // )), + // Positioned( + // child: GestureDetector( + // onTap: () { + // this.roboSearch(context); + // }, // handle your image tap here + // child: SvgPicture.asset('assets/images/robort_svg.svg'))) + + // // new RawMaterialButton( + // // // shape: new CircleBorder(), + // // elevation: 1.0, + // // child: SvgPicture.asset('assets/images/robort_svg.svg'), + // // onPressed: () {}, + // // ), + // ], + // ) + + ); + } + + startVoiceSearch() async { + _currentLocaleId = + TranslationBase.of(AppGlobal.context).locale.languageCode == 'en' + ? 'en-US' + : 'ar-SA'; + speech.listen( + onResult: resultListener, + listenFor: Duration(seconds: 10), + localeId: _currentLocaleId, + onSoundLevelChange: soundLevelListener, + cancelOnError: true, + partialResults: true, + onDevice: true, + listenMode: ListenMode.deviceDefault); + } + + void resultListener(SpeechRecognitionResult result) { + // lastWords = "${result.recognizedWords} - ${result.finalResult}"; + + if (result.finalResult == true) { + // setState(() { + + + reconizedWord = result.recognizedWords; + event.setValue({"searchText": reconizedWord}); + setState(() { + searchText = reconizedWord; + }); + Future.delayed(const Duration(seconds: 1), () { + _speak(reconizedWord); + }); + } + //}); + } + + Future _speak(reconizedWord) async { + //await flutterTts.speak(reconizedWord); + RoboSearch.closeAlertDialog(context); + getPages(reconizedWord); + } + + void soundLevelListener(double level) { + minSoundLevel = min(minSoundLevel, level); + maxSoundLevel = max(maxSoundLevel, level); + // print("sound level $level: $minSoundLevel - $maxSoundLevel "); + //setState(() { + this.level = level; + // }); + } + + void requestPermissions() async { + Map statuses = await [ + Permission.microphone, + ].request(); + } + + Future initSpeechState() async { + bool hasSpeech = await speech.initialize( + onError: errorListener, onStatus: statusListener); + if (hasSpeech) { + _currentLocaleId = + TranslationBase.of(AppGlobal.context).locale.languageCode == 'en' + ? 'en-US' + : 'ar-SA'; // systemLocale.localeId; + + } + if (!mounted) return; + + setState(() { + _hasSpeech = hasSpeech; + }); + } + + void errorListener(SpeechRecognitionError error) { + //setState(() { + // reconizedWord = "${error.errorMsg} - ${error.permanent}"; + //}); + } + + void statusListener(String status) { + //setState(() { + reconizedWord = status == 'listening' ? 'Lisening...' : 'Sorry....'; + + //}); + } + + getPages(text) { + var request = { + 'VoiceMessage': text, + 'Lang': TranslationBase.of(AppGlobal.context).locale.languageCode == 'en' + ? 'En' + : 'Ar' + }; + + searchProvider + .getBotPages(request) + .then((value) => {getCommands(value['Understand'])}); + } + + getCommands(result) async { + print(result); + results = result; + + switch (result["CommandNumber"]) { + case '100': + { + List clnicID = unique(result['ClinicId']); + if (result['ProjectId'] != 0 && + clnicID.length > 0 && + result['DoctorId'].length > 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + doctorId: result['DoctorId'], + doctorName: null, + ); + } else { + goToClinic(clnicID); + } + } else if (result['ProjectId'] != 0 && + clnicID.length > 0 && + result['DoctorId'].length == 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + ); + } else { + goToClinic(clnicID); + } + } else if (result['ProjectId'] == 0 && + clnicID.length > 0 && + result['DoctorId'].length == 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + ); + } else { + goToClinic(clnicID); + } + } else if (result['ProjectId'] == 0 && + clnicID.length > 0 && + result['DoctorId'].length > 0) { + if (clnicID.length == 1) { + getDoctorsList( + result['ProjectId'], + clnicID[0], + context, + doctorId: result['DoctorId'], + doctorName: null, + ); + } else { + goToClinic(clnicID); + } + } else { + goToClinic(clnicID); + } + // speak(); + } + break; + case '102': + { + getDoctorsList( + 0, + 0, + context, + doctorId: result['DoctorId'], + doctorName: null, + ); + } + break; + case '103': + { + List clnicID = unique(result['ClinicId']); + if (clnicID.length == 1) { + getDoctorsList( + 0, + clnicID[0], + context, + doctorId: null, + doctorName: null, + ); + } else { + goToClinic(clnicID); + } + } + break; + case '4': + { + Navigator.push(context, FadePage(page: LabsHomePage())); + } + break; + case '6': + { + Navigator.push(context, FadePage(page: RadiologyHomePage())); + } + break; + case '7': + { + Navigator.push( + context, + FadePage( + page: MyAppointments(), + ), + ); + } + break; + case '8': + { + Navigator.push( + context, + FadePage( + page: HomePrescriptionsPage(), + ), + ); + } + break; + case '9': + { + Navigator.push( + context, + FadePage( + page: DoctorHomePage(), + ), + ); + } + break; + case '10': + { + Navigator.push( + context, + FadePage( + page: VitalSignDetailsScreen(), + ), + ); + } + break; + case '11': + { + Navigator.push(context, FadePage(page: InsuranceUpdate())); + } + break; + case '12': + { + Navigator.push(context, FadePage(page: InsuranceApproval())); + } + break; + case '13': + { + Navigator.push(context, FadePage(page: MyVaccines())); + } + break; + case '14': + { + Navigator.push(context, FadePage(page: HomeReportPage())); + } + break; + case '5': + { + Navigator.push(context, FadePage(page: NearestEr())); + } + break; + case '15': + { + Navigator.push(context, FadePage(page: PatientSickLeavePage())); + } + break; + case '16': + { + Navigator.push(context, FadePage(page: LiveCareHome())); + } + break; + + case '200': + { + Navigator.push(context, FadePage(page: FeedbackHomePage())); + } + break; + + default: + Navigator.of(context).pushNamed(HOME); + speak(); + break; + } + + //searchProvider.setLisener(result); + } + + getDoctorProfile(projectId, clinicId, doctorId, context, doctorData) { + List docProfileList = []; + DoctorsListService service = new DoctorsListService(); + + service + .getDoctorsProfile(doctorId, clinicId, projectId, context) + .then((res) { + if (res['MessageStatus'] == 1) { + if (res['DoctorProfileList'].length != 0) { + res['DoctorProfileList'].forEach((v) { + docProfileList.add(new DoctorProfileList.fromJson(v)); + }); + } + + navigateToDoctorProfile(context, doctorData[0], docProfileList[0], + isAppo: true); + //speak(); + } + }).catchError((err) { + print(err); + }); + } + + getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) { + List doctorsList = []; + List arr = []; + List arrDistance = []; + DoctorsListService service = new DoctorsListService(); + service + .getDoctorsList(clinicId, projectId, false, context, + doctorId: doctorId, doctorName: doctorName) + .then((res) { + if (res['MessageStatus'] == 1) { + setState(() { + if (res['SearchDoctorsByTime_IsVoiceCommandList'] != null && + res['SearchDoctorsByTime_IsVoiceCommandList'].length != 0) { + doctorsList.clear(); + res['SearchDoctorsByTime_IsVoiceCommandList'].forEach((v1) { + v1['DoctorList'].forEach((v) { + doctorsList.add(new DoctorList.fromJson(v)); + arr.add(new DoctorList.fromJson(v).projectName); + arrDistance.add(new DoctorList.fromJson(v) + .projectDistanceInKiloMeters + .toString()); + }); + }); + if (doctorsList.length == 1) { + getDoctorProfile( + projectId, clinicId, doctorId[0], context, doctorsList); + + //speak(); + } else { + navigateToSearchResults(context, doctorsList, arr, arrDistance); + } + } else if (res['DoctorList'].length != 0) { + doctorsList.clear(); + + res['DoctorList'].forEach((v) { + doctorsList.add(new DoctorList.fromJson(v)); + arr.add(new DoctorList.fromJson(v).projectName); + arrDistance.add(new DoctorList.fromJson(v) + .projectDistanceInKiloMeters + .toString()); + }); + + if (doctorsList.length == 1) { + getDoctorProfile( + projectId, clinicId, doctorId[0], context, doctorsList); + + //speak(); + } else { + navigateToSearchResults(context, doctorsList, arr, arrDistance); + } + } + }); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + Future navigateToDoctorProfile(context, docObject, docProfile, + {isAppo}) async { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => DoctorProfile( + doctor: docObject, + docProfileList: docProfile, + isOpenAppt: isAppo, + ))); + } + + Future navigateToSearchResults(context, docList, arr, arrDistance) async { + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (context) => SearchResults(doctorsList: docList))); + var result = LinkedHashSet.from(arr).toList(); + var numAll = result.length; + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => BranchView( + doctorsList: docList, + result: result, + num: numAll, + resultDistance: arrDistance), + ), + ); + } + + speak() async { + if (_currentLocaleId == 'en-US' && results['ReturnMessage'] != null) { + await flutterTts.setVoice("en-us-x-sfg#male_2-local"); + await flutterTts.setLanguage(_currentLocaleId); + await flutterTts.speak(results['ReturnMessage']); + } else if (results['ReturnMessage_Ar'] != null) { + await flutterTts.setLanguage(_currentLocaleId); + + await flutterTts.setVoice("ar-sa-x-sfg#male_1-local"); + await flutterTts.speak(results['ReturnMessage_Ar']); + } + // Future.delayed(const Duration(seconds: 10), () { + // initSpeechState().then((value) => startVoiceSearch()); + // }); + } + + goToClinic(List ids) { + Navigator.push( + AppGlobal.context, + MaterialPageRoute( + builder: (context) => Search( + type: 0, + clnicIds: ids, + ))); + speak(); + } + + List unique(List list) { + return list.toSet().toList(); } } diff --git a/lib/widgets/otp/sms-popup.dart b/lib/widgets/otp/sms-popup.dart index 376c2a4f..1a67ae8f 100644 --- a/lib/widgets/otp/sms-popup.dart +++ b/lib/widgets/otp/sms-popup.dart @@ -30,10 +30,10 @@ class SMSOTP { ); Map verifyAccountFormValue = { - 'digit1': null, - 'digit2': null, - 'digit3': null, - 'digit4': null, + 'digit1': '', + 'digit2': '', + 'digit3': '', + 'digit4': '', }; final focusD1 = FocusNode(); final focusD2 = FocusNode(); @@ -106,7 +106,7 @@ class SMSOTP { onChanged: (val) { if (val.length == 1) { FocusScope.of(context).requestFocus(focusD2); - verifyAccountFormValue['digit1'] = val; + verifyAccountFormValue['digit1'] = val.trim(); checkValue(); } }, @@ -130,7 +130,7 @@ class SMSOTP { if (val.length == 1) { FocusScope.of(context) .requestFocus(focusD3); - verifyAccountFormValue['digit2'] = val; + verifyAccountFormValue['digit2'] = val.trim(); checkValue(); } }, @@ -155,7 +155,7 @@ class SMSOTP { if (val.length == 1) { FocusScope.of(context) .requestFocus(focusD4); - verifyAccountFormValue['digit3'] = val; + verifyAccountFormValue['digit3'] = val.trim(); checkValue(); } }, @@ -175,7 +175,7 @@ class SMSOTP { }, onChanged: (val) { if (val.length == 1) { - verifyAccountFormValue['digit4'] = val; + verifyAccountFormValue['digit4'] = val.trim(); checkValue(); } }, @@ -241,10 +241,10 @@ class SMSOTP { checkValue() { //print(verifyAccountFormValue); - if (verifyAccountFormValue['digit1'] != null && - verifyAccountFormValue['digit2'] != null && - verifyAccountFormValue['digit3'] != null && - verifyAccountFormValue['digit4'] != null) { + if (verifyAccountFormValue['digit1'] != ''&& + verifyAccountFormValue['digit2'] != '' && + verifyAccountFormValue['digit3'] != '' && + verifyAccountFormValue['digit4'] != '') { onSuccess(verifyAccountFormValue['digit1'] + verifyAccountFormValue['digit2'] + verifyAccountFormValue['digit3'] + diff --git a/lib/widgets/robo-search/robosearch.dart b/lib/widgets/robo-search/robosearch.dart index ca28193b..35c2ec67 100644 --- a/lib/widgets/robo-search/robosearch.dart +++ b/lib/widgets/robo-search/robosearch.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/search.dart'; import 'package:flutter/cupertino.dart'; @@ -6,7 +7,8 @@ import 'package:flutter/material.dart'; class RoboSearch { final BuildContext context; - + var event = RobotProvider(); + var searchText = null; RoboSearch({ @required this.context, }); @@ -16,14 +18,50 @@ class RoboSearch { // set up the AlertDialog AlertDialog alert = AlertDialog( - title: Center(child: Text(TranslationBase.of(context).search)), content: StatefulBuilder( builder: (BuildContext context, StateSetter setState) { + setState((){ + event.controller.stream.listen((p) { + if (p['searchText']!=null) { + setState(() { + searchText = p['searchText']; + }); + } + }); + }); return Container( color: Colors.white, height: SizeConfig.realScreenHeight * 0.5, width: SizeConfig.realScreenWidth * 0.8, - child: Container()); + child: Container( + child: Column(children: [ + Expanded( + flex: 1, + child: Center( + child: Image.asset( + 'assets/images/habib-logo.png', + height: 75, + width: 75, + ))), + Expanded( + flex: 3, + child: Center( + child: Container( + margin: EdgeInsets.all(20), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(100), + border: Border.all(width: 2, color: Colors.red)), + child: Icon( + Icons.mic, + color: Colors.blue, + size: 48, + ), + ))), + Expanded( + flex: 1, child: Center(child: Text( searchText != null ? searchText : 'Try saying something' ))) + ]), + )); }), ); diff --git a/pubspec.yaml b/pubspec.yaml index 0106908a..4277dcd7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -117,7 +117,7 @@ dependencies: #local_notifications - flutter_local_notifications: ^1.4.4+4 + flutter_local_notifications: ^1.5.0 #rxdart rxdart: ^0.24.1 From 1ce55e687f8ee2b0a175a788ecaff529d04d2ffc Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 6 Oct 2020 18:02:35 +0300 Subject: [PATCH 22/37] Ambulance Service second step --- android/app/build.gradle | 4 +- android/app/src/main/AndroidManifest.xml | 6 + android/gradle.properties | 2 +- lib/core/enum/Ambulate.dart | 27 ++ lib/core/model/er/PatientER.dart | 11 +- lib/core/service/medical/medical_service.dart | 9 +- .../viewModels/er/am_request_view_model.dart | 17 + .../ErService/AvailableAppointmentsPage.dart | 45 +++ lib/pages/ErService/BillAmount.dart | 327 +++++++++++++++++- lib/pages/ErService/PickupLocation.dart | 163 +++++++-- .../ErService/SelectTransportationMethod.dart | 6 + lib/pages/ErService/Summary.dart | 98 +++++- .../ErService/widgets/AppointmentCard.dart | 47 +++ lib/pages/ErService/widgets/StepsWidget.dart | 109 +++++- lib/uitl/ProgressDialog.dart | 12 + pubspec.yaml | 6 +- 16 files changed, 819 insertions(+), 70 deletions(-) create mode 100644 lib/core/enum/Ambulate.dart create mode 100644 lib/pages/ErService/AvailableAppointmentsPage.dart create mode 100644 lib/pages/ErService/widgets/AppointmentCard.dart create mode 100644 lib/uitl/ProgressDialog.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index 1f71421f..9640ea61 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 28 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -41,7 +41,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.cloud.diplomaticquarterapp" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f1a5a3f8..8c32edfd 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -17,6 +17,9 @@ + + + + + diff --git a/android/gradle.properties b/android/gradle.properties index 3f45ee5b..9c0729c9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,4 +2,4 @@ android.enableR8=true android.useAndroidX=true android.enableJetifier=true -org.gradle.jvmargs=-Xmx4608m \ No newline at end of file +org.gradle.jvmargs=-Xmx4608m diff --git a/lib/core/enum/Ambulate.dart b/lib/core/enum/Ambulate.dart new file mode 100644 index 00000000..059a281c --- /dev/null +++ b/lib/core/enum/Ambulate.dart @@ -0,0 +1,27 @@ +import 'package:flutter/cupertino.dart'; + +enum Ambulate { Wheelchair, Walker, Stretcher, None } + +extension SelectedAmbulate on Ambulate { + String getAmbulateTitle(BuildContext context) { + switch (this) { + case Ambulate.Wheelchair: + // TODO: Handle this case. + return 'Wheelchair'; + break; + case Ambulate.Walker: + // TODO: Handle this case. + return 'Walker'; + break; + case Ambulate.Stretcher: + // TODO: Handle this case. + return 'Stretcher'; + break; + case Ambulate.None: + // TODO: Handle this case. + return 'None'; + break; + } + return 'None'; + } +} diff --git a/lib/core/model/er/PatientER.dart b/lib/core/model/er/PatientER.dart index 9c2d660e..d0827311 100644 --- a/lib/core/model/er/PatientER.dart +++ b/lib/core/model/er/PatientER.dart @@ -1,3 +1,7 @@ +import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; + +import 'get_all_transportation_method_list_model.dart'; + class PatientER { double versionID; int channel; @@ -46,7 +50,8 @@ class PatientER { dynamic appointmentDoctorName; dynamic appointmentBranch; dynamic appointmentTime; - + PatientERTransportationMethod patientERTransportationMethod; + Ambulate ambulate; PatientER( {this.versionID, this.channel, @@ -94,7 +99,9 @@ class PatientER { this.appointmentClinicName, this.appointmentDoctorName, this.appointmentBranch, - this.appointmentTime}); + this.appointmentTime, + this.patientERTransportationMethod, + this.ambulate}); PatientER.fromJson(Map json) { versionID = json['VersionID']; diff --git a/lib/core/service/medical/medical_service.dart b/lib/core/service/medical/medical_service.dart index 90230f6d..572e5096 100644 --- a/lib/core/service/medical/medical_service.dart +++ b/lib/core/service/medical/medical_service.dart @@ -5,9 +5,14 @@ import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResu class MedicalService extends BaseService { List appoitmentAllHistoryResultList = List(); - getAppointmentHistory() async { + getAppointmentHistory({bool isActiveAppointment = false}) async { hasError = false; super.error = ""; + Map body = Map(); + if(isActiveAppointment) { + body['IsActiveAppointment'] = true; + body['isDentalAllowedBackend'] = false; + } await baseAppClient.post(GET_PATIENT_APPOINTMENT_HISTORY, onSuccess: (response, statusCode) async { @@ -19,6 +24,6 @@ class MedicalService extends BaseService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: Map()); + }, body: body); } } diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index 9045ee90..a5261456 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -3,19 +3,36 @@ import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/service/er/am_service.dart'; import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; +import 'package:diplomaticquarterapp/core/service/medical/medical_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import '../base_view_model.dart'; import '../../../locator.dart'; class AmRequestViewModel extends BaseViewModel { AmService _amService = locator(); HospitalService _hospitalService = locator(); + MedicalService _medicalService = locator(); List get amRequestModeList => _amService.amModelList; List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; + List get appoitmentAllHistoryResultList => + _medicalService.appoitmentAllHistoryResultList; + + Future getAppointmentHistory() async { + setState(ViewState.BusyLocal); + await _medicalService.getAppointmentHistory(isActiveAppointment: true); + if (_medicalService.hasError) { + error = _medicalService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + Future getAmRequestOrders() async { setState(ViewState.Busy); diff --git a/lib/pages/ErService/AvailableAppointmentsPage.dart b/lib/pages/ErService/AvailableAppointmentsPage.dart new file mode 100644 index 00000000..7180d5dd --- /dev/null +++ b/lib/pages/ErService/AvailableAppointmentsPage.dart @@ -0,0 +1,45 @@ +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class AvailableAppointmentsPage extends StatelessWidget { + final List appointmentsAllHistoryList; + + const AvailableAppointmentsPage({Key key, this.appointmentsAllHistoryList}) + : super(key: key); + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Available Appointments', + body: SingleChildScrollView( + child: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Texts('Available Appointments'), + SizedBox( + height: 12, + ), + ...List.generate( + appointmentsAllHistoryList.length, + (index) => InkWell( + onTap: (){ + Navigator.pop(context, appointmentsAllHistoryList[index]); + }, + child: AppointmentCard(appointment: appointmentsAllHistoryList[index],), + ), + ) + ], + ), + ), + ), + ); + } +} + + diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/BillAmount.dart index 3dca195f..44e17c3a 100644 --- a/lib/pages/ErService/BillAmount.dart +++ b/lib/pages/ErService/BillAmount.dart @@ -1,41 +1,334 @@ +import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + class BillAmount extends StatefulWidget { final Function changeCurrentTab; final PatientER patientER; final AmRequestViewModel amRequestViewModel; - BillAmount({Key key, this.changeCurrentTab, this.patientER, this.amRequestViewModel}); + BillAmount( + {Key key, + this.changeCurrentTab, + this.patientER, + this.amRequestViewModel}); @override _BillAmountState createState() => _BillAmountState(); } class _BillAmountState extends State { + Ambulate _ambulate = Ambulate.None; + String note =""; @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('BillAmount 3'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - onTap: ()=> widget.changeCurrentTab(3), - label: 'Next', + return SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Bill Amount '), + SizedBox( + height: 10, + ), + Table( + border: TableBorder.symmetric( + inside: BorderSide(width: 1.0, color: Colors.grey[300]), + outside: BorderSide(width: 1.0, color: Colors.grey[300])), + children: [ + TableRow( + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Amount before tax: ', + textAlign: TextAlign.start, + color: Colors.black, + fontSize: 15, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topRight: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'SR ${widget.patientER.patientERTransportationMethod.price}', + color: Colors.black, + textAlign: TextAlign.start, + fontSize: 15, + ), + ), + ), + ], + ), + TableRow( + children: [ + Container( + color: Colors.white, + height: MediaQuery.of(context).size.height * 0.09, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Tax amount :', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.09, + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'SR ${widget.patientER.patientERTransportationMethod.vAT}', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + ), + ), + ), + ], + ), + TableRow( + children: [ + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'Total amount payable', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + bold: true, + ), + ), + ), + Container( + height: MediaQuery.of(context).size.height * 0.09, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(10.0), + ), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + 'SR ${widget.patientER.patientERTransportationMethod.totalPrice}', + color: Colors.black, + fontSize: 15, + textAlign: TextAlign.start, + ), + ), + ), + ], + ), + ], + ), + SizedBox( + height: 10, + ), + Texts('Select Ambulate',bold: true,), + SizedBox(height: 5,), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.Wheelchair; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Wheelchair'), + leading: Radio( + value: Ambulate.Wheelchair, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.Walker; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Walker'), + leading: Radio( + value: Ambulate.Walker, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + ], + ), + SizedBox(height: 5,), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.Stretcher; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Stretcher'), + leading: Radio( + value: Ambulate.Stretcher, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + Expanded( + child: InkWell( + onTap: () { + setState(() { + _ambulate = Ambulate.None; + }); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: + Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: ListTile( + title: Text('Walker'), + leading: Radio( + value: Ambulate.None, + groupValue: _ambulate, + activeColor: Colors.red[800], + onChanged: (value) { + setState(() { + _ambulate = value; + }); + }, + ), + ), + ), + ), + ), + ], + ), + SizedBox(height: 12,), + NewTextFields( + hintText: 'Note', + initialValue: note, + onChanged: (value){ + setState(() { + note = value; + }); + }, + ), - ), - ) - ], + SizedBox( + height: 15, + ), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child: SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + onTap: () { + setState(() { + widget.patientER.ambulate = _ambulate; + widget.patientER.requesterNote = note; + widget.changeCurrentTab(3); + }); + }, + label: 'Next', + ), + ) + ], + ), + ), ); } } diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/PickupLocation.dart index 46a8928b..4b32c9bb 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/PickupLocation.dart @@ -1,16 +1,29 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart'; +import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:geolocator/geolocator.dart'; +import 'package:google_maps_place_picker/google_maps_place_picker.dart'; +import 'package:google_maps_flutter/google_maps_flutter.dart'; + +import 'AmbulanceReq.dart'; +import 'AvailableAppointmentsPage.dart'; enum HaveAppointment { YES, NO } class PickupLocation extends StatefulWidget { final Function changeCurrentTab; final PatientER patientER; + final AmRequestViewModel amRequestViewModel; PickupLocation( {Key key, @@ -18,8 +31,6 @@ class PickupLocation extends StatefulWidget { this.patientER, this.amRequestViewModel}); - final AmRequestViewModel amRequestViewModel; - @override _PickupLocationState createState() => _PickupLocationState(); } @@ -27,6 +38,26 @@ class PickupLocation extends StatefulWidget { class _PickupLocationState extends State { bool _isInsideHome = false; HaveAppointment _haveAppointment = HaveAppointment.NO; + double _latitude; + double _longitude; + AppoitmentAllHistoryResultList myAppointment; + + @override + void initState() { + super.initState(); + _getCurrentLocation(); + } + + _getCurrentLocation() async { + await getLastKnownPosition().then((value) { + _latitude = value.latitude; + _longitude = value.longitude; + }).catchError((e) { + _longitude = 0; + _latitude = 0; + }); + // currentLocation = LatLng(position.latitude, position.longitude); + } @override Widget build(BuildContext context) { @@ -111,9 +142,12 @@ class _PickupLocationState extends State { Expanded( child: InkWell( onTap: () { - setState(() { - _haveAppointment = HaveAppointment.YES; - }); + if(myAppointment == null) { + getAppointment(); + setState(() { + _haveAppointment = HaveAppointment.YES; + }); + } }, child: Container( decoration: BoxDecoration( @@ -130,9 +164,13 @@ class _PickupLocationState extends State { groupValue: _haveAppointment, activeColor: Colors.red[800], onChanged: (value) { - setState(() { - _haveAppointment = value; - }); + if(myAppointment == null) { + getAppointment(); + setState(() { + _haveAppointment = value; + }); + } + }, ), ), @@ -144,6 +182,7 @@ class _PickupLocationState extends State { onTap: () { setState(() { _haveAppointment = HaveAppointment.NO; + myAppointment = null; }); }, child: Container( @@ -163,6 +202,7 @@ class _PickupLocationState extends State { onChanged: (value) { setState(() { _haveAppointment = value; + myAppointment = null; }); }, ), @@ -172,6 +212,18 @@ class _PickupLocationState extends State { ), ], ), + + if(myAppointment!=null) + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + AppointmentCard(appointment: myAppointment,) + ], + ), + SizedBox( height: 12, ), @@ -209,24 +261,43 @@ class _PickupLocationState extends State { SizedBox( height: 15, ), - Container( - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts('Pickup Location'), - Icon( - Icons.arrow_drop_down, - size: 24, - color: Colors.black, - ) - ], + InkWell( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PlacePicker( + apiKey: 'AIzaSyCiD4YqVqLNYbt8-htvFy4Wp8XSph9E3wM​', + // Put YOUR OWN KEY here. + onPlacePicked: (PickResult result) { + print(result.adrAddress); + Navigator.of(context).pop(); + }, + initialPosition: LatLng(_latitude, _longitude), + useCurrentLocation: true, + ), + ), + ); + }, + child: Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Pickup Location'), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), ), ), SizedBox( @@ -270,7 +341,12 @@ class _PickupLocationState extends State { child: SecondaryButton( color: Colors.grey[800], textColor: Colors.white, - onTap: () => widget.changeCurrentTab(2), + onTap: () { + setState(() { + widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; + widget.changeCurrentTab(2); + }); + }, label: 'Next', ), ) @@ -279,4 +355,37 @@ class _PickupLocationState extends State { ), ); } + + getAppointment() { + widget.amRequestViewModel.getAppointmentHistory().then((value) { + if (widget.amRequestViewModel.state == ViewState.Error || + widget.amRequestViewModel.state == ViewState.ErrorLocal) { + AppToast.showErrorToast(message: widget.amRequestViewModel.error); + } else if (widget.amRequestViewModel.appoitmentAllHistoryResultList.length > 0) { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => AvailableAppointmentsPage( + appointmentsAllHistoryList: + widget.amRequestViewModel.appoitmentAllHistoryResultList, + ), + ), + ).then((value) { + if (value != null) + setState(() { + myAppointment = value; + }); + else + setState(() { + _haveAppointment = HaveAppointment.NO; + }); + }); + } else { + setState(() { + _haveAppointment = HaveAppointment.NO; + }); + AppToast.showErrorToast(message: 'You don\'t have any appointment'); + } + }); + } } diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/SelectTransportationMethod.dart index 38eec5b4..261b9f83 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/SelectTransportationMethod.dart @@ -42,6 +42,10 @@ class _SelectTransportationMethodState _way = widget.patientER.tripType == 1 ? Way.OneWay : Way.TwoWays; _erTransportationMethod = widget.amRequestViewModel .amRequestModeList[(widget.patientER.selectedAmbulate - 1)]; + } else { + if (widget.amRequestViewModel.amRequestModeList.length != 0) + _erTransportationMethod = widget.amRequestViewModel.amRequestModeList[ + widget.amRequestViewModel.amRequestModeList.length - 1]; } } @@ -281,6 +285,8 @@ class _SelectTransportationMethodState .amRequestViewModel.amRequestModeList .indexOf(_erTransportationMethod) + 1); + widget.patientER.patientERTransportationMethod = + _erTransportationMethod; widget.changeCurrentTab(1); }); }, diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/Summary.dart index 13beee8c..4c189707 100644 --- a/lib/pages/ErService/Summary.dart +++ b/lib/pages/ErService/Summary.dart @@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; class Summary extends StatefulWidget { final Function changeCurrentTab; @@ -19,23 +20,86 @@ class Summary extends StatefulWidget { class _SummaryState extends State { @override Widget build(BuildContext context) { - return Column( - children: [ - Texts('Summary 4'), - SizedBox(height: 45,), - Container( - padding: EdgeInsets.all(15), - width: double.maxFinite, - height: 76, - child:SecondaryButton( - color: Colors.grey[800], - textColor: Colors.white, - label: 'Next', - - // onTap: ()=> widget.changeCurrentTab(2), - ), - ) - ], + return SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 12, right: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Summary'), + SizedBox(height: 5,), + Container( + width: double.infinity, + + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(12), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Transportation Method',color: Colors.grey,), + Texts('${widget.patientER.patientERTransportationMethod.title}',bold: true,), + SizedBox(height: 8,), + + Texts('Direction',color: Colors.grey,), + Texts('From Hospital',bold: true,), + SizedBox(height: 8,), + + Texts('Pickup Location',color: Colors.grey,), + Texts('SZR Medical Center',bold: true,), + SizedBox(height: 8,), + + Texts('Drop off location',color: Colors.grey,), + Texts('6199, Al Ameen wlfn nif',bold: true,), + SizedBox(height: 8,), + + Texts('Select Ambulate',color: Colors.grey,), + Texts('${widget.patientER.ambulate.getAmbulateTitle(context)}',bold: true,), + SizedBox(height: 8,), + + Texts('Note',color: Colors.grey,), + Texts('${widget.patientER.requesterNote?? '---'}',bold: true,), + SizedBox(height: 8,), + ], + ), + ), + SizedBox(height: 20,), + Texts('Bill Amount',textAlign: TextAlign.start,), + SizedBox(height: 5,), + Container( + height: 55, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8) + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Total amount payable:'), + Texts('SR ${widget.patientER.patientERTransportationMethod.totalPrice}') + ], + ), + ), + + SizedBox(height: 45,), + Container( + padding: EdgeInsets.all(15), + width: double.maxFinite, + height: 76, + child:SecondaryButton( + color: Colors.grey[800], + textColor: Colors.white, + label: 'Next', + + // onTap: ()=> widget.changeCurrentTab(2), + ), + ) + ], + ), + ), ); } } diff --git a/lib/pages/ErService/widgets/AppointmentCard.dart b/lib/pages/ErService/widgets/AppointmentCard.dart new file mode 100644 index 00000000..0437c32f --- /dev/null +++ b/lib/pages/ErService/widgets/AppointmentCard.dart @@ -0,0 +1,47 @@ +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class AppointmentCard extends StatelessWidget { + final AppoitmentAllHistoryResultList appointment; + + const AppointmentCard({Key key, this.appointment}) : super(key: key); + @override + Widget build(BuildContext context) { + return Container( + width: double.infinity, + margin: EdgeInsets.all(8), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Row( + children: [ + LargeAvatar( + url: appointment.doctorImageURL, + name: appointment.doctorNameObj, + ), + Expanded( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts(appointment.doctorNameObj,bold: true,), + SizedBox(height: 4,), + Texts(appointment.projectName), + Texts(appointment.clinicName), + Texts(DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(appointment.bookDate))), + ], + ), + ), + ) + ], + ), + ); + } +} diff --git a/lib/pages/ErService/widgets/StepsWidget.dart b/lib/pages/ErService/widgets/StepsWidget.dart index 1e4077cb..c5864710 100644 --- a/lib/pages/ErService/widgets/StepsWidget.dart +++ b/lib/pages/ErService/widgets/StepsWidget.dart @@ -1,6 +1,8 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; class StepsWidget extends StatelessWidget { final int index; @@ -10,7 +12,8 @@ class StepsWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return Stack( + ProjectViewModel projectViewModel = Provider.of(context); + return projectViewModel.isArabic? Stack( children: [ Container( height: 50, @@ -114,6 +117,110 @@ class StepsWidget extends StatelessWidget { ), ), ], + ):Stack( + children: [ + Container( + height: 50, + width: MediaQuery.of(context).size.width, + color: Colors.transparent, + child: Center( + child: Divider( + color: Colors.grey, + height: 0.75, + thickness: 0.75, + ), + ), + ), + Positioned( + top: 10, + right: 0, + child: InkWell( + onTap: () => changeCurrentTab(0), + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + border: index > 0 ? null:Border.all(color: Colors.black,width: 0.75), + shape: BoxShape.circle, + color: index == 0 ? Colors.grey[800] : index > 0 ?Colors.green: Colors.white, + ), + child: Center( + child: Texts( + '1', + color: index == 0 ? Colors.white : index > 0 ?Colors.white: Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + right: MediaQuery.of(context).size.width * 0.3, + child: InkWell( + onTap: () => index >= 2 ? changeCurrentTab(1) : null, + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + border: index > 1 ? null:Border.all(color: Colors.black,width: 0.75), + shape: BoxShape.circle, + color: index == 1 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, + ), + child: Center( + child: Texts( + '2', + color: index == 1? Colors.white : index > 1 ?Colors.white: Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + right: MediaQuery.of(context).size.width * 0.6, + child: InkWell( + onTap: () => index >= 3 ? changeCurrentTab(2) : null, + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + shape: BoxShape.circle, + border: index > 2 ? null:Border.all(color: Colors.black,width: 0.75), + color: index == 2 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, + ), + child: Center( + child: Texts( + '3', + color: index == 2? Colors.white : index > 1 ?Colors.white: Colors.grey[800], + ), + ), + ), + ), + ), + Positioned( + top: 10, + left: 0, + child: InkWell( + onTap: () => index == 2 ?changeCurrentTab(3):null, + child: Container( + width: 35, + height: 35, + decoration: BoxDecoration( + border: Border.all(color: Colors.black,width: 0.75), + + shape: BoxShape.circle, + color: index == 3 ? Colors.grey[800] : Colors.white, + ), + child: Center( + child: Texts( + '4', + color: index == 3 ? Colors.white : Colors.grey[800], + ), + ), + ), + ), + ), + ], ); } } diff --git a/lib/uitl/ProgressDialog.dart b/lib/uitl/ProgressDialog.dart new file mode 100644 index 00000000..728b27dd --- /dev/null +++ b/lib/uitl/ProgressDialog.dart @@ -0,0 +1,12 @@ +import 'package:flutter/material.dart'; + +class ProgressDialogUtil{ + + static AlertDialog alert = AlertDialog( + content: new Row( + children: [ + CircularProgressIndicator(), + Container(margin: EdgeInsets.only(left: 7),child:Text("Loading..." )), + ],), + ); +} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 8bc2c52a..6e9349ab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.2.2 <3.0.0" + sdk: ">=2.6.0 <3.0.0" dependencies: flutter: @@ -128,6 +128,10 @@ dependencies: #Handle Geolocation geolocator: ^6.0.0+1 + + #google maps places + google_maps_place_picker: ^0.10.0 + #Dependencies for video call implementation native_device_orientation: ^0.3.0 enum_to_string: ^1.0.9 From 8f18d1025ac4a043157a073edc942a23c08c201d Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 7 Oct 2020 15:11:52 +0300 Subject: [PATCH 23/37] voice search --- lib/config/shared_pref_kay.dart | 1 + lib/pages/MyAppointments/MyAppointments.dart | 24 +- lib/pages/login/confirm-login.dart | 536 +++++++++--------- .../authentication/auth_provider.dart | 62 +- lib/widgets/drawer/app_drawer_widget.dart | 1 - .../others/floating_button_search.dart | 299 ++++++++-- 6 files changed, 559 insertions(+), 364 deletions(-) diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart index 61e36022..d987ef96 100644 --- a/lib/config/shared_pref_kay.dart +++ b/lib/config/shared_pref_kay.dart @@ -14,3 +14,4 @@ const FAMILY_FILE = 'family-file'; const USER_LAT = 'user-lat'; const USER_LONG = 'user-long'; const IS_GO_TO_PARKING = 'IS_GO_TO_PARKING'; +const IS_SEARCH_APPO = 'is-search-appo'; diff --git a/lib/pages/MyAppointments/MyAppointments.dart b/lib/pages/MyAppointments/MyAppointments.dart index aa0e7d98..379c6e71 100644 --- a/lib/pages/MyAppointments/MyAppointments.dart +++ b/lib/pages/MyAppointments/MyAppointments.dart @@ -1,7 +1,9 @@ +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/models/AppointmentType.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/AppointmentCardView.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart'; @@ -30,7 +32,7 @@ class _MyAppointmentsState extends State TabController _tabController; bool isDataLoaded = false; - + var sharedPref = new AppSharedPreferences(); @override void initState() { _tabController = new TabController(length: 3, vsync: this); @@ -203,14 +205,24 @@ class _MyAppointmentsState extends State }); } - openAppointmentsTab() { - if (widget._patientBookedAppointmentListHospital.length != 0) { + openAppointmentsTab() async { + var flag = await this.sharedPref.getInt(IS_SEARCH_APPO); + + if (flag == 1) { _tabController.index = 0; - } else if (widget._patientConfirmedAppointmentListHospital.length != 0) { + } else if (flag == 2) { _tabController.index = 1; - } else if (widget._patientArrivedAppointmentListHospital.length != 0) { + } else if (flag == 3) { _tabController.index = 2; - return; + } else { + if (widget._patientBookedAppointmentListHospital.length != 0) { + _tabController.index = 0; + } else if (widget._patientConfirmedAppointmentListHospital.length != 0) { + _tabController.index = 1; + } else if (widget._patientArrivedAppointmentListHospital.length != 0) { + _tabController.index = 2; + return; + } } } diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index cc3ed1e8..5b4124b4 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -22,6 +22,7 @@ import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; import 'package:local_auth/local_auth.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; + class ConfirmLogin extends StatefulWidget { @override _ConfirmLogin createState() => _ConfirmLogin(); @@ -74,182 +75,170 @@ class _ConfirmLogin extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).confirm, isShowAppBar: true, - body: SingleChildScrollView( - child: Container( - padding: EdgeInsets.all(20), - height: SizeConfig.realScreenHeight * .9, - width: SizeConfig.realScreenWidth, - child: Column( - children: [ - Expanded( - flex: 3, - child: user != null && isMoreOption == false - ? Column( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Image.asset( - 'assets/images/habib-logo.png', - height: 80, - width: 80, - ), - AppText( - TranslationBase.of(context) - .welcomeBack + - ' ' + - user.name, - fontSize: SizeConfig.textMultiplier * 3.5, - ), - AppText( - TranslationBase.of(context).accountInfo, - fontSize: SizeConfig.textMultiplier * 2.5, - ), - Card( - color: Colors.grey[300], - child: Row( - children: [ - Expanded( - child: ListTile( - title: Text( - TranslationBase.of(context) - .lastLoginAt, - textAlign: TextAlign.center, - ), - subtitle: Text( - user.editedOn != null - ? formatDate(DateUtil - .convertStringToDate( - user.editedOn)) - : '--', - textAlign: - TextAlign.center), - )), - Expanded( - child: ListTile( - title: Text( - TranslationBase.of(context) - .lastLoginWith, - textAlign: - TextAlign.center), - subtitle: Text( - getType(user.logInType, - context), - textAlign: - TextAlign.center), - )) - ], - )) - ], - ) - : Column( - mainAxisAlignment: - MainAxisAlignment.spaceEvenly, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Image.asset( - 'assets/images/habib-logo.png', - height: 80, - width: 80, - ), - this.onlySMSBox == false - ? AppText( - TranslationBase.of(context) - .verifyLoginWith, - fontSize: - SizeConfig.textMultiplier * - 3.5, - textAlign: TextAlign.left, - ) - : AppText( + body: SingleChildScrollView( + child: Container( + padding: EdgeInsets.all(20), + height: SizeConfig.realScreenHeight * .9, + width: SizeConfig.realScreenWidth, + child: Column( + children: [ + Expanded( + flex: 3, + child: user != null && isMoreOption == false + ? Column( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset( + 'assets/images/habib-logo.png', + height: 80, + width: 80, + ), + AppText( + TranslationBase.of(context).welcomeBack + + ' ' + + user.name, + fontSize: SizeConfig.textMultiplier * 3.5, + ), + AppText( + TranslationBase.of(context).accountInfo, + fontSize: SizeConfig.textMultiplier * 2.5, + ), + Card( + color: Colors.grey[300], + child: Row( + children: [ + Expanded( + child: ListTile( + title: Text( + TranslationBase.of(context) + .lastLoginAt, + textAlign: TextAlign.center, + ), + subtitle: Text( + user.editedOn != null + ? formatDate(DateUtil + .convertStringToDate( + user.editedOn)) + : '--', + textAlign: TextAlign.center), + )), + Expanded( + child: ListTile( + title: Text( TranslationBase.of(context) - .verifyFingerprint2, - fontSize: - SizeConfig.textMultiplier * - 2.5, - textAlign: TextAlign.left, - ), - ])), - user != null && isMoreOption == false - ? Expanded( - flex: 2, - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Row( + .lastLoginWith, + textAlign: TextAlign.center), + subtitle: Text( + getType( + user.logInType, context), + textAlign: TextAlign.center), + )) + ], + )) + ], + ) + : Column( + mainAxisAlignment: + MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Image.asset( + 'assets/images/habib-logo.png', + height: 80, + width: 80, + ), + this.onlySMSBox == false + ? AppText( + TranslationBase.of(context) + .verifyLoginWith, + fontSize: + SizeConfig.textMultiplier * 3.5, + textAlign: TextAlign.left, + ) + : AppText( + TranslationBase.of(context) + .verifyFingerprint2, + fontSize: + SizeConfig.textMultiplier * 2.5, + textAlign: TextAlign.left, + ), + ])), + user != null && isMoreOption == false + ? Expanded( + flex: 2, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Expanded( + child: InkWell( + onTap: () => { + authenticateUser( + 3, + BiometricType + .face.index) + }, + child: + getButton(user.logInType))), + Expanded(child: getButton(5)) + ]) + ])) + : Expanded( + flex: 4, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + onlySMSBox == false + ? Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded( - child: InkWell( - onTap: () => { - authenticateUser( - 3, - BiometricType - .face.index) - }, - child: getButton( - user.logInType))), - Expanded(child: getButton(5)) - ]) - ])) - : Expanded( - flex: 4, - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: - CrossAxisAlignment.start, + Expanded(child: getButton(3)), + Expanded(child: getButton(2)) + ], + ) + : SizedBox(), + Row( + mainAxisAlignment: MainAxisAlignment.center, children: [ - onlySMSBox == false - ? Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Expanded(child: getButton(3)), - Expanded(child: getButton(2)) - ], - ) - : SizedBox(), - Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Expanded(child: getButton(1)), - Expanded(child: getButton(4)) - ], - ), - ]), - ), - Expanded( - flex: 1, - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - user != null - ? Row( - children: [ - Expanded( - child: DefaultButton( - TranslationBase.of(context) - .useAnotherAccount, - () => { - Navigator.of(context).pushNamed( - LOGIN_TYPE, - ) - }, - )), - ], - ) - : SizedBox(), - ], - )) - ], - ))) - ); + Expanded(child: getButton(1)), + Expanded(child: getButton(4)) + ], + ), + ]), + ), + Expanded( + flex: 1, + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + user != null + ? Row( + children: [ + Expanded( + child: DefaultButton( + TranslationBase.of(context) + .useAnotherAccount, + () => { + Navigator.of(context).pushNamed( + LOGIN_TYPE, + ) + }, + )), + ], + ) + : SizedBox(), + ], + )) + ], + )))); } Future _getAvailableBiometrics() async { @@ -313,38 +302,39 @@ class _ConfirmLogin extends State { var request = CheckPatientAuthenticationReq.fromJson(req.toJson()); sharedPref.setObject(REGISTER_DATA_FOR_REGISTER, request); - authService.checkPatientAuthentication(request).then((value) => { - if (value['isSMSSent']) - { - sharedPref.setString(LOGIN_TOKEN_ID, value['LogInTokenID']), - this.loginTokenID = value['LogInTokenID'], - sharedPref.setObject(REGISTER_DATA_FOR_LOGIIN, request), - // Future.delayed(Duration(seconds: 1), () { - this.sendActivationCode(type) - // }) - } - else - { - if (value['IsAuthenticated']) {this.checkActivationCode()} - } - }).catchError((err) { + authService + .checkPatientAuthentication(request) + .then((value) => { + if (value['isSMSSent']) + { + sharedPref.setString(LOGIN_TOKEN_ID, value['LogInTokenID']), + this.loginTokenID = value['LogInTokenID'], + sharedPref.setObject(REGISTER_DATA_FOR_LOGIIN, request), + // Future.delayed(Duration(seconds: 1), () { + this.sendActivationCode(type) + // }) + } + else + { + if (value['IsAuthenticated']) {this.checkActivationCode()} + } + }) + .catchError((err) { print(err); }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } - sendActivationCode(type) { + sendActivationCode(type) async { var request = this.getCommonRequest(); - // loading(true); - this.authService.sendActivationCode(request).then((result) => { - if (result != null && result['isSMSSent'] == true) - {loading(false), this.startSMSService(type)} - else - {loading(false)} - }).catchError((err) { - print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + // loading(true); + + await this.authService.sendActivationCode(request).then((result) => { + if (result != null && result['isSMSSent'] == true) + {this.startSMSService(type)} + }); + + // SMSOTP.showLoadingDialog(context, false), } @@ -376,45 +366,50 @@ class _ConfirmLogin extends State { } getMobileInfo(request) { - this.authService.getLoginInfo(request).then((result) => { - if (result['SMSLoginRequired'] == false) - { - this.loginTokenID = result.logInTokenID, - this.patientOutSA = result.patientOutSA, - // sms for register the biometric - if (result.isSMSSent) + this + .authService + .getLoginInfo(request) + .then((result) => { + if (result['SMSLoginRequired'] == false) { - this.onlySMSBox = false, - //this.button(); + this.loginTokenID = result.logInTokenID, + this.patientOutSA = result.patientOutSA, + // sms for register the biometric + if (result.isSMSSent) + { + this.onlySMSBox = false, + //this.button(); + } + else + {checkActivationCode()} } else - {checkActivationCode()} - } - else - { - if (result['IsAuthenticated'] == true) { - setState(() { - isMoreOption = true; - this.onlySMSBox = true; - // this.fingrePrintBefore = true; - }), - - //sharedPref.setBool(ONLY_SMS, true), - // this.cs.sharedService.setSharedData(true, AuthenticationService.ONLY_SMS); - //this.cs.sharedService.setSharedData(this.selectedOption, AuthenticationService.FINGUREPRINT_BEFORE); - // this.cs.confirmLogin(); - //this.button(); + if (result['IsAuthenticated'] == true) + { + setState(() { + isMoreOption = true; + this.onlySMSBox = true; + // this.fingrePrintBefore = true; + }), + + //sharedPref.setBool(ONLY_SMS, true), + // this.cs.sharedService.setSharedData(true, AuthenticationService.ONLY_SMS); + //this.cs.sharedService.setSharedData(this.selectedOption, AuthenticationService.FINGUREPRINT_BEFORE); + // this.cs.confirmLogin(); + //this.button(); + } + // else + // { + // // this.cs.presentAlert(result.ErrorEndUserMessage); + // } } - // else - // { - // // this.cs.presentAlert(result.ErrorEndUserMessage); - // } - } - }).catchError((err) { + }) + .catchError((err) { print(err); }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));; + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + ; } setUser() async {} @@ -435,9 +430,13 @@ class _ConfirmLogin extends State { : int.parse(this.user.mobile); this.zipCode = this.registerd_data != null ? this.registerd_data.zipCode - : this.user.outSA == true ? "971" : "966"; + : this.user.outSA == true + ? "971" + : "966"; this.patientOutSA = this.registerd_data != null - ? this.registerd_data.zipCode == "966" ? 0 : 1 + ? this.registerd_data.zipCode == "966" + ? 0 + : 1 : this.user.outSA; if (this.registerd_data != null) { this.loginTokenID = await sharedPref.getString(LOGIN_TOKEN_ID); @@ -485,46 +484,51 @@ class _ConfirmLogin extends State { SMSOTP.showLoadingDialog(context, true); var request = this.getCommonRequest().toJson(); - this.authService.checkActivationCode(request, value).then((result) => { - if (result is Map) - { - result = CheckActivationCode.fromJson(result), - if (this.registerd_data != null && - this.registerd_data.isRegister == true) + this + .authService + .checkActivationCode(request, value) + .then((result) => { + if (result is Map) { - Navigator.of(context).pushNamed( - REGISTER_INFO, - ) + result = CheckActivationCode.fromJson(result), + if (this.registerd_data != null && + this.registerd_data.isRegister == true) + { + Navigator.of(context).pushNamed( + REGISTER_INFO, + ) + } + else + { + this.userData = result + .list, //AuthenticatedUser.fromJson(result['List'][0]), + this.sharedPref.setObject(USER_PROFILE, result.list), + this.loginTokenID = result.logInTokenID, + this + .sharedPref + .setObject(LOGIN_TOKEN_ID, result.logInTokenID), + this + .sharedPref + .setString(TOKEN, result.authenticationTokenID), + this.checkIfUserAgreedBefore(result), + // Navigator.of(context).pop(), + SMSOTP.showLoadingDialog(context, false), + } } else { - this.userData = result - .list, //AuthenticatedUser.fromJson(result['List'][0]), - this.sharedPref.setObject(USER_PROFILE, result.list), - this.loginTokenID = result.logInTokenID, - this - .sharedPref - .setObject(LOGIN_TOKEN_ID, result.logInTokenID), - this - .sharedPref - .setString(TOKEN, result.authenticationTokenID), - this.checkIfUserAgreedBefore(result), // Navigator.of(context).pop(), SMSOTP.showLoadingDialog(context, false), + Future.delayed(Duration(seconds: 1), () { + AppToast.showErrorToast(message: result); + }), } - } - else - { - // Navigator.of(context).pop(), - SMSOTP.showLoadingDialog(context, false), - Future.delayed(Duration(seconds: 1), () { - AppToast.showErrorToast(message: result); - }), - } - }).catchError((err) { + }) + .catchError((err) { print(err); }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));; + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + ; } checkIfUserAgreedBefore(CheckActivationCode result) { @@ -537,7 +541,10 @@ class _ConfirmLogin extends State { } insertIMEI() { - authService.insertDeviceImei(selectedOption).then((value) => {goToHome()}).catchError((err) { + authService + .insertDeviceImei(selectedOption) + .then((value) => {goToHome()}) + .catchError((err) { print(err); }); } @@ -545,7 +552,6 @@ class _ConfirmLogin extends State { goToHome() { // authService.insertDeviceImei().then((value) => print(value)); Navigator.of(context).pushNamed(HOME); - } loading(flag) { diff --git a/lib/services/authentication/auth_provider.dart b/lib/services/authentication/auth_provider.dart index 1598184c..6d8c00e2 100644 --- a/lib/services/authentication/auth_provider.dart +++ b/lib/services/authentication/auth_provider.dart @@ -156,19 +156,15 @@ class AuthProvider with ChangeNotifier { request.generalid = GENERAL_ID; request.languageID = LANGUAGE_ID; request.patientOutSA = request.zipCode == '966' ? 0 : 1; - try { - dynamic localRes; - await new BaseAppClient().post(CHECK_PATIENT_AUTH, - onSuccess: (dynamic response, int statusCode) { - localRes = response; - }, onFailure: (String error, int statusCode) { - throw error; - }, body: request.toJson()); - return Future.value(localRes); - } catch (error) { - print(error); + + dynamic localRes; + await new BaseAppClient().post(CHECK_PATIENT_AUTH, + onSuccess: (dynamic response, int statusCode) { + localRes = response; + }, onFailure: (String error, int statusCode) { throw error; - } + }, body: request.toJson()); + return Future.value(localRes); } Future getLoginInfo(request) async { @@ -180,19 +176,15 @@ class AuthProvider with ChangeNotifier { request.deviceTypeID = DeviceTypeID; request.patientOutSA = request.zipCode == '966' ? 0 : 1; request.isDentalAllowedBackend = false; - try { - dynamic localRes; - await new BaseAppClient().post(GET_MOBILE_INFO, - onSuccess: (dynamic response, int statusCode) { - localRes = response; - }, onFailure: (String error, int statusCode) { - throw error; - }, body: request.toJson()); - return Future.value(localRes); - } catch (error) { - print(error); + + dynamic localRes; + await new BaseAppClient().post(GET_MOBILE_INFO, + onSuccess: (dynamic response, int statusCode) { + localRes = response; + }, onFailure: (String error, int statusCode) { throw error; - } + }, body: request.toJson()); + return Future.value(localRes); } Future sendActivationCode(request) async { @@ -204,20 +196,16 @@ class AuthProvider with ChangeNotifier { request.deviceTypeID = DeviceTypeID; request.patientOutSA = request.zipCode == '966' ? 0 : 1; request.isDentalAllowedBackend = false; - try { - dynamic localRes; - await new BaseAppClient().post(SEND_ACTIVATION_CODE, - onSuccess: (dynamic response, int statusCode) { - localRes = response; - authenticatedUser = CheckActivationCode.fromJson(localRes); - }, onFailure: (String error, int statusCode) { - throw error; - }, body: request.toJson()); - return Future.value(localRes); - } catch (error) { - print(error); + + dynamic localRes; + await new BaseAppClient().post(SEND_ACTIVATION_CODE, + onSuccess: (dynamic response, int statusCode) { + localRes = response; + authenticatedUser = CheckActivationCode.fromJson(localRes); + }, onFailure: (String error, int statusCode) { throw error; - } + }, body: request.toJson()); + return Future.value(localRes); } Future checkActivationCode(request, [value]) async { diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 3c5ac608..ce1397f8 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -323,7 +323,6 @@ class _AppDrawerState extends State { await this.sharedPref.getObject(USER_PROFILE)); setState(() { this.user = data; - print(this.user); }); } } diff --git a/lib/widgets/others/floating_button_search.dart b/lib/widgets/others/floating_button_search.dart index 2d5b6071..b8c8c916 100644 --- a/lib/widgets/others/floating_button_search.dart +++ b/lib/widgets/others/floating_button_search.dart @@ -1,27 +1,44 @@ import 'dart:collection'; +import 'dart:io'; import 'dart:math'; import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart'; +import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/my_web_view.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/parking_page.dart'; +import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; +import 'package:diplomaticquarterapp/pages/Blood/my_balance_page.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; +import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart'; +import 'package:diplomaticquarterapp/pages/ErService/AmbulanceReq.dart'; +import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/ErService/NearestEr.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; +import 'package:diplomaticquarterapp/pages/family/my-family.dart'; import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; +import 'package:diplomaticquarterapp/pages/login/welcome.dart'; +import 'package:diplomaticquarterapp/pages/medical/balance/advance_payment_page.dart'; import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/patient_sick_leave_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/reports/report_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart'; +import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; import 'package:diplomaticquarterapp/pages/vaccine/my_vaccines_screen.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/robosearch.dart'; @@ -30,6 +47,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_tts/flutter_tts.dart'; import 'package:permission_handler/permission_handler.dart'; +import 'package:provider/provider.dart'; import 'package:speech_to_text/speech_recognition_error.dart'; import 'package:speech_to_text/speech_recognition_result.dart'; import 'package:speech_to_text/speech_to_text.dart'; @@ -38,6 +56,7 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:flutter/cupertino.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:url_launcher/url_launcher.dart'; class FloatingSearchButton extends StatefulWidget { @override @@ -67,11 +86,12 @@ class _FloatingSearchButton extends State bool isSearching = false; Map results = {}; String lastStatus; - + AuthenticatedUser user; bool _isInit = true; var event = RobotProvider(); - + var sharedPref = new AppSharedPreferences(); bool _hasSpeech = false; + ProjectViewModel projectProvider; @override void initState() { super.initState(); @@ -83,14 +103,17 @@ class _FloatingSearchButton extends State }); } }); + requestPermissions(); // Future.delayed(const Duration(seconds: 10), () { initSpeechState().then((value) => {}); + getUserData(); // }); } @override Widget build(BuildContext context) { + projectProvider = Provider.of(context); return AnimatedPositioned( onEnd: () { // setState(() { @@ -156,7 +179,9 @@ class _FloatingSearchButton extends State child: GestureDetector( onTap: () { setState(() { - activeAnimation = true; + if (this.mounted) { + activeAnimation = true; + } }); }, child: Align( @@ -169,45 +194,7 @@ class _FloatingSearchButton extends State ), ), ), - ]) - - // Stack( - // fit: StackFit.loose, - // overflow: Overflow.visible, - // children: [ - // Container(), - // Positioned( - // child: GestureDetector( - // behavior: HitTestBehavior.translucent, - // onTapDown: (TapDownDetails details) => { - // setState(() { - // activeAnimation = true; - // }) - // }, // handle your image tap here - // child: Image.asset( - // 'assets/images/CloseIcon.png', - // fit: BoxFit.cover, // this is the solution for border - // width: 30.0, - // height: 30.0, - // ), - // )), - // Positioned( - // child: GestureDetector( - // onTap: () { - // this.roboSearch(context); - // }, // handle your image tap here - // child: SvgPicture.asset('assets/images/robort_svg.svg'))) - - // // new RawMaterialButton( - // // // shape: new CircleBorder(), - // // elevation: 1.0, - // // child: SvgPicture.asset('assets/images/robort_svg.svg'), - // // onPressed: () {}, - // // ), - // ], - // ) - - ); + ])); } startVoiceSearch() async { @@ -232,12 +219,11 @@ class _FloatingSearchButton extends State if (result.finalResult == true) { // setState(() { - reconizedWord = result.recognizedWords; event.setValue({"searchText": reconizedWord}); - setState(() { - searchText = reconizedWord; - }); + // setState(() { + // searchText = reconizedWord; + // }); Future.delayed(const Duration(seconds: 1), () { _speak(reconizedWord); }); @@ -278,9 +264,9 @@ class _FloatingSearchButton extends State } if (!mounted) return; - setState(() { - _hasSpeech = hasSpeech; - }); + // setState(() { + // _hasSpeech = hasSpeech; + // }); } void errorListener(SpeechRecognitionError error) { @@ -402,6 +388,19 @@ class _FloatingSearchButton extends State } } break; + case '104': + { + List clnicID = unique(result['ClinicId']); + //= result['ProjectId'] ? result['ProjectId'] : 0; //result['ProjectId']; + + if (clnicID.length == 1) { + getDoctorsList(result['ProjectId'], clnicID[0], context, + doctorId: null, doctorName: null, isNearest: true); + } else { + goToClinic(clnicID); + } + } + break; case '4': { Navigator.push(context, FadePage(page: LabsHomePage())); @@ -483,11 +482,193 @@ class _FloatingSearchButton extends State } break; case '16': + { + Navigator.push(context, FadePage(page: MyBalancePage())); + } + break; + case '17': + { + Navigator.push(context, FadePage(page: MedicalProfilePage())); + } + break; + case '18': + { + //Drivethrough need to be implemeted here. + + } + break; + case '19': { Navigator.push(context, FadePage(page: LiveCareHome())); } break; + case '20': + { + //CMC service need to be implemeted + } + break; + case '21': + { + Navigator.push(context, FadePage(page: MyFamily())); + } + break; + case '22': + { + Navigator.push(context, FadePage(page: BloodDonationPage())); + } + break; + case '23': + { + //health calculator need to be implemeted + } + break; + case '24': + { + Navigator.of(context).push(MaterialPageRoute( + builder: (BuildContext context) => MyWebView( + title: "HMG News", + selectedUrl: + "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live", + ))); + } + break; + case '25': + { + if (user == null) { + Navigator.push(context, FadePage(page: WelcomeLogin())); + } + } + break; + case '26': + { + Navigator.push(context, FadePage(page: ParkingPage())); + } + break; + case '27': + { + Navigator.push( + context, + FadePage( + page: ErOptions( + isAppbar: true, + ))); + } + break; + case '28': + { + Navigator.push(context, FadePage(page: AmbulanceReq())); + } + break; + case '29': + { + Navigator.push(context, FadePage(page: FindUsPage())); + } + break; + case '30': + { + launch("tel://" + result['PhoneNumbers'][0]); + } + break; + case '31': + { + Navigator.of(context).popUntil(ModalRoute.withName('/')); + } + break; + case '32': + { + Navigator.push(context, FadePage(page: AdvancePaymentPage())); + } + break; + case '33': + { + if (result['LanguageCode'] != '0') { + if (projectProvider.isArabic) { + projectProvider.changeLanguage('en'); + } else { + projectProvider.changeLanguage('ar'); + } + } + } + break; + case '34': + { + //settings page need to be implemented here + } + break; + case '35': + { + if (Platform.isIOS) { + launch( + "https://apps.apple.com/sa/app/dr-suliaman-alhabib/id733503978"); + } else { + launch( + "https://play.google.com/store/apps/details?id=com.ejada.hmg&hl=en"); + } + } + break; + case '36': + { + Navigator.of(context).pushNamed( + REGISTER, + ); + } + break; + case '37': + { + Navigator.of(context).pushNamed( + SYMPTOM_CHECKER, + ); + } + break; + case '38': + { + await this.sharedPref.setInt(IS_SEARCH_APPO, 1); + Navigator.push(context, FadePage(page: MyAppointments())); + } + break; + case '39': + { + await this.sharedPref.setInt(IS_SEARCH_APPO, 2); + Navigator.push(context, FadePage(page: MyAppointments())); + } + break; + case '40': + { + //Home health care service need to be implemeted here + } + break; + case '41': + { + Navigator.push(context, FadePage(page: PaymentService())); + } + break; + case '42': + { + //weather indicator need to be implemented here + } + break; + case '43': + { + await this.sharedPref.setInt(IS_SEARCH_APPO, 3); + Navigator.push(context, FadePage(page: MyAppointments())); + } + break; + case '44': + { + //chat need be implmented here. + } + break; + case '45': + { + launch('https://hmg.com/ir/ar/Pages/ShareInformation/home.aspx'); + } + break; + case '46': + { + launch('https://hmg.com/ir/ar/pages/home.aspx'); + } + break; case '200': { Navigator.push(context, FadePage(page: FeedbackHomePage())); @@ -499,8 +680,6 @@ class _FloatingSearchButton extends State speak(); break; } - - //searchProvider.setLisener(result); } getDoctorProfile(projectId, clinicId, doctorId, context, doctorData) { @@ -526,13 +705,14 @@ class _FloatingSearchButton extends State }); } - getDoctorsList(projectId, clinicId, context, {doctorId, doctorName}) { + getDoctorsList(projectId, clinicId, context, + {doctorId, doctorName, isNearest = false}) { List doctorsList = []; List arr = []; List arrDistance = []; DoctorsListService service = new DoctorsListService(); service - .getDoctorsList(clinicId, projectId, false, context, + .getDoctorsList(clinicId, projectId, isNearest, context, doctorId: doctorId, doctorName: doctorName) .then((res) { if (res['MessageStatus'] == 1) { @@ -620,8 +800,8 @@ class _FloatingSearchButton extends State speak() async { if (_currentLocaleId == 'en-US' && results['ReturnMessage'] != null) { - await flutterTts.setVoice("en-us-x-sfg#male_2-local"); - await flutterTts.setLanguage(_currentLocaleId); + await flutterTts.setVoice("en-us-x-sfg#male_2-local"); + await flutterTts.setLanguage(_currentLocaleId); await flutterTts.speak(results['ReturnMessage']); } else if (results['ReturnMessage_Ar'] != null) { await flutterTts.setLanguage(_currentLocaleId); @@ -648,4 +828,13 @@ class _FloatingSearchButton extends State List unique(List list) { return list.toSet().toList(); } + + getUserData() async { + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + setState(() async { + user = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + }); + } + } } From 7b6135a6c7f449e1b962e98bd31e337d1fd48f9a Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 7 Oct 2020 15:39:23 +0300 Subject: [PATCH 24/37] voice search --- .../​ health_calculators.dart | 4 ++-- lib/widgets/drawer/app_drawer_widget.dart | 19 ++++++++++--------- .../others/floating_button_search.dart | 6 +++++- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart index 56fb0428..e49b1142 100644 --- a/lib/pages/AlHabibMedicalService/​ health_calculators.dart +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -1,6 +1,6 @@ -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index ce1397f8..42d21e7a 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -7,14 +7,13 @@ import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStat import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/list/flexible_container.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; - +import 'package:smart_progress_bar/smart_progress_bar.dart'; import '../../config/size_config.dart'; import 'drawer_item_widget.dart'; @@ -328,12 +327,7 @@ class _AppDrawerState extends State { } logout() async { - // this.sharedPref.remove(USER_PROFILE); - // this.sharedPref.remove(IMEI_USER_DATA); - // this.sharedPref.remove(TOKEN); - // this.sharedPref.remove(LOGIN_TOKEN_ID); await sharedPref.clear(); - this.user = null; Navigator.of(context).pushNamed(HOME); } @@ -365,7 +359,14 @@ class _AppDrawerState extends State { this .familyFileProvider .silentLoggin(user) - .then((value) => loginAfter(value, context)); + .then((value) => loginAfter(value, context)) + .catchError((err) { + print(err); + AppToast.showErrorToast(message: err); + Navigator.of(context).pop(); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + ; } loginAfter(result, context) { diff --git a/lib/widgets/others/floating_button_search.dart b/lib/widgets/others/floating_button_search.dart index b8c8c916..92baa9d5 100644 --- a/lib/widgets/others/floating_button_search.dart +++ b/lib/widgets/others/floating_button_search.dart @@ -121,7 +121,11 @@ class _FloatingSearchButton extends State // position = Offset(250, 400); // }); }, - left: activeAnimation ? 300 : position.dx, + left: activeAnimation + ? TranslationBase.of(AppGlobal.context).locale.languageCode == 'en' + ? 300 + : 0 + : position.dx, top: activeAnimation ? -150 : position.dy, duration: activeAnimation ? const Duration(seconds: 1) From 67e3a13a95c010e1a343696cae2a4dbaf77996f5 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Thu, 8 Oct 2020 16:34:27 +0300 Subject: [PATCH 25/37] child Vaccines add new child modified --- lib/config/config.dart | 8 +- .../childvaccines/create_new_user_model.dart | 165 ++++++++++ .../childvaccines/add_new_child_service.dart | 41 ++- .../childvaccines/child_vaccines_service.dart | 39 ++- .../get_vaccinations_item_services.dart | 11 - .../user_information_service.dart | 50 ++- .../add_new_child_view_model.dart | 32 +- .../child_vaccines_view_model.dart | 16 +- .../user_information_view_model.dart | 4 +- lib/locator.dart | 1 + .../ChildVaccines/add_newchild_page.dart | 74 ++--- lib/pages/ChildVaccines/child_page.dart | 285 ++++++++++-------- .../ChildVaccines/child_vaccines_page.dart | 7 +- 13 files changed, 473 insertions(+), 260 deletions(-) create mode 100644 lib/core/model/childvaccines/create_new_user_model.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 2f497de2..e45d5cf8 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -69,14 +69,16 @@ const GET_FINDUS_REQUEST= const GET_LIVECHAT_REQUEST= 'Services/Patients.svc/REST/GetPatientICProjects'; -///babyInformation -const GET_BABYINFORMATION_REQUEST= - 'Services/Community.svc/REST/GetBabyByUserID'; +///Get Baby By User ID +const GET_BABY_BY_USER_ID= 'Services/Community.svc/REST/GetBabyByUserID'; ///userInformation const GET_USERINFORMATION_REQUEST= 'Services/Community.svc/REST/GetUserInformation_New'; +///newUserId +const GET_NEW_USER_REQUEST= + 'Services/Community.svc/REST/CreateNewUser_New'; ///addNewChild const GET_NEWCHILD_REQUEST= diff --git a/lib/core/model/childvaccines/create_new_user_model.dart b/lib/core/model/childvaccines/create_new_user_model.dart new file mode 100644 index 00000000..980567e2 --- /dev/null +++ b/lib/core/model/childvaccines/create_new_user_model.dart @@ -0,0 +1,165 @@ +class CreateNewUser_New { + Null date; + int languageID; + int serviceName; + Null time; + Null androidLink; + Null authenticationTokenID; + Null data; + bool dataw; + int dietType; + Null errorCode; + Null errorEndUserMessage; + Null errorEndUserMessageN; + Null errorMessage; + int errorType; + int foodCategory; + Null iOSLink; + bool isAuthenticated; + int mealOrderStatus; + int mealType; + int messageStatus; + int numberOfResultRecords; + Null patientBlodType; + Null successMsg; + Null successMsgN; + Null htmlResult; + bool isHMGPatient; + bool isRegister; + bool isSendSMS; + Null listBabyInformationModel; + Null listBabyNeedReminderModel; + Null listCreateVaccinationTableModel; + Null listHisPatientModel; + Null listUserInformationModel; + Null listUserInformationModelNew; + Null listVaccinationTableModel; + Null tokinID; + int userID; + Null verificationCode; + + CreateNewUser_New( + {this.date, + this.languageID, + this.serviceName, + this.time, + this.androidLink, + this.authenticationTokenID, + this.data, + this.dataw, + this.dietType, + this.errorCode, + this.errorEndUserMessage, + this.errorEndUserMessageN, + this.errorMessage, + this.errorType, + this.foodCategory, + this.iOSLink, + this.isAuthenticated, + this.mealOrderStatus, + this.mealType, + this.messageStatus, + this.numberOfResultRecords, + this.patientBlodType, + this.successMsg, + this.successMsgN, + this.htmlResult, + this.isHMGPatient, + this.isRegister, + this.isSendSMS, + this.listBabyInformationModel, + this.listBabyNeedReminderModel, + this.listCreateVaccinationTableModel, + this.listHisPatientModel, + this.listUserInformationModel, + this.listUserInformationModelNew, + this.listVaccinationTableModel, + this.tokinID, + this.userID, + this.verificationCode}); + + CreateNewUser_New.fromJson(Map json) { + date = json['Date']; + languageID = json['LanguageID']; + serviceName = json['ServiceName']; + time = json['Time']; + androidLink = json['AndroidLink']; + authenticationTokenID = json['AuthenticationTokenID']; + data = json['Data']; + dataw = json['Dataw']; + dietType = json['DietType']; + errorCode = json['ErrorCode']; + errorEndUserMessage = json['ErrorEndUserMessage']; + errorEndUserMessageN = json['ErrorEndUserMessageN']; + errorMessage = json['ErrorMessage']; + errorType = json['ErrorType']; + foodCategory = json['FoodCategory']; + iOSLink = json['IOSLink']; + isAuthenticated = json['IsAuthenticated']; + mealOrderStatus = json['MealOrderStatus']; + mealType = json['MealType']; + messageStatus = json['MessageStatus']; + numberOfResultRecords = json['NumberOfResultRecords']; + patientBlodType = json['PatientBlodType']; + successMsg = json['SuccessMsg']; + successMsgN = json['SuccessMsgN']; + htmlResult = json['HtmlResult']; + isHMGPatient = json['IsHMGPatient']; + isRegister = json['IsRegister']; + isSendSMS = json['IsSendSMS']; + listBabyInformationModel = json['List_BabyInformationModel']; + listBabyNeedReminderModel = json['List_BabyNeedReminderModel']; + listCreateVaccinationTableModel = json['List_CreateVaccinationTableModel']; + listHisPatientModel = json['List_His_PatientModel']; + listUserInformationModel = json['List_UserInformationModel']; + listUserInformationModelNew = json['List_UserInformationModel_New']; + listVaccinationTableModel = json['List_VaccinationTableModel']; + tokinID = json['TokinID']; + userID = json['UserID']; + verificationCode = json['VerificationCode']; + } + + Map toJson() { + final Map data = new Map(); + data['Date'] = this.date; + data['LanguageID'] = this.languageID; + data['ServiceName'] = this.serviceName; + data['Time'] = this.time; + data['AndroidLink'] = this.androidLink; + data['AuthenticationTokenID'] = this.authenticationTokenID; + data['Data'] = this.data; + data['Dataw'] = this.dataw; + data['DietType'] = this.dietType; + data['ErrorCode'] = this.errorCode; + data['ErrorEndUserMessage'] = this.errorEndUserMessage; + data['ErrorEndUserMessageN'] = this.errorEndUserMessageN; + data['ErrorMessage'] = this.errorMessage; + data['ErrorType'] = this.errorType; + data['FoodCategory'] = this.foodCategory; + data['IOSLink'] = this.iOSLink; + data['IsAuthenticated'] = this.isAuthenticated; + data['MealOrderStatus'] = this.mealOrderStatus; + data['MealType'] = this.mealType; + data['MessageStatus'] = this.messageStatus; + data['NumberOfResultRecords'] = this.numberOfResultRecords; + data['PatientBlodType'] = this.patientBlodType; + data['SuccessMsg'] = this.successMsg; + data['SuccessMsgN'] = this.successMsgN; + data['HtmlResult'] = this.htmlResult; + data['IsHMGPatient'] = this.isHMGPatient; + data['IsRegister'] = this.isRegister; + data['IsSendSMS'] = this.isSendSMS; + data['List_BabyInformationModel'] = this.listBabyInformationModel; + data['List_BabyNeedReminderModel'] = this.listBabyNeedReminderModel; + data['List_CreateVaccinationTableModel'] = + this.listCreateVaccinationTableModel; + data['List_His_PatientModel'] = this.listHisPatientModel; + data['List_UserInformationModel'] = this.listUserInformationModel; + data['List_UserInformationModel_New'] = this.listUserInformationModelNew; + data['List_VaccinationTableModel'] = this.listVaccinationTableModel; + data['TokinID'] = this.tokinID; + data['UserID'] = this.userID; + data['VerificationCode'] = this.verificationCode; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/add_new_child_service.dart b/lib/core/service/childvaccines/add_new_child_service.dart index 22a081a3..5e4a4d86 100644 --- a/lib/core/service/childvaccines/add_new_child_service.dart +++ b/lib/core/service/childvaccines/add_new_child_service.dart @@ -1,26 +1,41 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import '../base_service.dart'; class CreteNewBabyService extends BaseService { List createNewBabyModelList = List(); + List userModelList = List(); + List newUserModelList = List(); - Future getCreateNewBabyOrders({ CreateNewBaby newChild}) async { + + Future getCreateNewBabyOrders({CreateNewBaby newChild,int userID}) async { hasError = false; + await getUser(); + Map body = Map.from(newChild.toJson()); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['UserID'] = userID; + body['AlertBy'] = 2; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + + body['isDentalAllowedBackend'] = false; + await baseAppClient.post(GET_NEWCHILD_REQUEST, onSuccess: (dynamic response, int statusCode) { - createNewBabyModelList.clear(); - - response['List_UserInformationModel_New'].forEach((vital) { - createNewBabyModelList.add( - CreateNewBaby.fromJson(vital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: newChild.toJson()); + var asd =""; + }, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } - -} \ No newline at end of file +} diff --git a/lib/core/service/childvaccines/child_vaccines_service.dart b/lib/core/service/childvaccines/child_vaccines_service.dart index 75a07338..09256f47 100644 --- a/lib/core/service/childvaccines/child_vaccines_service.dart +++ b/lib/core/service/childvaccines/child_vaccines_service.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; @@ -8,22 +9,17 @@ import '../base_service.dart'; class ChildVaccinesService extends BaseService { List babyInformationModelList = List(); List userInformationModelList = List(); + int userID = 0; - Map body = Map(); Future getAllBabyInformationOrders() async { + Map body = Map(); hasError = false; - body['isDentalAllowedBackend'] = false; body['IsLogin'] = true; - - //body['UserID'] = userInformationModelList[0].userID;//AuthenticatedUser.fromJson(json['List'][0] //babyInformationModelList[0].userID; - body['UserID'] = 46013;//42843; - - - await baseAppClient.post(GET_BABYINFORMATION_REQUEST, + body['UserID'] = userID; + await baseAppClient.post(GET_BABY_BY_USER_ID, onSuccess: (dynamic response, int statusCode) { babyInformationModelList.clear(); - response['List_BabyInformationModel'].forEach((vital) { babyInformationModelList.add(List_BabyInformationModel.fromJson(vital)); }); @@ -32,4 +28,29 @@ class ChildVaccinesService extends BaseService { super.error = error; }, body: body); } + + Future getNewUserOrders() async { + Map body = Map(); + hasError = false; + await getUser(); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['UserID'] = userID; + body['AlertBy'] = 2; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + body['isDentalAllowedBackend'] = false; + + await baseAppClient.post(GET_NEW_USER_REQUEST, + onSuccess: (dynamic response, int statusCode) { + userID = response['UserID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } } diff --git a/lib/core/service/childvaccines/get_vaccinations_item_services.dart b/lib/core/service/childvaccines/get_vaccinations_item_services.dart index f7fe4662..5ff936af 100644 --- a/lib/core/service/childvaccines/get_vaccinations_item_services.dart +++ b/lib/core/service/childvaccines/get_vaccinations_item_services.dart @@ -11,17 +11,6 @@ class GetVccinationsItemsService extends BaseService { Future getaccinationsitemOrders() async { hasError = false; - // await getUser(); - // body['BabyName']="fffffffffff eeeeeeeeeeeeee"; - // body['DOB'] = "/Date(1585774800000+0300)/"; - // body['EmailAddress'] = user.emailAddress; - // body['isDentalAllowedBackend'] = false; - // body['SendEmail'] = false; - // body['IsLogin'] =true; - - - - await baseAppClient.post(GET_TABLE_REQUEST, onSuccess: (dynamic response, int statusCode) { getVaccinationsItemModelList.clear(); diff --git a/lib/core/service/childvaccines/user_information_service.dart b/lib/core/service/childvaccines/user_information_service.dart index 7651ef0f..0628920c 100644 --- a/lib/core/service/childvaccines/user_information_service.dart +++ b/lib/core/service/childvaccines/user_information_service.dart @@ -1,41 +1,35 @@ - import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import '../base_service.dart'; -class UserInformationService extends BaseService{ - +class UserInformationService extends BaseService { List userInformationModelList = List(); Map body = Map(); - - Future getUserInformationOrders() async { hasError = false; - await getUser(); - body['CreatedBy'] = 102; - body['EditedBy'] = 102; - body['EmailAddress'] = user.emailAddress; - body['IsLogin'] =true; - body['LogInTokenID'] = 'ZBGoQFUG50eQJd6Y7u1ykA=='; - body['MobileNumber'] = user.mobileNumber; - body['NationalID'] = user.nationalityID; - body['ZipCode'] = user.zipCode; - body['isDentalAllowedBackend'] = false; - + await getUser(); + body['CreatedBy'] = 102; + body['EditedBy'] = 102; + body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + body['isDentalAllowedBackend'] = false; await baseAppClient.post(GET_USERINFORMATION_REQUEST, onSuccess: (dynamic response, int statusCode) { - userInformationModelList.clear(); - - response['List_UserInformationModel_New'].forEach((vital) { - userInformationModelList.add(List_UserInformationModel.fromJson(vital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + userInformationModelList.clear(); + + response['List_UserInformationModel_New'].forEach((vital) { + userInformationModelList.add(List_UserInformationModel.fromJson(vital)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } - - -} \ No newline at end of file +} diff --git a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart index 26355bd7..f0b55caa 100644 --- a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart +++ b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart @@ -1,28 +1,36 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; -class AddNewChildViewModel extends BaseViewModel{ +class AddNewChildViewModel extends BaseViewModel { CreteNewBabyService _creteNewBabyService = locator(); - - - - List get creteNewBabyModelList=> _creteNewBabyService.createNewBabyModelList; - getNewBabyOrders({ CreateNewBaby newChild}) async { + ChildVaccinesService _childVaccinesService = locator(); + bool isAdded = false; + ///create new baby + createNewBabyOrders({ CreateNewBaby newChild}) async { setState(ViewState.Busy); - - await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild); - - if ( _creteNewBabyService.hasError) { - error = _creteNewBabyService.error; + await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild, userID: _childVaccinesService.userID); + if (_creteNewBabyService.hasError) { + error = _creteNewBabyService.error; setState(ViewState.Error); - } else + } else { + isAdded = true; setState(ViewState.Idle); + // await _childVaccinesService.getAllBabyInformationOrders(); + // if (_childVaccinesService.hasError) { + // error = _childVaccinesService.error; + // setState(ViewState.Error); + // } else{ + // + // } + } } + } diff --git a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart index e6a8ca60..c19d9168 100644 --- a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart +++ b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart @@ -7,18 +7,22 @@ import '../../../locator.dart'; import '../base_view_model.dart'; class ChildVaccinesViewModel extends BaseViewModel{ - - ChildVaccinesService _childVaccinesService = locator(); + List get babyInformationModelList=> _childVaccinesService.babyInformationModelList; - - List get babyInformationModelList=> _childVaccinesService.babyInformationModelList;//BabyInformationModelList; - getBabyInformatioRequestOrders() async { + getNewUserOrders() async { setState(ViewState.Busy); + await _childVaccinesService.getNewUserOrders(); + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else + getBabyInformatioRequestOrders(); + } + getBabyInformatioRequestOrders() async { await _childVaccinesService.getAllBabyInformationOrders(); - if (_childVaccinesService.hasError) { error = _childVaccinesService.error; setState(ViewState.Error); diff --git a/lib/core/viewModels/child_vaccines/user_information_view_model.dart b/lib/core/viewModels/child_vaccines/user_information_view_model.dart index c362ef73..43269f42 100644 --- a/lib/core/viewModels/child_vaccines/user_information_view_model.dart +++ b/lib/core/viewModels/child_vaccines/user_information_view_model.dart @@ -11,11 +11,9 @@ class UserInformationViewModel extends BaseViewModel { List get userInformationModelList => _userInformationService.userInformationModelList; - getUserInformatioRequestOrders() async { + getUserInformationRequestOrders() async { setState(ViewState.Busy); - await _userInformationService.getUserInformationOrders(); - if (_userInformationService.hasError) { error = _userInformationService.error; setState(ViewState.Error); diff --git a/lib/locator.dart b/lib/locator.dart index 46b97fce..734e281f 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -123,6 +123,7 @@ void setupLocator() { locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => UserInformationService()); locator.registerLazySingleton(() => CreteNewBabyService()); + locator.registerLazySingleton(() => VaccinationTableService()); diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index f2970cad..a8e97b60 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -1,6 +1,7 @@ import 'package:device_calendar/device_calendar.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; @@ -19,8 +20,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; - - enum Gender { Male, Female, NON } enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } @@ -56,6 +55,7 @@ class AddNewChildPage extends StatefulWidget { DateTime.now().day, (hour * count))); } } + @override _AddNewChildPageState createState() => _AddNewChildPageState(); } @@ -75,15 +75,17 @@ class _AddNewChildPageState extends State { TextEditingController _notesTextController = TextEditingController(); BeneficiaryType beneficiaryType = BeneficiaryType.NON; Gender gender = Gender.Male; + CreateNewUser_New newUserChild = CreateNewUser_New(); + //ChildVaccinesViewModel addvancedModel = ChildVaccinesViewModel(); List_BabyInformationModel addvancedModel = List_BabyInformationModel(); - CreateNewBaby newChild=CreateNewBaby(); - List_UserInformationModel informationModel =List_UserInformationModel(); + CreateNewBaby newChild = CreateNewBaby(); + List_UserInformationModel informationModel = List_UserInformationModel(); @override Widget build(BuildContext context) { return BaseView( - builder: (_,model,w)=> AppScaffold( + builder: (_, model, w) => AppScaffold( isShowAppBar: true, appBarTitle: "Vaccintion", body: SingleChildScrollView( @@ -97,7 +99,8 @@ class _AddNewChildPageState extends State { height: 50, ), Texts( - "Add the child's information below to recieve the schedule of vaccinations.", //+model.user.firstName, + "Add the child's information below to recieve the schedule of vaccinations.", + //+model.user.firstName, textAlign: TextAlign.center, ), SizedBox( @@ -139,13 +142,13 @@ class _AddNewChildPageState extends State { width: 170, child: SecondaryButton( textColor: - checkedValue == 1 ? Colors.white : Colors.black, + checkedValue == 1 ? Colors.white : Colors.black, color: checkedValue == 1 ? Colors.red : Colors.white, label: "Male", // onTap: () { - // bloodDetails.city=_selectedHospital.toString(); + setState(() { checkedValue = 1; print("checkedValue=" + checkedValue.toString()); @@ -160,7 +163,7 @@ class _AddNewChildPageState extends State { width: 170, child: SecondaryButton( textColor: - checkedValue == 2 ? Colors.white : Colors.black, + checkedValue == 2 ? Colors.white : Colors.black, color: checkedValue == 2 ? Colors.red : Colors.white, label: "Female", // @@ -220,9 +223,8 @@ class _AddNewChildPageState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Texts(//getStartDay() - // DateUtil.yearMonthDay(DateTime.now()) - getStartDay() - ), + // DateUtil.yearMonthDay(DateTime.now()) + getStartDay()), Icon( Icons.calendar_today, color: Colors.black, @@ -248,45 +250,29 @@ class _AddNewChildPageState extends State { color: checkedValue == false ? Colors.white24 : Color.fromRGBO( - 63, - 72, - 74, - 1, - ), + 63, + 72, + 74, + 1, + ), label: "Add", // - onTap: () { - - newChild.babyName = - _firstTextController.text + " " + _secondTextController.text; + onTap: () async{ + newChild.babyName = _firstTextController.text + " " + _secondTextController.text; newChild.gender = checkedValue.toString(); - newChild.strDOB=getStartDay() ; - newChild.alertBy=addvancedModel.alertBy; - newChild.createdBy=informationModel.createdBy ; - newChild.editedBy=informationModel.createdBy; - newChild.tempValue=true; - // newChild.userID=46013;//informationModel.userID; - newChild.isLogin=true; - //newChild.tokenID='qMgbP94U23RkXtWWT0Sw=='; - //'ZBGoQFUG50eQJd6Y7u1ykA=='; - - - model.getNewBabyOrders(newChild: newChild); - - + newChild.strDOB = getStartDay(); + newChild.tempValue = true; + newChild.isLogin = true; + await model.createNewBabyOrders(newChild: newChild); + if(model.isAdded){ AppToast.showSuccessToast(message: "Record Added"); - //============ - Navigator.push( - context, - FadePage( - page: ChildPage(), + Navigator.pop(context,model.isAdded); + }else{ - ), - ); - //============== + //TODO handling error + } - // bloodDetails. }, ), ), diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index 6a937aad..becd086f 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -12,139 +12,172 @@ import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class ChildPage extends StatefulWidget { - - @override _ChildPageState createState() => _ChildPageState(); } -class _ChildPageState extends State with SingleTickerProviderStateMixin { +class _ChildPageState extends State + with SingleTickerProviderStateMixin { @override Widget build(BuildContext context) { - var checkedValue= true; + var checkedValue = true; return BaseView( - onModelReady: (model) => model.getBabyInformatioRequestOrders(),//model.getCOC(),getFindUsRequestOrders() - builder: (_, model, widget) => AppScaffold( - isShowAppBar: true, - appBarTitle: " Vaccination", - baseViewModel: model, - body: SingleChildScrollView( - child: Container( - margin: EdgeInsets.only(left: 15,right: 15,top: 70), - child: Column( - children: [ - ...List.generate(model.babyInformationModelList.length, (index) => - Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - - ), - padding: EdgeInsets.all(12), + onModelReady: (model) => model.getNewUserOrders(), + builder: (_, model, widget) => AppScaffold( + isShowAppBar: true, + appBarTitle: " Vaccination", + baseViewModel: model, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 15, right: 15, top: 70), + child: Column( + children: [ + ...List.generate( + model.babyInformationModelList.length, + (index) => Container( + margin: EdgeInsets.only( + left: 0, right: 0, bottom: 20), + + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all( + color: Colors.white, width: 0.5), + borderRadius: + BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + padding: EdgeInsets.all(12), + width: double.infinity, + child: Column( + children: [ + Row(children: [ + Texts("CHILD NAME"), + ]), + Row(children: [ + Texts(model + .babyInformationModelList[index] + .babyName + .trim()), + ]), + Row(children: [ + IconButton( + icon: Image.asset(model + .babyInformationModelList[ + index] + .gender == + 1 + ? 'assets/images/new-design/male.png' + : 'assets/images/new-design/female.png'), + tooltip: '', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts(model + .babyInformationModelList[index] + .genderDescription), + IconButton( + icon: Icon( + Icons.remove_red_eye, + color: Colors.red, + ), + tooltip: 'Increase volume by 10', + onPressed: () { + Navigator.push( + context, + FadePage( + page: VaccinationTablePage(), + + //ChildPage(babyInformationModelList:model.BabyInformationModelList) + // HospitalsPage( + // findusHospitalModelList: model.FindusHospitalModelList, + // ) + ), + ); + // setState(() { + // // _volume += 10; + // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + // }); + }, + ) + ]), + Row(children: [ + Texts("Birthday"), + ]), + Row(children: [ + IconButton( + icon: new Image.asset( + 'assets/images/new-design/calender-secondary.png'), + tooltip: 'Increase volume by 10', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts(DateUtil.yearMonthDay(model + .babyInformationModelList[index] + .dOB)), + ]), + Row(children: [ + IconButton( + icon: new Image.asset( + 'assets/images/new-design/garbage.png'), + tooltip: '', + onPressed: () { + setState(() { + // _volume += 10; + // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); + }, + ), + Texts("Birthday"), + ]), + SizedBox( + height: 12, + ), + ], + ), + + ), + + + ) + ], + )) + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - child: Column( - - children: [ - Row(children:[Texts("CHILD NAME"),]), - Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), - - Row( - children: [IconButton( - icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), - tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - Texts(model.babyInformationModelList[index].genderDescription), - IconButton( - icon: Icon(Icons.remove_red_eye,color: Colors.red,), - tooltip: 'Increase volume by 10', - onPressed: () { - Navigator.push( - context, - FadePage( - page: VaccinationTablePage(), - - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) - - ), - ); - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - }, - )] - ), - Row(children:[Texts("Birthday"),]), - Row(children:[IconButton( - icon: new Image.asset('assets/images/new-design/calender-secondary.png'), - tooltip: 'Increase volume by 10', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), - Row(children:[IconButton( - icon: new Image.asset('assets/images/new-design/garbage.png'), - tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - Texts("Birthday"),]), - ], - ) - - - ) - - ) - - ], - - - ) - ) - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.12, - width: double.infinity, - - padding: EdgeInsets.all(12), - child: SecondaryButton( - textColor: Colors.white, - color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), - label: "ADD NEW CHILD ", - // - onTap: () => Navigator.push( - context, - FadePage( - page: AddNewChildPage(), - - - ), - ), - - - ), - ), - ) - ); + padding: EdgeInsets.all(12), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue == false + ? Colors.white24 + : Color.fromRGBO( + 63, + 72, + 74, + 1, + ), + label: "ADD NEW CHILD ", + // + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => AddNewChildPage(), + ), + ).then((value) { + if (value) model.getNewUserOrders(); + }); + }, + ), + ), + )); } } diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index ba4589a9..f8fe7b74 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -29,7 +29,7 @@ class _ChildVaccinesPageState extends State Widget build(BuildContext context) { return BaseView( - onModelReady: (model) => model.getUserInformatioRequestOrders(), + onModelReady: (model) => model.getUserInformationRequestOrders(), builder: (_, model, w) => AppScaffold( isShowAppBar: true, baseViewModel: model, @@ -132,10 +132,7 @@ class _ChildVaccinesPageState extends State FadePage( page: ChildPage(), - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) + ), ), From 8ddec0ad99112cc5aa9b9ba852908e85edf55342 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 11 Oct 2020 08:37:05 +0300 Subject: [PATCH 26/37] child Vaccines add new child modified --- lib/pages/ChildVaccines/child_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index becd086f..9f9f933c 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -47,7 +47,7 @@ class _ChildPageState extends State color: Colors.white, ), padding: EdgeInsets.all(12), - width: double.infinity, + width: 200,//double.infinity, child: Column( children: [ Row(children: [ From 06416b49345000080c8955eca05b79cf2a66baa6 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 11 Oct 2020 14:32:14 +0300 Subject: [PATCH 27/37] add Not authenticated Page --- assets/images/Wifi-AR.png | Bin 0 -> 18245 bytes assets/images/wifi-EN.png | Bin 0 -> 19261 bytes lib/config/config.dart | 4 +- lib/config/localized_values.dart | 11 +- lib/core/enum/Ambulate.dart | 41 +++- lib/core/enum/OrderService.dart | 22 ++ lib/core/model/er/PickUpRequestPresOrder.dart | 204 ++++++++++++++++++ lib/core/service/client/base_app_client.dart | 4 +- lib/core/service/er/am_service.dart | 49 ++++- lib/core/service/medical/medical_service.dart | 19 ++ lib/core/viewModels/base_view_model.dart | 1 + .../viewModels/er/am_request_view_model.dart | 30 ++- .../viewModels/medical/labs_view_model.dart | 86 ++++---- .../medical/medical_view_model.dart | 19 +- lib/pages/ErService/AmbulanceReq.dart | 21 +- .../AmbulanceRequestIndex.dart | 8 +- .../BillAmount.dart | 19 +- .../PickupLocation.dart | 200 ++++++++++++----- .../SelectTransportationMethod.dart | 23 +- .../Summary.dart | 0 lib/pages/ErService/OrderLogPage.dart | 62 ++++++ lib/pages/base/base_view.dart | 4 +- lib/pages/landing/home_page.dart | 1 + lib/pages/login/confirm-login.dart | 1 + lib/pages/login/forgot-password.dart | 1 + lib/pages/login/login-type.dart | 1 + lib/pages/login/login.dart | 1 + lib/pages/login/register-info.dart | 1 + lib/pages/login/register.dart | 1 + lib/pages/login/welcome.dart | 1 + lib/pages/medical/labs/labs_home_page.dart | 1 + lib/pages/medical/medical_profile_page.dart | 1 + .../radiology/radiology_home_page.dart | 1 + lib/uitl/ProgressDialog.dart | 32 ++- lib/uitl/translations_delegate_base.dart | 4 + lib/widgets/others/OrderLogItem.dart | 32 +++ lib/widgets/others/app_scaffold_widget.dart | 95 ++++---- lib/widgets/others/not_auh_page.dart | 79 +++++++ pubspec.yaml | 3 + 39 files changed, 884 insertions(+), 199 deletions(-) create mode 100644 assets/images/Wifi-AR.png create mode 100644 assets/images/wifi-EN.png create mode 100644 lib/core/enum/OrderService.dart create mode 100644 lib/core/model/er/PickUpRequestPresOrder.dart rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/AmbulanceRequestIndex.dart (89%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/BillAmount.dart (96%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/PickupLocation.dart (67%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/SelectTransportationMethod.dart (92%) rename lib/pages/ErService/{ => AmbulanceRequestIndexPages}/Summary.dart (100%) create mode 100644 lib/pages/ErService/OrderLogPage.dart create mode 100644 lib/widgets/others/OrderLogItem.dart create mode 100644 lib/widgets/others/not_auh_page.dart diff --git a/assets/images/Wifi-AR.png b/assets/images/Wifi-AR.png new file mode 100644 index 0000000000000000000000000000000000000000..a8e2d9af3fd23ab15c89bc14bb4602cf257c7567 GIT binary patch literal 18245 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 literal 0 HcmV?d00001 diff --git a/assets/images/wifi-EN.png b/assets/images/wifi-EN.png new file mode 100644 index 0000000000000000000000000000000000000000..5711925c73665a7cbccd0bba985c4b9acafad527 GIT binary patch literal 19261 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 jfq{X6fnh}9{{> localizedValues = { "All":{"en":"All","ar":"الكل"}, "QuestionHere":{"en":"Enter the question here...","ar":"اضف الاستفسار هنا"}, "ViewDoctorResponses":{"en":"View Doctor Responses","ar":"الاطلاع على ردود الأطباء"}, - + "ServiceInformationButton":{"en":"LOGIN / REGISTER","ar":"دخول / تسجيل"}, + "ServiceInformationTitle":{"en":"Service Information","ar":"معلومات الخدمة"}, + "info-lab": { + "en": "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.", + "ar": "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية." + }, + "info-radiology": { + "en": "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.", + "ar": "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل." + }, }; diff --git a/lib/core/enum/Ambulate.dart b/lib/core/enum/Ambulate.dart index 059a281c..f8b2e8be 100644 --- a/lib/core/enum/Ambulate.dart +++ b/lib/core/enum/Ambulate.dart @@ -6,22 +6,55 @@ extension SelectedAmbulate on Ambulate { String getAmbulateTitle(BuildContext context) { switch (this) { case Ambulate.Wheelchair: - // TODO: Handle this case. return 'Wheelchair'; break; case Ambulate.Walker: - // TODO: Handle this case. return 'Walker'; break; case Ambulate.Stretcher: - // TODO: Handle this case. return 'Stretcher'; break; case Ambulate.None: - // TODO: Handle this case. return 'None'; break; } return 'None'; } + + int selectAmbulateNumber() { + switch (this) { + case Ambulate.Wheelchair: + return 0; + break; + case Ambulate.Walker: + return 1; + break; + case Ambulate.Stretcher: + return 2; + break; + case Ambulate.None: + return 3; + break; + } + return 3; + } + + Ambulate getAmbulateById(int id) { + switch (id) { + case 0: + return Ambulate.Wheelchair; + break; + case 1: + return Ambulate.Walker; + break; + case 2: + return Ambulate.Stretcher; + break; + case 3: + return Ambulate.None; + break; + } + + return Ambulate.None; + } } diff --git a/lib/core/enum/OrderService.dart b/lib/core/enum/OrderService.dart new file mode 100644 index 00000000..e6ce24eb --- /dev/null +++ b/lib/core/enum/OrderService.dart @@ -0,0 +1,22 @@ +enum OrderService { AMBULANCE } + +extension SelectedOrderService on OrderService { + int getIdOrderService() { + switch (this) { + case OrderService.AMBULANCE: + return 4; + break; + } + return 4; + } + + OrderService getOrderServiceById(int id) { + switch (id) { + case 4: + return OrderService.AMBULANCE; + break; + } + + return OrderService.AMBULANCE; + } +} diff --git a/lib/core/model/er/PickUpRequestPresOrder.dart b/lib/core/model/er/PickUpRequestPresOrder.dart new file mode 100644 index 00000000..9ce3e678 --- /dev/null +++ b/lib/core/model/er/PickUpRequestPresOrder.dart @@ -0,0 +1,204 @@ +class PickUpRequestPresOrder { + int id; + int presOrderID; + String createDate; + String lastEditDate; + int createdBy; + int lastEditBy; + bool isActive; + String requestNo; + int requesterId; + int direction; + bool haveAppointment; + dynamic appointmentId; + int tripType; + int pickupUrgency; + String pickupDateTime; + dynamic pickupLocationId; + int pickupSpot; + dynamic dropoffLocationId; + int transportationMethodId; + int cost; + double vAT; + double totalPrice; + int amountCollected; + int selectedAmbulate; + String requesterNote; + int status; + int paymentStatus; + dynamic rejectReason; + int visibility; + dynamic durationId; + dynamic imageId; + String requesterFileNo; + String requesterMobileNo; + bool requesterIsOutSA; + String pickupLocationLongitude; + String pickupLocationLattitude; + String dropoffLocationLongitude; + String dropoffLocationLattitude; + dynamic appointmentClinicName; + dynamic appointmentDoctorName; + dynamic appointmentBranch; + dynamic appointmentTime; + String pickupLocationName; + String dropoffLocationName; + String title; + String titleAR; + String ambulateDescription; + String ambulateDescriptionN; + + PickUpRequestPresOrder( + {this.id, + this.presOrderID, + this.createDate, + this.lastEditDate, + this.createdBy, + this.lastEditBy, + this.isActive, + this.requestNo, + this.requesterId, + this.direction, + this.haveAppointment, + this.appointmentId, + this.tripType, + this.pickupUrgency, + this.pickupDateTime, + this.pickupLocationId, + this.pickupSpot, + this.dropoffLocationId, + this.transportationMethodId, + this.cost, + this.vAT, + this.totalPrice, + this.amountCollected, + this.selectedAmbulate, + this.requesterNote, + this.status, + this.paymentStatus, + this.rejectReason, + this.visibility, + this.durationId, + this.imageId, + this.requesterFileNo, + this.requesterMobileNo, + this.requesterIsOutSA, + this.pickupLocationLongitude, + this.pickupLocationLattitude, + this.dropoffLocationLongitude, + this.dropoffLocationLattitude, + this.appointmentClinicName, + this.appointmentDoctorName, + this.appointmentBranch, + this.appointmentTime, + this.pickupLocationName, + this.dropoffLocationName, + this.title, + this.titleAR, + this.ambulateDescription, + this.ambulateDescriptionN}); + + PickUpRequestPresOrder.fromJson(Map json) { + id = json['Id']; + presOrderID = json['PresOrderID']; + createDate = json['CreateDate']; + lastEditDate = json['LastEditDate']; + createdBy = json['CreatedBy']; + lastEditBy = json['LastEditBy']; + isActive = json['IsActive']; + requestNo = json['RequestNo']; + requesterId = json['RequesterId']; + direction = json['Direction']; + haveAppointment = json['HaveAppointment']; + appointmentId = json['AppointmentId']; + tripType = json['TripType']; + pickupUrgency = json['PickupUrgency']; + pickupDateTime = json['PickupDateTime']; + pickupLocationId = json['PickupLocationId']; + pickupSpot = json['PickupSpot']; + dropoffLocationId = json['DropoffLocationId']; + transportationMethodId = json['TransportationMethodId']; + cost = json['Cost']; + vAT = json['VAT']; + totalPrice = json['TotalPrice']; + amountCollected = json['AmountCollected']; + selectedAmbulate = json['SelectedAmbulate']; + requesterNote = json['RequesterNote']; + status = json['Status']; + paymentStatus = json['PaymentStatus']; + rejectReason = json['RejectReason']; + visibility = json['Visibility']; + durationId = json['DurationId']; + imageId = json['ImageId']; + requesterFileNo = json['RequesterFileNo']; + requesterMobileNo = json['RequesterMobileNo']; + requesterIsOutSA = json['RequesterIsOutSA']; + pickupLocationLongitude = json['PickupLocationLongitude']; + pickupLocationLattitude = json['PickupLocationLattitude']; + dropoffLocationLongitude = json['DropoffLocationLongitude']; + dropoffLocationLattitude = json['DropoffLocationLattitude']; + appointmentClinicName = json['AppointmentClinicName']; + appointmentDoctorName = json['AppointmentDoctorName']; + appointmentBranch = json['AppointmentBranch']; + appointmentTime = json['AppointmentTime']; + pickupLocationName = json['PickupLocationName']; + dropoffLocationName = json['DropoffLocationName']; + title = json['Title']; + titleAR = json['TitleAR']; + ambulateDescription = json['AmbulateDescription']; + ambulateDescriptionN = json['AmbulateDescriptionN']; + } + + Map toJson() { + final Map data = new Map(); + data['Id'] = this.id; + data['PresOrderID'] = this.presOrderID; + data['CreateDate'] = this.createDate; + data['LastEditDate'] = this.lastEditDate; + data['CreatedBy'] = this.createdBy; + data['LastEditBy'] = this.lastEditBy; + data['IsActive'] = this.isActive; + data['RequestNo'] = this.requestNo; + data['RequesterId'] = this.requesterId; + data['Direction'] = this.direction; + data['HaveAppointment'] = this.haveAppointment; + data['AppointmentId'] = this.appointmentId; + data['TripType'] = this.tripType; + data['PickupUrgency'] = this.pickupUrgency; + data['PickupDateTime'] = this.pickupDateTime; + data['PickupLocationId'] = this.pickupLocationId; + data['PickupSpot'] = this.pickupSpot; + data['DropoffLocationId'] = this.dropoffLocationId; + data['TransportationMethodId'] = this.transportationMethodId; + data['Cost'] = this.cost; + data['VAT'] = this.vAT; + data['TotalPrice'] = this.totalPrice; + data['AmountCollected'] = this.amountCollected; + data['SelectedAmbulate'] = this.selectedAmbulate; + data['RequesterNote'] = this.requesterNote; + data['Status'] = this.status; + data['PaymentStatus'] = this.paymentStatus; + data['RejectReason'] = this.rejectReason; + data['Visibility'] = this.visibility; + data['DurationId'] = this.durationId; + data['ImageId'] = this.imageId; + data['RequesterFileNo'] = this.requesterFileNo; + data['RequesterMobileNo'] = this.requesterMobileNo; + data['RequesterIsOutSA'] = this.requesterIsOutSA; + data['PickupLocationLongitude'] = this.pickupLocationLongitude; + data['PickupLocationLattitude'] = this.pickupLocationLattitude; + data['DropoffLocationLongitude'] = this.dropoffLocationLongitude; + data['DropoffLocationLattitude'] = this.dropoffLocationLattitude; + data['AppointmentClinicName'] = this.appointmentClinicName; + data['AppointmentDoctorName'] = this.appointmentDoctorName; + data['AppointmentBranch'] = this.appointmentBranch; + data['AppointmentTime'] = this.appointmentTime; + data['PickupLocationName'] = this.pickupLocationName; + data['DropoffLocationName'] = this.dropoffLocationName; + data['Title'] = this.title; + data['TitleAR'] = this.titleAR; + data['AmbulateDescription'] = this.ambulateDescription; + data['AmbulateDescriptionN'] = this.ambulateDescriptionN; + return data; + } +} diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index f5494049..4ad8de79 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -15,7 +15,7 @@ AppSharedPreferences sharedPref = new AppSharedPreferences(); ///await BaseAppClient.post('', /// onSuccess: (dynamic response, int statusCode) {}, /// onFailure: (String error, int statusCode) {}, -/// body: null); +/// body: Map(); class BaseAppClient { post(String endPoint, @@ -78,7 +78,7 @@ class BaseAppClient { print("URL : $url"); print("Body : ${json.encode(body)}"); - var asd=""; + if (await Utils.checkConnection()) { final response = await http.post(url.trim(), body: json.encode(body), diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index b6a91871..b654e0eb 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -1,23 +1,30 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; +import 'package:diplomaticquarterapp/core/model/er/PickUpRequestPresOrder.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import '../base_service.dart'; class AmService extends BaseService { List amModelList = List(); List patientAllPresOrdersList = List(); + bool hasPendingOrder = false; + int pendingOrderID = 0; + String pendingOrderStatus = ""; + String pendingOrderStatusAR = ""; + PickUpRequestPresOrder pickUpRequestPresOrder; Future getAllTransportationOrders() async { hasError = false; Map body = Map(); - body['isDentalAllowedBackend']= false; + body['isDentalAllowedBackend'] = false; body['IdentificationNo'] = user.patientIdentificationNo; await baseAppClient.post(GET_AMBULANCE_REQUEST, onSuccess: (dynamic response, int statusCode) { - amModelList.clear(); - response['PatientER_RRT_GetAllTransportationMethodList'].forEach((vital) { - amModelList.add(PatientERTransportationMethod.fromJson(vital)); + amModelList.clear(); + response['PatientER_RRT_GetAllTransportationMethodList'].forEach((item) { + amModelList.add(PatientERTransportationMethod.fromJson(item)); }); }, onFailure: (String error, int statusCode) { hasError = true; @@ -27,11 +34,39 @@ class AmService extends BaseService { Future getPatientAllPresOrdersList() async { hasError = false; + hasPendingOrder = false; await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, onSuccess: (dynamic response, int statusCode) { - patientAllPresOrdersList.clear(); - response['PatientER_GetPatientAllPresOrdersList'].forEach((vital) { - patientAllPresOrdersList.add(PatientAllPresOrders.fromJson(vital)); + patientAllPresOrdersList.clear(); + response['PatientER_GetPatientAllPresOrdersList'].forEach((item) { + if (item['ServiceID'] == OrderService.AMBULANCE.getIdOrderService()) { + var order = PatientAllPresOrders.fromJson(item); + patientAllPresOrdersList.add(order); + if (order.status == 1) { + hasPendingOrder = true; + pendingOrderID = order.iD; + pendingOrderStatus = order.description; + pendingOrderStatusAR = order.descriptionN; + } + } + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: Map()); + } + + Future getOrderDetails() async { + hasError = false; + hasPendingOrder = false; + Map body = Map(); + body['PresOrderID'] = pendingOrderID; + await baseAppClient.post(GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID, + onSuccess: (dynamic response, int statusCode) { + patientAllPresOrdersList.clear(); + response['PatientER_RRT_GetPickUpRequestByPresOrderIDList'] + .forEach((item) { + pickUpRequestPresOrder = PickUpRequestPresOrder.fromJson(item); }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/service/medical/medical_service.dart b/lib/core/service/medical/medical_service.dart index 572e5096..f90280cf 100644 --- a/lib/core/service/medical/medical_service.dart +++ b/lib/core/service/medical/medical_service.dart @@ -1,6 +1,8 @@ import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:flutter/cupertino.dart'; class MedicalService extends BaseService { List appoitmentAllHistoryResultList = List(); @@ -26,4 +28,21 @@ class MedicalService extends BaseService { super.error = error; }, body: body); } + + addAmbulanceRequest({@required PatientER patientER}) async { + hasError = false; + super.error = ""; + Map body = Map(); + body['RequesterFileNo'] = user.patientID; + body['RequesterMobileNo'] = user.mobileNumber; + body['RequesterIsOutSA'] = user.outSA; + await baseAppClient.post(GET_PATIENT_APPOINTMENT_HISTORY, + onSuccess: (response, statusCode) async { + + + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } } diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart index 7e16d22d..18ab02e3 100644 --- a/lib/core/viewModels/base_view_model.dart +++ b/lib/core/viewModels/base_view_model.dart @@ -18,6 +18,7 @@ class BaseViewModel extends ChangeNotifier { AuthenticatedUser user; AppSharedPreferences sharedPref = AppSharedPreferences(); + AuthenticatedUserObject authenticatedUserObject = locator(); void setState(ViewState viewState) { _state = viewState; diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index a5261456..fbd3d95d 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; +import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/service/er/am_service.dart'; import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; import 'package:diplomaticquarterapp/core/service/medical/medical_service.dart'; @@ -14,17 +15,22 @@ class AmRequestViewModel extends BaseViewModel { HospitalService _hospitalService = locator(); MedicalService _medicalService = locator(); - List - get amRequestModeList => _amService.amModelList; + List get amRequestModeList => + _amService.amModelList; - List get patientAllPresOrdersList =>_amService.patientAllPresOrdersList; + List get patientAllPresOrdersList => + _amService.patientAllPresOrdersList; List get appoitmentAllHistoryResultList => _medicalService.appoitmentAllHistoryResultList; + List get hospitals => _hospitalService.hospitals; + + bool get hasPendingOrder =>_amService.hasPendingOrder; + Future getAppointmentHistory() async { setState(ViewState.BusyLocal); - await _medicalService.getAppointmentHistory(isActiveAppointment: true); + await _medicalService.getAppointmentHistory(isActiveAppointment: true); if (_medicalService.hasError) { error = _medicalService.error; setState(ViewState.ErrorLocal); @@ -32,8 +38,6 @@ class AmRequestViewModel extends BaseViewModel { setState(ViewState.Idle); } - - Future getAmRequestOrders() async { setState(ViewState.Busy); await _amService.getAllTransportationOrders(); @@ -54,9 +58,21 @@ class AmRequestViewModel extends BaseViewModel { getPatientAllPresOrdersList(); } - Future getPatientAllPresOrdersList()async{ + Future getPatientAllPresOrdersList() async { setState(ViewState.Busy); await _amService.getPatientAllPresOrdersList(); + if (_hospitalService.hasError) { + error = _hospitalService.error; + setState(ViewState.Error); + } else if (_amService.hasPendingOrder) { + getOrderDetails(); + } else + setState(ViewState.Idle); + } + + Future getOrderDetails() async { + setState(ViewState.Busy); + await _amService.getOrderDetails(); if (_hospitalService.hasError) { error = _hospitalService.error; setState(ViewState.Error); diff --git a/lib/core/viewModels/medical/labs_view_model.dart b/lib/core/viewModels/medical/labs_view_model.dart index 032aeb1e..8cbf0efc 100644 --- a/lib/core/viewModels/medical/labs_view_model.dart +++ b/lib/core/viewModels/medical/labs_view_model.dart @@ -21,52 +21,54 @@ class LabsViewModel extends BaseViewModel { : _patientLabOrdersListHospital; void getLabs() async { - setState(ViewState.Busy); - await _labsService.getPatientLabOrdersList(); - if (_labsService.hasError) { - error = _labsService.error; - setState(ViewState.Error); - } else { - _labsService.patientLabOrdersList.forEach((element) { - List patientLabOrdersClinic = - _patientLabOrdersListClinic - .where((elementClinic) => - elementClinic.filterName == element.clinicDescription) - .toList(); + if (authenticatedUserObject.isLogin) { + setState(ViewState.Busy); + await _labsService.getPatientLabOrdersList(); + if (_labsService.hasError) { + error = _labsService.error; + setState(ViewState.Error); + } else { + _labsService.patientLabOrdersList.forEach((element) { + List patientLabOrdersClinic = + _patientLabOrdersListClinic + .where((elementClinic) => + elementClinic.filterName == element.clinicDescription) + .toList(); - if (patientLabOrdersClinic.length != 0) { - _patientLabOrdersListClinic[_patientLabOrdersListClinic - .indexOf(patientLabOrdersClinic[0])] - .patientLabOrdersList - .add(element); - } else { - _patientLabOrdersListClinic.add(PatientLabOrdersList( - filterName: element.clinicDescription, - patientDoctorAppointment: element)); - } + if (patientLabOrdersClinic.length != 0) { + _patientLabOrdersListClinic[_patientLabOrdersListClinic + .indexOf(patientLabOrdersClinic[0])] + .patientLabOrdersList + .add(element); + } else { + _patientLabOrdersListClinic.add(PatientLabOrdersList( + filterName: element.clinicDescription, + patientDoctorAppointment: element)); + } - // doctor list sort via project - List patientLabOrdersHospital = - _patientLabOrdersListHospital - .where( - (elementClinic) => - elementClinic.filterName == element.projectName, - ) - .toList(); + // doctor list sort via project + List patientLabOrdersHospital = + _patientLabOrdersListHospital + .where( + (elementClinic) => + elementClinic.filterName == element.projectName, + ) + .toList(); - if (patientLabOrdersHospital.length != 0) { - _patientLabOrdersListHospital[_patientLabOrdersListHospital - .indexOf(patientLabOrdersHospital[0])] - .patientLabOrdersList - .add(element); - } else { - _patientLabOrdersListHospital.add(PatientLabOrdersList( - filterName: element.projectName, - patientDoctorAppointment: element)); - } - }); + if (patientLabOrdersHospital.length != 0) { + _patientLabOrdersListHospital[_patientLabOrdersListHospital + .indexOf(patientLabOrdersHospital[0])] + .patientLabOrdersList + .add(element); + } else { + _patientLabOrdersListHospital.add(PatientLabOrdersList( + filterName: element.projectName, + patientDoctorAppointment: element)); + } + }); - setState(ViewState.Idle); + setState(ViewState.Idle); + } } } diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart index fa330aad..4563f615 100644 --- a/lib/core/viewModels/medical/medical_view_model.dart +++ b/lib/core/viewModels/medical/medical_view_model.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/medical/medical_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/locator.dart'; @@ -11,13 +12,15 @@ class MedicalViewModel extends BaseViewModel { _medicalService.appoitmentAllHistoryResultList; getAppointmentHistory() async { - setState(ViewState.Busy); - if (_medicalService.appoitmentAllHistoryResultList.length == 0) - await _medicalService.getAppointmentHistory(); - if (_medicalService.hasError) { - error = _medicalService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); + if (authenticatedUserObject.isLogin) { + setState(ViewState.Busy); + if (_medicalService.appoitmentAllHistoryResultList.length == 0) + await _medicalService.getAppointmentHistory(); + if (_medicalService.hasError) { + error = _medicalService.error; + setState(ViewState.Error); + } else + setState(ViewState.Idle); + } } } diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart index c50093be..ec96f482 100644 --- a/lib/pages/ErService/AmbulanceReq.dart +++ b/lib/pages/ErService/AmbulanceReq.dart @@ -10,7 +10,8 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'AmbulanceRequestIndex.dart'; +import 'AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart'; +import 'OrderLogPage.dart'; class AmbulanceReq extends StatefulWidget { @override @@ -26,11 +27,13 @@ class _AmbulanceReqState extends State super.initState(); _tabController = TabController(length: 2, vsync: this); } + @override void dispose() { super.dispose(); _tabController.dispose(); } + @override Widget build(BuildContext context) { return BaseView( @@ -80,13 +83,14 @@ class _AmbulanceReqState extends State indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), + EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( width: MediaQuery.of(context).size.width * 0.40, child: Center( - child: Texts("Ambulance Request"),//TranslationBase.of(context).prescriptions + child: Texts( + "Ambulance Request"), //TranslationBase.of(context).prescriptions ), ), Container( @@ -110,8 +114,14 @@ class _AmbulanceReqState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - AmbulanceRequestIndex(amRequestViewModel: model,), - Container() + model.hasPendingOrder + ? Container() + : AmbulanceRequestIndexPage( + amRequestViewModel: model, + ), + OrderLogPage( + amRequestViewModel: model, + ) ], ), ) @@ -121,5 +131,4 @@ class _AmbulanceReqState extends State ), ); } - } diff --git a/lib/pages/ErService/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart similarity index 89% rename from lib/pages/ErService/AmbulanceRequestIndex.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart index 16d07b88..55e75e22 100644 --- a/lib/pages/ErService/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart @@ -9,16 +9,16 @@ import 'PickupLocation.dart'; import 'SelectTransportationMethod.dart'; import 'Summary.dart'; -class AmbulanceRequestIndex extends StatefulWidget { +class AmbulanceRequestIndexPage extends StatefulWidget { final AmRequestViewModel amRequestViewModel; - AmbulanceRequestIndex({Key key, this.amRequestViewModel}); + AmbulanceRequestIndexPage({Key key, this.amRequestViewModel}); @override - _AmbulanceRequestIndexState createState() => _AmbulanceRequestIndexState(); + _AmbulanceRequestIndexPageState createState() => _AmbulanceRequestIndexPageState(); } -class _AmbulanceRequestIndexState extends State { +class _AmbulanceRequestIndexPageState extends State { int currentIndex = 0; PageController pageController; PatientER _patientER = PatientER(); diff --git a/lib/pages/ErService/BillAmount.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart similarity index 96% rename from lib/pages/ErService/BillAmount.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart index 44e17c3a..cc6af0f2 100644 --- a/lib/pages/ErService/BillAmount.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/BillAmount.dart @@ -26,6 +26,22 @@ class BillAmount extends StatefulWidget { class _BillAmountState extends State { Ambulate _ambulate = Ambulate.None; String note =""; + + + @override + void initState() { + + if(widget.patientER.ambulate!=null) + { + setState(() { + _ambulate = widget.patientER.ambulate; + note = widget.patientER.requesterNote; + }); + } + super.initState(); + } + + @override Widget build(BuildContext context) { return SingleChildScrollView( @@ -278,7 +294,7 @@ class _BillAmountState extends State { color: Colors.white, ), child: ListTile( - title: Text('Walker'), + title: Text('None'), leading: Radio( value: Ambulate.None, groupValue: _ambulate, @@ -320,6 +336,7 @@ class _BillAmountState extends State { setState(() { widget.patientER.ambulate = _ambulate; widget.patientER.requesterNote = note; + widget.patientER.selectedAmbulate = _ambulate.selectAmbulateNumber(); widget.changeCurrentTab(3); }); }, diff --git a/lib/pages/ErService/PickupLocation.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart similarity index 67% rename from lib/pages/ErService/PickupLocation.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart index 4b32c9bb..795f4dcc 100644 --- a/lib/pages/ErService/PickupLocation.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart @@ -1,9 +1,12 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; +import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/pages/Blood/dialogs/SelectHospitalDialog.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/AppointmentCard.dart'; import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; +import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -15,8 +18,8 @@ import 'package:geolocator/geolocator.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'AmbulanceReq.dart'; -import 'AvailableAppointmentsPage.dart'; +import '../AmbulanceReq.dart'; +import '../AvailableAppointmentsPage.dart'; enum HaveAppointment { YES, NO } @@ -41,6 +44,8 @@ class _PickupLocationState extends State { double _latitude; double _longitude; AppoitmentAllHistoryResultList myAppointment; + HospitalsModel _selectedHospital; + PickResult _result; @override void initState() { @@ -142,7 +147,7 @@ class _PickupLocationState extends State { Expanded( child: InkWell( onTap: () { - if(myAppointment == null) { + if (myAppointment == null) { getAppointment(); setState(() { _haveAppointment = HaveAppointment.YES; @@ -164,13 +169,12 @@ class _PickupLocationState extends State { groupValue: _haveAppointment, activeColor: Colors.red[800], onChanged: (value) { - if(myAppointment == null) { + if (myAppointment == null) { getAppointment(); setState(() { _haveAppointment = value; }); } - }, ), ), @@ -212,18 +216,18 @@ class _PickupLocationState extends State { ), ], ), - - if(myAppointment!=null) + if (myAppointment != null) Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( height: 12, ), - AppointmentCard(appointment: myAppointment,) + AppointmentCard( + appointment: myAppointment, + ) ], ), - SizedBox( height: 12, ), @@ -231,29 +235,35 @@ class _PickupLocationState extends State { SizedBox( height: 8, ), - Container( - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts('Pickup Location'), - Icon( - Icons.arrow_drop_down, - size: 24, - color: Colors.black, - ) - ], + InkWell( + onTap: () { + confirmSelectHospitalDialog( + widget.amRequestViewModel.hospitals); + }, + child: Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts(getHospitalName('Pickup Location')), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), ), ), ], ), - if (widget.patientER.direction == 2) + if (widget.patientER.direction == 1) Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -261,6 +271,39 @@ class _PickupLocationState extends State { SizedBox( height: 15, ), + InkWell( + onTap: () { + confirmSelectHospitalDialog( + widget.amRequestViewModel.hospitals); + }, + child: Container( + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey, width: 0.5), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts(getHospitalName('Pickup Location')), + Icon( + Icons.arrow_drop_down, + size: 24, + color: Colors.black, + ) + ], + ), + ), + ), + SizedBox( + height: 12, + ), + Texts('Drop off Location'), + SizedBox( + height: 8, + ), InkWell( onTap: () { Navigator.push( @@ -271,6 +314,9 @@ class _PickupLocationState extends State { // Put YOUR OWN KEY here. onPlacePicked: (PickResult result) { print(result.adrAddress); + setState(() { + _result = result; + }); Navigator.of(context).pop(); }, initialPosition: LatLng(_latitude, _longitude), @@ -290,9 +336,9 @@ class _PickupLocationState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Texts('Pickup Location'), + Texts('Select From Map'), Icon( - Icons.arrow_drop_down, + FontAwesomeIcons.mapMarkerAlt, size: 24, color: Colors.black, ) @@ -300,33 +346,6 @@ class _PickupLocationState extends State { ), ), ), - SizedBox( - height: 12, - ), - Texts('Drop off Location'), - SizedBox( - height: 8, - ), - Container( - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Colors.grey, width: 0.5), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Texts('Select From Map'), - Icon( - FontAwesomeIcons.mapMarkerAlt, - size: 24, - color: Colors.black, - ) - ], - ), - ), ], ), //TODO show dialog projects @@ -342,7 +361,41 @@ class _PickupLocationState extends State { color: Colors.grey[800], textColor: Colors.white, onTap: () { + if(_result==null || _selectedHospital == null) + AppToast.showErrorToast(message: 'please select all fields'); + else setState(() { + widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; + if (widget.patientER.direction == 0) { + widget.patientER.pickupLocationLattitude = _result.geometry.location.lat.toString(); + widget.patientER.pickupLocationLongitude = _result.geometry.location.lng.toString(); + widget.patientER.dropoffLocationLattitude = _selectedHospital.latitude; + widget.patientER.dropoffLocationLongitude = _selectedHospital.longitude; + + } else { + widget.patientER.pickupLocationLattitude = _selectedHospital.latitude; + widget.patientER.pickupLocationLongitude = _selectedHospital.longitude; + widget.patientER.dropoffLocationLattitude = _result.geometry.location.lat.toString(); + widget.patientER.dropoffLocationLongitude = _result.geometry.location.lng.toString(); + } + + widget.patientER.latitude = widget.patientER.pickupLocationLattitude; + widget.patientER.longitude = widget.patientER.pickupLocationLongitude; + + if(_haveAppointment == HaveAppointment.YES){ + widget.patientER.appointmentNo = myAppointment.appointmentNo.toString(); + widget.patientER.appointmentClinicName = myAppointment.clinicName; + widget.patientER.appointmentDoctorName = myAppointment.doctorNameObj; + widget.patientER.appointmentBranch = myAppointment.projectName; + widget.patientER.appointmentTime = myAppointment.appointmentDate; + }else{ + widget.patientER.appointmentNo ="0"; + widget.patientER.appointmentClinicName = null; + widget.patientER.appointmentDoctorName = null; + widget.patientER.appointmentBranch = null; + widget.patientER.appointmentTime = null; + } + widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; widget.changeCurrentTab(2); }); @@ -356,12 +409,35 @@ class _PickupLocationState extends State { ); } + void confirmSelectHospitalDialog(List hospitals) { + showDialog( + context: context, + child: SelectHospitalDialog( + hospitals: hospitals, + selectedHospital: _selectedHospital, + onValueSelected: (value) { + setState(() { + _selectedHospital = value; + }); + }, + ), + ); + } + + String getHospitalName(String title) { + return _selectedHospital == null ? title : _selectedHospital.name; + } + getAppointment() { + ProgressDialogUtil.showProgressDialog(context); widget.amRequestViewModel.getAppointmentHistory().then((value) { if (widget.amRequestViewModel.state == ViewState.Error || widget.amRequestViewModel.state == ViewState.ErrorLocal) { AppToast.showErrorToast(message: widget.amRequestViewModel.error); - } else if (widget.amRequestViewModel.appoitmentAllHistoryResultList.length > 0) { + } else if (widget + .amRequestViewModel.appoitmentAllHistoryResultList.length > + 0) { + ProgressDialogUtil.hideProgressDialog(context); Navigator.push( context, MaterialPageRoute( @@ -375,17 +451,23 @@ class _PickupLocationState extends State { setState(() { myAppointment = value; }); - else + else { + ProgressDialogUtil.hideProgressDialog(context); setState(() { _haveAppointment = HaveAppointment.NO; }); + } }); } else { + ProgressDialogUtil.hideProgressDialog(context); setState(() { _haveAppointment = HaveAppointment.NO; }); AppToast.showErrorToast(message: 'You don\'t have any appointment'); } + }).catchError((e) { + ProgressDialogUtil.hideProgressDialog(context); + AppToast.showErrorToast(message: e); }); } } diff --git a/lib/pages/ErService/SelectTransportationMethod.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart similarity index 92% rename from lib/pages/ErService/SelectTransportationMethod.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart index 261b9f83..436aabe8 100644 --- a/lib/pages/ErService/SelectTransportationMethod.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; @@ -32,11 +33,13 @@ class _SelectTransportationMethodState Direction _direction = Direction.FromHospital; Way _way = Way.OneWay; + OrderService _orderService = OrderService.AMBULANCE; + @override void initState() { super.initState(); if (widget.patientER.direction != null) { - _direction = widget.patientER.direction == 1 + _direction = widget.patientER.direction == 0 ? Direction.ToHospital : Direction.FromHospital; _way = widget.patientER.tripType == 1 ? Way.OneWay : Way.TwoWays; @@ -278,15 +281,17 @@ class _SelectTransportationMethodState textColor: Colors.white, onTap: () { setState(() { - widget.patientER.direction = - _direction == Direction.ToHospital ? 1 : 2; + widget.patientER.direction = _direction == Direction.ToHospital ? 0 : 1; widget.patientER.tripType = _way == Way.TwoWays ? 2 : 1; - widget.patientER.selectedAmbulate = (widget - .amRequestViewModel.amRequestModeList - .indexOf(_erTransportationMethod) + - 1); - widget.patientER.patientERTransportationMethod = - _erTransportationMethod; + widget.patientER.selectedAmbulate = (widget.amRequestViewModel.amRequestModeList.indexOf(_erTransportationMethod) + 1); + widget.patientER.patientERTransportationMethod = _erTransportationMethod; + widget.patientER.orderServiceID = _orderService.getIdOrderService(); + widget.patientER.pickupUrgency = 1; + widget.patientER.lineItemNo = 1; + widget.patientER.cost = _erTransportationMethod.price; + widget.patientER.vAT = _erTransportationMethod.vAT ?? 0; + widget.patientER.totalPrice = _erTransportationMethod.totalPrice; + widget.changeCurrentTab(1); }); }, diff --git a/lib/pages/ErService/Summary.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart similarity index 100% rename from lib/pages/ErService/Summary.dart rename to lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart diff --git a/lib/pages/ErService/OrderLogPage.dart b/lib/pages/ErService/OrderLogPage.dart new file mode 100644 index 00000000..cbb508e5 --- /dev/null +++ b/lib/pages/ErService/OrderLogPage.dart @@ -0,0 +1,62 @@ +import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; +import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/OrderLogItem.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class OrderLogPage extends StatelessWidget { + final AmRequestViewModel amRequestViewModel; + + OrderLogPage({Key key, @required this.amRequestViewModel}); + + @override + Widget build(BuildContext context) { + return Container( + margin: EdgeInsets.all(10), + padding: EdgeInsets.all(8), + child: ListView.builder( + itemCount: amRequestViewModel.patientAllPresOrdersList.length, + itemBuilder: (context, index) => Container( + margin: EdgeInsets.all(8), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(2), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + OrderLogItem( + title: 'Request ID', + value: amRequestViewModel.patientAllPresOrdersList[index].iD + .toString(), + ), + OrderLogItem( + title: 'Status', + value: amRequestViewModel + .patientAllPresOrdersList[index].description, + ), + OrderLogItem( + title: 'Pickup Date', + value: DateUtil.getDayMonthYearDateFormatted( + DateUtil.convertStringToDate(amRequestViewModel + .patientAllPresOrdersList[index].createdOn)), + ), + OrderLogItem( + title: 'Pickup Location', + value: amRequestViewModel + .patientAllPresOrdersList[index].pickupLocationName, + ), + OrderLogItem( + title: 'Drop off Location', + value: amRequestViewModel + .patientAllPresOrdersList[index].dropoffLocationName, + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/base/base_view.dart b/lib/pages/base/base_view.dart index 6014b6c3..f5311aae 100644 --- a/lib/pages/base/base_view.dart +++ b/lib/pages/base/base_view.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -19,10 +20,11 @@ class BaseView extends StatefulWidget { class _BaseViewState extends State> { T model = locator(); + AuthenticatedUserObject authenticatedUserObject = locator(); @override void initState() { - if (widget.onModelReady != null) { + if (widget.onModelReady != null && authenticatedUserObject.isLogin) { widget.onModelReady(model); } super.initState(); diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index b811ef8f..b20648e2 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -34,6 +34,7 @@ class _HomePageState extends State { return BaseView( onModelReady: (model) => model.getPatientRadOrders(), builder: (_, model, wi) => AppScaffold( + isShowDecPage: false, body: Container( width: double.infinity, child: SingleChildScrollView( diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ac36c7d6..52afe85f 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -74,6 +74,7 @@ class _ConfirmLogin extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).confirm, isShowAppBar: true, + isShowDecPage: false, body: isLoading == false ? SingleChildScrollView( child: Container( diff --git a/lib/pages/login/forgot-password.dart b/lib/pages/login/forgot-password.dart index c1fa7b18..bbdbb1ae 100644 --- a/lib/pages/login/forgot-password.dart +++ b/lib/pages/login/forgot-password.dart @@ -21,6 +21,7 @@ class _ForgotPassword extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).forgotPassword, isShowAppBar: true, + isShowDecPage: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20), diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index 7a8a940d..d1ac54bb 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -16,6 +16,7 @@ class LoginType extends StatelessWidget { return AppScaffold( appBarTitle: TranslationBase.of(context).welcome, isShowAppBar: true, + isShowDecPage: false, body: Padding( padding: EdgeInsets.all(20), child: Column( diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index c1f04a71..22178444 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -57,6 +57,7 @@ class _Login extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).login, isShowAppBar: true, + isShowDecPage: false, body: isLoading == true ? AppCircularProgressIndicator() : SingleChildScrollView( diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index 70e5fb29..e94c1af6 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -39,6 +39,7 @@ class _RegisterInfo extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).register, isShowAppBar: true, + isShowDecPage: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30), diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 3706f452..3ee13a4c 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -45,6 +45,7 @@ class _Register extends State { return AppScaffold( appBarTitle: TranslationBase.of(context).register, isShowAppBar: true, + isShowDecPage: false, body: isLoading == true ? AppCircularProgressIndicator() : SingleChildScrollView( diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index b4b05900..90bc2a2c 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -28,6 +28,7 @@ class _WelcomeLogin extends State { Widget build(BuildContext context) { return AppScaffold( appBarTitle: TranslationBase.of(context).welcome, + isShowDecPage: false, isShowAppBar: true, body: Padding( padding: EdgeInsets.all(20), diff --git a/lib/pages/medical/labs/labs_home_page.dart b/lib/pages/medical/labs/labs_home_page.dart index 325d5dcd..995365d9 100644 --- a/lib/pages/medical/labs/labs_home_page.dart +++ b/lib/pages/medical/labs/labs_home_page.dart @@ -20,6 +20,7 @@ class LabsHomePage extends StatelessWidget { builder: (context, LabsViewModel model, widget) => AppScaffold( baseViewModel: model, isShowAppBar: true, + description: TranslationBase.of(context).infoLab, appBarTitle: TranslationBase.of(context).labOrders, body: SingleChildScrollView( physics: BouncingScrollPhysics(), diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index d2b9a9ea..2c5a6fb2 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -48,6 +48,7 @@ class _MedicalProfilePageState extends State { return BaseView( onModelReady: (model) => model.getAppointmentHistory(), builder: (_, model, widget) => AppScaffold( + isShowDecPage: false, baseViewModel: model, body: Container( child: SingleChildScrollView( diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index 0f9f4c7b..995ac485 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -20,6 +20,7 @@ class RadiologyHomePage extends StatelessWidget { isShowAppBar: true, appBarTitle: TranslationBase.of(context).radiology, baseViewModel: model, + description: TranslationBase.of(context).infoRadiology, body: FractionallySizedBox( widthFactor: 1.0, child: ListView( diff --git a/lib/uitl/ProgressDialog.dart b/lib/uitl/ProgressDialog.dart index 728b27dd..6820a6d5 100644 --- a/lib/uitl/ProgressDialog.dart +++ b/lib/uitl/ProgressDialog.dart @@ -1,12 +1,26 @@ import 'package:flutter/material.dart'; -class ProgressDialogUtil{ +AlertDialog _alert = AlertDialog( + content: Row( + children: [ + CircularProgressIndicator(), + Container(margin: EdgeInsets.only(left: 7), child: Text("Loading...")), + ], + ), +); - static AlertDialog alert = AlertDialog( - content: new Row( - children: [ - CircularProgressIndicator(), - Container(margin: EdgeInsets.only(left: 7),child:Text("Loading..." )), - ],), - ); -} \ No newline at end of file +class ProgressDialogUtil { + static showProgressDialog(BuildContext context) { + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return _alert; + }, + ); + } + + static hideProgressDialog(BuildContext context) { + Navigator.pop(context); + } +} diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 28b273e5..493bc327 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -589,6 +589,10 @@ class TranslationBase { String get all => localizedValues['All'][locale.languageCode]; String get questionHere => localizedValues['QuestionHere'][locale.languageCode]; String get viewDoctorResponses => localizedValues['ViewDoctorResponses'][locale.languageCode]; + String get serviceInformationButton => localizedValues['ServiceInformationButton'][locale.languageCode]; + String get serviceInformationTitle => localizedValues['ServiceInformationTitle'][locale.languageCode]; + String get infoLab => localizedValues['info-lab'][locale.languageCode]; + String get infoRadiology => localizedValues['info-radiology'][locale.languageCode]; } diff --git a/lib/widgets/others/OrderLogItem.dart b/lib/widgets/others/OrderLogItem.dart new file mode 100644 index 00000000..3e8305d3 --- /dev/null +++ b/lib/widgets/others/OrderLogItem.dart @@ -0,0 +1,32 @@ +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class OrderLogItem extends StatelessWidget { + final String title; + final String value; + OrderLogItem({ this.title, this.value}); + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.all(10), + width: double.maxFinite, + margin: EdgeInsets.only(bottom: 4,left: 4,right: 4), + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(12), + bottomLeft: Radius.circular(12), + ), + color: Colors.white + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts(title,color: Colors.grey,), + SizedBox(height: 4,), + Texts(value??''), + ], + ), + ); + } +} diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 80a3e7af..dabe3097 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -1,8 +1,10 @@ import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/routes.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart'; import 'package:diplomaticquarterapp/widgets/progress_indicator/app_loader_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -12,10 +14,12 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; +import '../../locator.dart'; import 'floating_button_search.dart'; import '../progress_indicator/app_loader_widget.dart'; import 'arrow_back.dart'; import 'network_base_view.dart'; +import 'not_auh_page.dart'; class AppScaffold extends StatelessWidget { final String appBarTitle; @@ -26,6 +30,12 @@ class AppScaffold extends StatelessWidget { final bool hasAppBarParam; final BaseViewModel baseViewModel; final Widget floatingActionButton; + final String title; + final String description; + final bool isShowDecPage; + + AuthenticatedUserObject authenticatedUserObject = + locator(); AppScaffold( {@required this.body, @@ -34,50 +44,61 @@ class AppScaffold extends StatelessWidget { this.isShowAppBar = false, this.hasAppBarParam, this.bottomSheet, - this.baseViewModel, this.floatingActionButton}); + this.baseViewModel, + this.floatingActionButton, + this.title, + this.description, + this.isShowDecPage = true}); @override Widget build(BuildContext context) { AppGlobal.context = context; return Scaffold( - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - appBar: isShowAppBar - ? AppBar( - elevation: 0, - backgroundColor: Theme.of(context).appBarTheme.color, - textTheme: TextTheme( - headline6: TextStyle( - color: Colors.white, fontWeight: FontWeight.bold), - ), - title: Text(appBarTitle.toUpperCase()), - leading: Builder( - builder: (BuildContext context) { - return ArrowBack(); + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + appBar: isShowAppBar + ? AppBar( + elevation: 0, + backgroundColor: Theme.of(context).appBarTheme.color, + textTheme: TextTheme( + headline6: + TextStyle(color: Colors.white, fontWeight: FontWeight.bold), + ), + title: Text(authenticatedUserObject.isLogin + ? appBarTitle.toUpperCase() + : TranslationBase.of(context).serviceInformationTitle), + leading: Builder( + builder: (BuildContext context) { + return ArrowBack(); + }, + ), + centerTitle: true, + actions: [ + IconButton( + icon: Icon(FontAwesomeIcons.home), + color: Colors.white, + onPressed: () { + Navigator.of(context).popUntil(ModalRoute.withName('/')); }, ), - centerTitle: true, - actions: [ - IconButton( - icon: Icon(FontAwesomeIcons.home), - color: Colors.white, - onPressed: () { - Navigator.of(context).popUntil(ModalRoute.withName('/')); - }, - ), - ], - ) - : null, - body: baseViewModel != null - ? NetworkBaseView( - child: buildBodyWidget(), - baseViewModel: baseViewModel, - ) - : buildBodyWidget(), - bottomSheet: bottomSheet, - // bottomNavigationBar: BottomBarSearch() - floatingActionButton: floatingActionButton??floatingActionButton, - ); + ], + ) + : null, + body: (!authenticatedUserObject.isLogin && isShowDecPage) + ? NotAutPage( + title: appBarTitle, + description: description, + ) + : baseViewModel != null + ? NetworkBaseView( + child: buildBodyWidget(), + baseViewModel: baseViewModel, + ) + : buildBodyWidget(), + bottomSheet: bottomSheet, + // bottomNavigationBar: BottomBarSearch() + floatingActionButton: floatingActionButton ?? floatingActionButton, + ); } buildAppLoaderWidget(bool isLoading) { @@ -85,6 +106,6 @@ class AppScaffold extends StatelessWidget { } buildBodyWidget() { - return body ;//Stack(children: [body, buildAppLoaderWidget(isLoading)]); + return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]); } } diff --git a/lib/widgets/others/not_auh_page.dart b/lib/widgets/others/not_auh_page.dart new file mode 100644 index 00000000..298b5609 --- /dev/null +++ b/lib/widgets/others/not_auh_page.dart @@ -0,0 +1,79 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/pages/login/login-type.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.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 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; + +class NotAutPage extends StatelessWidget { + final String title; + final String description; + + NotAutPage({@required this.title, @required this.description}); + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return Scaffold( + body: SingleChildScrollView( + padding: EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + title ?? 'Service', + fontWeight: FontWeight.w800, + fontSize: 25, + bold: true, + color: Hexcolor("#60686b"), + ), + SizedBox( + height: 12, + ), + Texts( + description ?? 'Description', + fontWeight: FontWeight.normal, + fontSize: 17, + ), + SizedBox( + height: 22, + ), + Center( + child: SizedBox( + height: MediaQuery.of(context).size.height * 0.55, + width: MediaQuery.of(context).size.width * 0.50, + child: Image.asset(projectViewModel.isArabic + ? 'assets/images/wifi-EN.png' + : 'assets/images/Wifi-AR.png'), + ), + ), + SizedBox( + height: 77, + ), + ], + ), + ), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.10, + width: double.infinity, + child: Column( + children: [ + Container( + width: MediaQuery.of(context).size.width * 0.9, + child: SecondaryButton( + onTap: () => Navigator.pushReplacement( + context, FadePage(page: LoginType())), + label: TranslationBase.of(context).serviceInformationButton, + textColor: Theme.of(context).backgroundColor), + ), + ], + ), + ), + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 6e9349ab..2b078a1d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,6 +60,9 @@ dependencies: image_picker: ^0.6.7+1 image_cropper: ^1.2.1 + #GIF image + flutter_gifimage: ^1.0.1 + # UI Reqs dotted_border: 1.0.5 expandable: ^4.1.4 From 41d50e23e3df837e9a17bbe58e01472325a9e7d7 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 6 Oct 2020 14:06:28 +0300 Subject: [PATCH 28/37] covid drivethru implemented --- .../new-design/covid-19-big-banner-bg.png | Bin 0 -> 10233 bytes ios/Runner/Runner.entitlements | 5 +- .../Appointments/PatientShareResposne.dart | 34 +- .../CovidPaymentInfoResponse.dart | 96 +++ .../health_converter/blood_cholesterol.dart | 2 +- .../health_converter/blood_sugar.dart | 2 +- .../health_converter/triglycerides.dart | 2 +- .../components/DocAvailableAppointments.dart | 4 +- .../Covid-DriveThru/Covid-TimeSlots.dart | 599 ++++++++++++++++++ .../covid-drivethru-location.dart | 77 ++- .../Covid-DriveThru/covid-payment-alert.dart | 288 +++++++++ .../covid-payment-details.dart | 257 ++++++++ lib/pages/ToDoList/ToDo.dart | 2 +- lib/pages/landing/home_page.dart | 6 +- lib/pages/landing/landing_page.dart | 3 - .../covid-drivethru/covid-drivethru.dart | 74 +++ 16 files changed, 1406 insertions(+), 45 deletions(-) create mode 100644 assets/images/new-design/covid-19-big-banner-bg.png create mode 100644 lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart create mode 100644 lib/pages/Covid-DriveThru/Covid-TimeSlots.dart create mode 100644 lib/pages/Covid-DriveThru/covid-payment-alert.dart create mode 100644 lib/pages/Covid-DriveThru/covid-payment-details.dart diff --git a/assets/images/new-design/covid-19-big-banner-bg.png b/assets/images/new-design/covid-19-big-banner-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a66d681553e9014c80c6452df934b6900d599f32 GIT binary patch literal 10233 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 literal 0 HcmV?d00001 diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements index 0c67376e..903def2a 100644 --- a/ios/Runner/Runner.entitlements +++ b/ios/Runner/Runner.entitlements @@ -1,5 +1,8 @@ - + + aps-environment + development + diff --git a/lib/models/Appointments/PatientShareResposne.dart b/lib/models/Appointments/PatientShareResposne.dart index 2e22ed60..40670990 100644 --- a/lib/models/Appointments/PatientShareResposne.dart +++ b/lib/models/Appointments/PatientShareResposne.dart @@ -1,19 +1,19 @@ class PatientShareResponse { int advanceNumber; - String appointmentDate; + dynamic appointmentDate; int appointmentNo; int cashPrice; int cashPriceTax; int cashPriceWithTax; int clinicID; - String clinicName; + dynamic clinicName; int companyId; - String companyName; + dynamic companyName; int companyShareWithTax; - String doctorImageURL; - String doctorNameObj; + dynamic doctorImageURL; + dynamic doctorNameObj; int doctorID; - List doctorSpeciality; + List doctorSpeciality; dynamic errCode; int groupID; bool iSAllowOnlineCheckedIN; @@ -22,7 +22,7 @@ class PatientShareResponse { int isFollowup; bool isLiveCareAppointment; bool isOnlineCheckedIN; - String message; + dynamic message; int nextAction; dynamic patientCardID; int patientID; @@ -30,19 +30,19 @@ class PatientShareResponse { dynamic patientShareWithTax; int patientStatusType; dynamic patientTaxAmount; - String patientType; + dynamic patientType; int paymentAmount; - String paymentDate; + dynamic paymentDate; dynamic paymentMethodName; dynamic paymentReferenceNumber; int policyId; - String policyName; - String procedureName; + dynamic policyName; + dynamic procedureName; int projectID; - String projectName; + dynamic projectName; dynamic setupID; int sourceType; - String startTime; + dynamic startTime; int status; int statusCode; dynamic statusDesc; @@ -102,7 +102,7 @@ class PatientShareResponse { this.userID, this.serviceID}); - PatientShareResponse.fromJson(Map json) { + PatientShareResponse.fromJson(Map json) { advanceNumber = json['AdvanceNumber']; appointmentDate = json['AppointmentDate']; appointmentNo = json['AppointmentNo']; @@ -117,7 +117,7 @@ class PatientShareResponse { doctorID = json['DoctorID']; doctorImageURL = json['DoctorImageURL']; doctorNameObj = json['DoctorNameObj']; - doctorSpeciality = json['DoctorSpeciality'].cast(); +// doctorSpeciality = json['DoctorSpeciality'].cast(); errCode = json['ErrCode']; groupID = json['GroupID']; iSAllowOnlineCheckedIN = json['ISAllowOnlineCheckedIN']; @@ -155,8 +155,8 @@ class PatientShareResponse { serviceID = json['ServiceID']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['AdvanceNumber'] = this.advanceNumber; data['AppointmentDate'] = this.appointmentDate; data['AppointmentNo'] = this.appointmentNo; diff --git a/lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart b/lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart new file mode 100644 index 00000000..a1290e4d --- /dev/null +++ b/lib/models/CovidDriveThru/CovidPaymentInfoResponse.dart @@ -0,0 +1,96 @@ +class CovidPaymentInfoResponse { + dynamic propertyChanged; + dynamic cashPriceField; + dynamic cashPriceTaxField; + dynamic cashPriceWithTaxField; + dynamic companyIdField; + String companyNameField; + dynamic companyShareWithTaxField; + dynamic errCodeField; + dynamic groupIDField; + dynamic insurancePolicyNoField; + String messageField; + dynamic patientCardIDField; + dynamic patientShareField; + dynamic patientShareWithTaxField; + dynamic patientTaxAmountField; + dynamic policyIdField; + dynamic policyNameField; + String procedureNameField; + dynamic setupIDField; + dynamic statusCodeField; + dynamic subPolicyNoField; + + CovidPaymentInfoResponse( + {this.propertyChanged, + this.cashPriceField, + this.cashPriceTaxField, + this.cashPriceWithTaxField, + this.companyIdField, + this.companyNameField, + this.companyShareWithTaxField, + this.errCodeField, + this.groupIDField, + this.insurancePolicyNoField, + this.messageField, + this.patientCardIDField, + this.patientShareField, + this.patientShareWithTaxField, + this.patientTaxAmountField, + this.policyIdField, + this.policyNameField, + this.procedureNameField, + this.setupIDField, + this.statusCodeField, + this.subPolicyNoField}); + + CovidPaymentInfoResponse.fromJson(Map json) { + propertyChanged = json['PropertyChanged']; + cashPriceField = json['cashPriceField']; + cashPriceTaxField = json['cashPriceTaxField']; + cashPriceWithTaxField = json['cashPriceWithTaxField']; + companyIdField = json['companyIdField']; + companyNameField = json['companyNameField']; + companyShareWithTaxField = json['companyShareWithTaxField']; + errCodeField = json['errCodeField']; + groupIDField = json['groupIDField']; + insurancePolicyNoField = json['insurancePolicyNoField']; + messageField = json['messageField']; + patientCardIDField = json['patientCardIDField']; + patientShareField = json['patientShareField']; + patientShareWithTaxField = json['patientShareWithTaxField']; + patientTaxAmountField = json['patientTaxAmountField']; + policyIdField = json['policyIdField']; + policyNameField = json['policyNameField']; + procedureNameField = json['procedureNameField']; + setupIDField = json['setupIDField']; + statusCodeField = json['statusCodeField']; + subPolicyNoField = json['subPolicyNoField']; + } + + Map toJson() { + final Map data = new Map(); + data['PropertyChanged'] = this.propertyChanged; + data['cashPriceField'] = this.cashPriceField; + data['cashPriceTaxField'] = this.cashPriceTaxField; + data['cashPriceWithTaxField'] = this.cashPriceWithTaxField; + data['companyIdField'] = this.companyIdField; + data['companyNameField'] = this.companyNameField; + data['companyShareWithTaxField'] = this.companyShareWithTaxField; + data['errCodeField'] = this.errCodeField; + data['groupIDField'] = this.groupIDField; + data['insurancePolicyNoField'] = this.insurancePolicyNoField; + data['messageField'] = this.messageField; + data['patientCardIDField'] = this.patientCardIDField; + data['patientShareField'] = this.patientShareField; + data['patientShareWithTaxField'] = this.patientShareWithTaxField; + data['patientTaxAmountField'] = this.patientTaxAmountField; + data['policyIdField'] = this.policyIdField; + data['policyNameField'] = this.policyNameField; + data['procedureNameField'] = this.procedureNameField; + data['setupIDField'] = this.setupIDField; + data['statusCodeField'] = this.statusCodeField; + data['subPolicyNoField'] = this.subPolicyNoField; + return data; + } +} diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart index 9a2f08df..58caee36 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/blood_cholesterol.dart @@ -190,7 +190,7 @@ class _BloodCholesterolState extends State { child: TextFormField( controller: textController, inputFormatters: [ - FilteringTextInputFormatter.digitsOnly +// FilteringTextInputFormatter.digitsOnly ], keyboardType: TextInputType.number, decoration: InputDecoration( diff --git a/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart b/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart index a90a5bbb..f5d66ccf 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/blood_sugar.dart @@ -192,7 +192,7 @@ class _BloodSugarState extends State { child: TextFormField( controller: textController, inputFormatters: [ - FilteringTextInputFormatter.digitsOnly +// FilteringTextInputFormatter.digitsOnly ], keyboardType: TextInputType.number, decoration: InputDecoration( diff --git a/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart b/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart index fdf8d191..a86fdb88 100644 --- a/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart +++ b/lib/pages/AlHabibMedicalService/health_converter/triglycerides.dart @@ -188,7 +188,7 @@ class _TriglyceridesState extends State { child: TextFormField( controller: textController, inputFormatters: [ - FilteringTextInputFormatter.digitsOnly +// FilteringTextInputFormatter.digitsOnly ], keyboardType: TextInputType.number, decoration: InputDecoration( diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index aca0884f..88116cd9 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -385,8 +385,8 @@ class _DocAvailableAppointmentsState extends State color: _calendarController.isSelected(date) ? Colors.green[400] : _calendarController.isToday(date) - ? Colors.brown[300] - : Colors.blue[400], + ? Colors.brown[300] + : Colors.blue[400], ), width: 40.0, height: 40.0, diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart new file mode 100644 index 00000000..060a8132 --- /dev/null +++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart @@ -0,0 +1,599 @@ +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; +import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; +import 'package:diplomaticquarterapp/models/Appointments/FreeSlot.dart'; +import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart'; +import 'package:diplomaticquarterapp/models/Appointments/timeSlot.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-payment-alert.dart'; +import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; +import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:intl/intl.dart'; +import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:table_calendar/table_calendar.dart'; + +class CovidTimeSlots extends StatefulWidget { + int projectID; + static bool areSlotsAvailable = false; + static DateTime selectedAppoDateTime; + static String selectedDate; + static String selectedTime; + + int selectedClinicID; + int selectedDoctorID; + + PatientShareResponse patientShareResponse; + + CovidTimeSlots({@required this.projectID}); + + @override + _CovidTimeSlotsState createState() => _CovidTimeSlotsState(); +} + +class _CovidTimeSlotsState extends State + with TickerProviderStateMixin { + Map _events; + AnimationController _animationController; + CalendarController _calendarController; + + AppSharedPreferences sharedPref = new AppSharedPreferences(); + + var selectedDate = ""; + dynamic selectedDateJSON; + dynamic jsonFreeSlots; + + List docFreeSlots = []; + List dayEvents = []; + + int selectedButtonIndex = 0; + + dynamic freeSlotsResponse; + + ScrollController _scrollController; + + @override + void initState() { + final _selectedDay = DateTime.now(); + + widget.patientShareResponse = new PatientShareResponse(); + + _scrollController = new ScrollController(); + + _events = { + _selectedDay: ['Event A0'] + }; + + WidgetsBinding.instance.addPostFrameCallback( + (_) => getCovidFreeSlots(context, widget.projectID)); + + _calendarController = CalendarController(); + _animationController = AnimationController( + vsync: this, + duration: const Duration(milliseconds: 50), + ); + + _animationController.forward(); + super.initState(); + } + + @override + void dispose() { + _animationController.dispose(); + _calendarController.dispose(); + super.dispose(); + } + + void _onDaySelected(DateTime day, List events) { + final DateFormat formatter = DateFormat('yyyy-MM-dd'); + setState(() { + this.selectedDate = DateUtil.getMonthDayYearDateFormatted(day); + openTimeSlotsPickerForDate(day, docFreeSlots); + CovidTimeSlots.selectedDate = formatter.format(day); + print(CovidTimeSlots.selectedDate); + }); + } + + void _onVisibleDaysChanged( + DateTime first, DateTime last, CalendarFormat format) { + print('CALLBACK: _onVisibleDaysChanged'); + } + + void _onCalendarCreated( + DateTime first, DateTime last, CalendarFormat format) { + print('CALLBACK: _onCalendarCreated'); + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.fromLTRB(15.0, 15.0, 15.0, 0.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 150.0, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/new-design/covid-19-big-banner-bg.png"), + fit: BoxFit.fill, + ), + color: Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all(Radius.circular(10))), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: + EdgeInsets.only(left: 15.0, right: 15.0, top: 30.0), + child: SvgPicture.asset( + 'assets/images/new-design/covid-19-car.svg', + width: 90.0, + height: 90.0), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 40.0), + child: Text("COVID-19 TEST", + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24.0)), + ), + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 10.0), + child: Text("Drive-Thru", + style: TextStyle( + color: Colors.white, fontSize: 24.0)), + ), + ], + ), + ], + ), + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.0), + color: Colors.white), + margin: EdgeInsets.fromLTRB(0.0, 20.0, 0.0, 5.0), + padding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 20.0), + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height * 0.65, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.all(10.0), + child: Text( + "Kindly select one of the available appointments from below: ", + style: + TextStyle(color: Colors.black, fontSize: 16.0)), + ), + Container( + margin: EdgeInsets.only(top: 10.0), + alignment: Alignment.center, + child: Text(selectedDate, + style: TextStyle( + fontSize: 18.0, fontWeight: FontWeight.bold)), + ), + Container( + height: 50, + margin: EdgeInsets.all(20.0), + child: ListView.builder( + controller: _scrollController, + scrollDirection: Axis.horizontal, + itemCount: dayEvents.length, + itemBuilder: (context, index) { + return Container( + margin: EdgeInsets.only(right: 10.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5.0), + side: BorderSide( + color: Colors.blue[400], + //Color of the border + style: BorderStyle.solid, + //Style of the border + width: 1.5, //width of the border + ), + ), + minWidth: + MediaQuery.of(context).size.width * 0.2, + child: index == selectedButtonIndex + ? getSelectedButton(index) + : getNormalButton(index)), + ); + }, + ), + ), + _buildTableCalendarWithBuilders(), + ], + ), + ), + SizedBox( + height: 100.0, + ), + ], + ), + ), + ), + bottomSheet: Container( + margin: EdgeInsets.all(10.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { + bookCovidTestAppointment(); + }, + child: Text("BOOK", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ); + } + + Widget _buildTableCalendarWithBuilders() { + return TableCalendar( + locale: 'en_US', + calendarController: _calendarController, + events: _events, + initialCalendarFormat: CalendarFormat.month, + startDay: DateTime.now(), + formatAnimation: FormatAnimation.slide, + startingDayOfWeek: StartingDayOfWeek.sunday, + weekendDays: [DateTime.friday, DateTime.saturday], + availableGestures: AvailableGestures.horizontalSwipe, + availableCalendarFormats: const { + CalendarFormat.month: '', + CalendarFormat.week: '', + }, + calendarStyle: CalendarStyle( + outsideDaysVisible: false, + weekendStyle: TextStyle().copyWith(color: Colors.blue[800]), + holidayStyle: TextStyle().copyWith(color: Colors.blue[800]), + ), + daysOfWeekStyle: DaysOfWeekStyle( + weekendStyle: TextStyle().copyWith(color: Colors.blue[600]), + ), + headerStyle: HeaderStyle( + centerHeaderTitle: true, + formatButtonVisible: false, + ), + builders: CalendarBuilders( + selectedDayBuilder: (context, date, _) { + return FadeTransition( + opacity: Tween(begin: 0.0, end: 1.0).animate(_animationController), + child: Container( + margin: const EdgeInsets.all(4.0), + padding: const EdgeInsets.only(top: 5.0, left: 6.0), + color: Colors.transparent, + width: 0, + height: 0, + child: Text( + '${date.day}', + style: TextStyle().copyWith(fontSize: 16.0), + ), + ), + ); + }, + todayDayBuilder: (context, date, _) { + return Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: _calendarController.isSelected(date) + ? Colors.green[400] + : _calendarController.isToday(date) + ? Colors.brown[300] + : Colors.blue[400], + ), + width: 40.0, + height: 40.0, + child: Center( + child: Text( + '${date.day}', + style: TextStyle().copyWith( + color: Colors.white, + fontSize: 14.0, + ), + ), + ), + ); + }, + markersBuilder: (context, date, events, holidays) { + final children = []; + + if (events.isNotEmpty) { + children.add( + Positioned( + right: 4, + bottom: 4, + child: _buildEventsMarker(date, events), + ), + ); + } + + return children; + }, + ), + onDaySelected: (date, events) { + _onDaySelected(date, events); + _animationController.forward(from: 0.0); + }, + onVisibleDaysChanged: _onVisibleDaysChanged, + onCalendarCreated: _onCalendarCreated, + ); + } + + openTimeSlotsPickerForDate(DateTime dateStart, List freeSlots) { + dayEvents.clear(); + DateTime dateStartObj = new DateTime( + dateStart.year, dateStart.month, dateStart.day, 0, 0, 0, 0, 0); + + freeSlots.forEach((v) { + if (v.start == dateStartObj) dayEvents.add(v); + }); + + setState(() { + if (dayEvents.length != 0) + CovidTimeSlots.areSlotsAvailable = true; + else + CovidTimeSlots.areSlotsAvailable = false; + + selectedButtonIndex = 0; + + CovidTimeSlots.selectedTime = dayEvents[selectedButtonIndex].isoTime; + }); + } + + Future> _getJSONSlots() async { + Map _eventsParsed; + List slotsList = []; + DateTime date; + final DateFormat formatter = DateFormat('HH:mm'); + final DateFormat dateFormatter = DateFormat('yyyy-MM-dd'); + for (var i = 0; i < freeSlotsResponse.length; i++) { + date = + DateUtil.convertStringToDate(freeSlotsResponse[i]['FreeTimeSlots']); + slotsList.add(FreeSlot(date, ['slot'])); + docFreeSlots.add(TimeSlot( + isoTime: formatter.format(date), + start: new DateTime(date.year, date.month, date.day, 0, 0, 0, 0), + end: date)); + } + _eventsParsed = + Map.fromIterable(slotsList, key: (e) => e.slot, value: (e) => e.event); + setState(() { + CovidTimeSlots.selectedDate = dateFormatter.format( + DateUtil.convertStringToDate(freeSlotsResponse[0]['FreeTimeSlots'])); + selectedDate = DateUtil.getMonthDayYearDateFormatted( + DateUtil.convertStringToDate(freeSlotsResponse[0]['FreeTimeSlots'])); + selectedDateJSON = freeSlotsResponse[0]['FreeTimeSlots']; + }); + openTimeSlotsPickerForDate( + DateUtil.convertStringToDate(selectedDateJSON), docFreeSlots); + _calendarController + .setFocusedDay(DateUtil.convertStringToDate(selectedDateJSON)); + return _eventsParsed; + } + + Widget _buildEventsMarker(DateTime date, List events) { + return Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: _calendarController.isSelected(date) + ? Colors.green[400] + : _calendarController.isToday(date) + ? Colors.brown[300] + : Colors.blue[400], + ), + width: 40.0, + height: 40.0, + child: Center( + child: Text( + '${date.day}', + style: TextStyle().copyWith( + color: Colors.white, + fontSize: 14.0, + ), + ), + ), + ); + } + + Widget getNormalButton(int index) { + return RaisedButton( + color: Colors.white, + textColor: new Color(0xFF60686b), + onPressed: () { + setState(() { + selectedButtonIndex = index; + CovidTimeSlots.selectedTime = dayEvents[index].isoTime; + print(CovidTimeSlots.selectedTime); + }); + }, + child: Text(dayEvents[index].isoTime, + style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold)), + ); + } + + Widget getSelectedButton(int index) { + return RaisedButton( + color: Colors.blue[400], + textColor: Colors.white, + onPressed: () { + setState(() { + selectedButtonIndex = index; + CovidTimeSlots.selectedTime = dayEvents[index].isoTime; + print(CovidTimeSlots.selectedTime); + }); + }, + child: Text(dayEvents[index].isoTime, + style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold)), + ); + } + + bookCovidTestAppointment() { +// Navigator.push(context, +// MaterialPageRoute(builder: (context) => CovidPaymentAlert())); + + DoctorList docObject = new DoctorList(); + docObject.doctorID = widget.selectedDoctorID; + docObject.clinicID = widget.selectedClinicID; + docObject.projectID = widget.projectID; + insertAppointmentCovidTest(context, docObject); + } + + insertAppointmentCovidTest(context, DoctorList docObject) { + DoctorsListService service = new DoctorsListService(); + AppoitmentAllHistoryResultList appo; + service + .insertAppointment( + docObject.doctorID, + docObject.clinicID, + docObject.projectID, + CovidTimeSlots.selectedTime, + CovidTimeSlots.selectedDate, + context) + .then((res) { + print(res); + if (res['MessageStatus'] == 1) { + AppToast.showSuccessToast(message: "Appointment Booked Successfully"); + Future.delayed(new Duration(milliseconds: 1800), () { + getPatientShare(context, res['AppointmentNo'], docObject.clinicID, + docObject.projectID, docObject); + }); + } else { + appo = new AppoitmentAllHistoryResultList(); + appo.appointmentNo = res['SameClinicApptList'][0]['AppointmentNo']; + appo.clinicID = res['SameClinicApptList'][0]['DoctorID']; + appo.projectID = res['SameClinicApptList'][0]['ProjectID']; + appo.endTime = res['SameClinicApptList'][0]['EndTime']; + appo.startTime = res['SameClinicApptList'][0]['StartTime']; + appo.doctorID = res['SameClinicApptList'][0]['DoctorID']; + appo.isLiveCareAppointment = false; + appo.originalClinicID = 0; + appo.originalProjectID = 0; + appo.appointmentDate = res['SameClinicApptList'][0]['AppointmentDate']; + + ConfirmDialog dialog = new ConfirmDialog( + context: context, + confirmMessage: res['ErrorEndUserMessage'], + okText: TranslationBase.of(context).confirm, + cancelText: TranslationBase.of(context).cancel_nocaps, + okFunction: () => {cancelAppointment(docObject, appo, context)}, + cancelFunction: () => {}); + dialog.showAlertDialog(context); + } + }).catchError((err) { + AppToast.showErrorToast(message: err); + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + cancelAppointment(DoctorList docObject, AppoitmentAllHistoryResultList appo, + BuildContext context) { + ConfirmDialog.closeAlertDialog(context); + DoctorsListService service = new DoctorsListService(); + service.cancelAppointment(appo, context).then((res) { + if (res['MessageStatus'] == 1) { + Future.delayed(new Duration(milliseconds: 1500), () { + insertAppointmentCovidTest(context, docObject); + }); + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } + + getPatientShare(context, String appointmentNo, int clinicID, int projectID, + DoctorList docObject) { + DoctorsListService service = new DoctorsListService(); + service + .getPatientShare(appointmentNo, clinicID, projectID, context) + .then((res) { + print(res); + widget.patientShareResponse = new PatientShareResponse.fromJson(res); + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + navigateToPaymentAlert(); + }); + } + + navigateToPaymentAlert() { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidPaymentAlert( + patientShareResponse: widget.patientShareResponse))); + } + + getCovidFreeSlots(BuildContext context, int projectID) { + CovidDriveThruService service = new CovidDriveThruService(); + service.getCovidFreeSlots(context, projectID).then((res) { + print(res['COVID19_FreeTimeSlots']); + if (res['MessageStatus'] == 1) { + if (res['COVID19_FreeTimeSlots'].length != 0) { + freeSlotsResponse = res['COVID19_FreeTimeSlots']; + print(res['COVID19_FreeTimeSlots'].length); + _getJSONSlots().then((value) => { + setState(() => { + widget.selectedClinicID = + freeSlotsResponse[0]['ClinicID'], + widget.selectedDoctorID = + freeSlotsResponse[0]['DoctorID'], + _events.clear(), + _events = value + }) + }); + } else {} + } else { + AppToast.showErrorToast(message: res['ErrorEndUserMessage']); + } + }).catchError((err) { + print(err); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + } +} diff --git a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart index 6b1c5f2b..0563c4bd 100644 --- a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart +++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart @@ -1,11 +1,13 @@ +import 'package:diplomaticquarterapp/models/CovidDriveThru/CovidPaymentInfoResponse.dart'; import 'package:diplomaticquarterapp/models/CovidDriveThru/DriveThroughTestingCenterModel.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-payment-details.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'package:maps_launcher/maps_launcher.dart'; +import 'package:smart_progress_bar/smart_progress_bar.dart'; class CovidDrivethruLocation extends StatefulWidget { @override @@ -19,6 +21,7 @@ class _CovidDrivethruLocationState extends State { String projectLat = ""; String projectLong = ""; String projectName = ""; + String projectID = ""; @override void initState() { @@ -94,15 +97,16 @@ class _CovidDrivethruLocationState extends State { )), isLocationSelected ? Container( - margin: EdgeInsets.only(top: 15.0), - alignment: Alignment.centerLeft, - child: Text("Selected Location", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 18.0, - letterSpacing: 0.8, - color: Colors.black)), - ) : Container(), + margin: EdgeInsets.only(top: 15.0), + alignment: Alignment.centerLeft, + child: Text("Selected Location", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18.0, + letterSpacing: 0.8, + color: Colors.black)), + ) + : Container(), isLocationSelected ? Container( margin: EdgeInsets.only(top: 5.0), @@ -212,15 +216,22 @@ class _CovidDrivethruLocationState extends State { } getDirections() { - if(isLocationSelected) { - MapsLauncher.launchCoordinates(double.parse(projectLat),double.parse(projectLong), this.projectName); + if (isLocationSelected) { + MapsLauncher.launchCoordinates(double.parse(projectLat), + double.parse(projectLong), this.projectName); } else { - Utils.showErrorToast("Please select address from the dropdown menu to get directions"); + Utils.showErrorToast( + "Please select address from the dropdown menu to get directions"); } } next() { - + if (isLocationSelected) { + getPaymentInfo(context, projectID); + } else { + Utils.showErrorToast( + "Please select address from the dropdown menu to continue"); + } } back() { @@ -229,21 +240,57 @@ class _CovidDrivethruLocationState extends State { setProjectLocation(newValue) { print(newValue); - print(projectsList[(int.parse(newValue) - 1)].projectName); setState(() { this.projectLat = projectsList[(int.parse(newValue) - 1)].latitude.toString(); this.projectLong = projectsList[(int.parse(newValue) - 1)].longitude.toString(); this.projectName = projectsList[(int.parse(newValue) - 1)].projectName; + this.projectID = + projectsList[(int.parse(newValue) - 1)].projectID.toString(); isLocationSelected = true; }); } + getPaymentInfo(BuildContext context, String projectID) { + CovidDriveThruService service = new CovidDriveThruService(); + + CovidPaymentInfoResponse covidPaymentInfoResponse = + new CovidPaymentInfoResponse(); + + service + .getCovidPaymentInformation(context, int.parse(projectID)) + .then((res) { + if (res['MessageStatus'] == 1) { + setState(() { + covidPaymentInfoResponse = CovidPaymentInfoResponse.fromJson( + res['COVID19_PatientShare']); + print(covidPaymentInfoResponse.procedureNameField); + }); + } else {} + }) + .catchError((err) { + print(err); + }) + .showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) + .then((value) { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidPaymentDetails( + covidPaymentInfoResponse: covidPaymentInfoResponse, + projectID: int.parse(projectID), + ))); + }); + } + getProjectsList(BuildContext context) { CovidDriveThruService service = new CovidDriveThruService(); service.getCovidProjectsList(context).then((res) { + print(res); if (res['MessageStatus'] == 1) { + print(res); setState(() { res['List_COVID19_ProjectDriveThroughTestingCenter'].forEach((v) { projectsList.add(new DriveThroughTestingCenterModel.fromJson(v)); diff --git a/lib/pages/Covid-DriveThru/covid-payment-alert.dart b/lib/pages/Covid-DriveThru/covid-payment-alert.dart new file mode 100644 index 00000000..ac5f45fc --- /dev/null +++ b/lib/pages/Covid-DriveThru/covid-payment-alert.dart @@ -0,0 +1,288 @@ +import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class CovidPaymentAlert extends StatefulWidget { + PatientShareResponse patientShareResponse; + + CovidPaymentAlert({@required this.patientShareResponse}); + + @override + _CovidPaymentAlertState createState() => _CovidPaymentAlertState(); +} + +class _CovidPaymentAlertState extends State { + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 200.0, + color: new Color(0xFFc5272d), + child: Row( + children: [ + Container( + margin: EdgeInsets.only(left: 50.0), + child: SvgPicture.asset( + 'assets/images/new-design/alert_icon.svg', + width: 80.0, + height: 80.0), + ), + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.only(left: 30.0, right: 20.0), + child: Text("Alert", + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24.0)), + ), + Container( + width: MediaQuery.of(context).size.width * 0.55, + margin: EdgeInsets.only( + left: 30.0, right: 20.0, top: 5.0), + child: Text( + "Pay With-in 15 mins to confirm the appointment", + overflow: TextOverflow.clip, + style: TextStyle( + color: Colors.white, fontSize: 20.0)), + ), + ], + ), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(left: 20.0, right: 20.0, top: 30.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + alignment: Alignment.center, + child: Text("Pay With-in 15 mins", + overflow: TextOverflow.clip, + style: TextStyle( + color: new Color(0xFFc5272d), + fontSize: 24.0, + fontWeight: FontWeight.bold)), + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.only(top: 15.0), + child: Text( + "Payment for Covid-19 Test should Be made with-in 15 mins otherwise The system will Cancel the Scheduled appointment automatically​.", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.grey[700], + fontSize: 18.0, + letterSpacing: 0.8)), + ), + Container( + margin: EdgeInsets.only( + top: 40.0, bottom: 10.0, left: 0.0, right: 20.0), + child: Text(TranslationBase.of(context).appoInfo, + style: TextStyle( + fontSize: 18.0, + color: Colors.grey[700], + fontWeight: FontWeight.bold)), + ), + Container( + margin: EdgeInsets.only(left: 0.0, bottom: 20.0), + width: MediaQuery.of(context).size.width, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Colors.grey[200], + boxShadow: [ + BoxShadow(color: Colors.grey, spreadRadius: 2), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only( + top: 15.0, bottom: 10.0, left: 20.0, right: 20.0), + child: Text("COVID-19 TEST", + style: TextStyle( + fontSize: 18.0, + color: Colors.black, + fontWeight: FontWeight.bold)), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: Icon( + Icons.local_hospital, + size: 24, + color: Colors.grey[700], + )), + Container( + child: Text( + widget.patientShareResponse.projectName != + null + ? widget.patientShareResponse.projectName + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: Icon( + Icons.date_range, + size: 24, + color: Colors.grey[700], + )), + Container( + child: Text( + widget.patientShareResponse.appointmentDate != + null + ? getDate(widget.patientShareResponse + .appointmentDate) + .split(" ")[0] + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: Icon( + Icons.access_time, + size: 24, + color: Colors.grey[700], + )), + Container( + child: Text( + widget.patientShareResponse.appointmentDate != + null + ? getDate(widget.patientShareResponse + .appointmentDate) + .split(" ")[1] + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10.0), + child: Row( + children: [ + Container( + margin: + EdgeInsets.only(left: 20.0, right: 20.0), + child: SvgPicture.asset( + "assets/images/new-design/track_icon.svg", + width: 20.0, + height: 20.0)), + Container( + child: Text( + widget.patientShareResponse.doctorNameObj != + null + ? widget + .patientShareResponse.doctorNameObj + : "NULL", + style: TextStyle( + fontSize: 18.0, color: Colors.grey[700])), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + ], + ), + ), + bottomSheet: Container( + margin: EdgeInsets.all(10.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { +// bookCovidTestAppointment(); + }, + child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ); + } + + String getDate(String appoDate) { + var appoDateFormatted = ""; + + var dateObj = DateUtil.convertStringToDate(appoDate); + + setState(() { + appoDateFormatted = DateUtil.getWeekDay(dateObj.weekday) + + ", " + + dateObj.day.toString() + + " " + + DateUtil.getMonth(dateObj.month) + + " " + + dateObj.year.toString() + + " " + + dateObj.hour.toString() + + ":" + + dateObj.minute.toString() + + ":00"; + }); + return appoDateFormatted; + } +} diff --git a/lib/pages/Covid-DriveThru/covid-payment-details.dart b/lib/pages/Covid-DriveThru/covid-payment-details.dart new file mode 100644 index 00000000..1254997d --- /dev/null +++ b/lib/pages/Covid-DriveThru/covid-payment-details.dart @@ -0,0 +1,257 @@ +import 'package:diplomaticquarterapp/models/CovidDriveThru/CovidPaymentInfoResponse.dart'; +import 'package:diplomaticquarterapp/pages/Covid-DriveThru/Covid-TimeSlots.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class CovidPaymentDetails extends StatefulWidget { + CovidPaymentInfoResponse covidPaymentInfoResponse; + int projectID; + + CovidPaymentDetails( + {@required this.covidPaymentInfoResponse, @required this.projectID}); + + @override + _CovidPaymentDetailsState createState() => _CovidPaymentDetailsState(); +} + +class _CovidPaymentDetailsState extends State { + bool isAgree = false; + + @override + Widget build(BuildContext context) { + return AppScaffold( + appBarTitle: "COVID-19 TEST", + isShowAppBar: true, + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.fromLTRB(15.0, 15.0, 15.0, 0.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 150.0, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/new-design/covid-19-big-banner-bg.png"), + fit: BoxFit.fill, + ), + color: Colors.white.withOpacity(0.3), + borderRadius: BorderRadius.all(Radius.circular(10))), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: + EdgeInsets.only(left: 15.0, right: 15.0, top: 30.0), + child: SvgPicture.asset( + 'assets/images/new-design/covid-19-car.svg', + width: 90.0, + height: 90.0), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 40.0), + child: Text("COVID-19 TEST", + style: TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 24.0)), + ), + Container( + margin: EdgeInsets.only( + left: 20.0, right: 20.0, top: 10.0), + child: Text("Drive-Thru", + style: TextStyle( + color: Colors.white, fontSize: 24.0)), + ), + ], + ), + ], + ), + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.0), + color: Colors.white), + margin: EdgeInsets.fromLTRB(0.0, 30.0, 0.0, 5.0), + padding: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 20.0), + child: Column( + children: [ + Container( + alignment: Alignment.center, + margin: + EdgeInsets.only(left: 0.0, right: 20.0, top: 30.0), + child: Text("Test Fees", + style: TextStyle( + color: Colors.black, + fontSize: 22.0, + fontWeight: FontWeight.bold)), + ), + Table( + children: [ + TableRow(children: [ + TableCell( + child: _getNormalText(TranslationBase.of(context) + .patientShareToDo)), + TableCell( + child: _getNormalText(widget + .covidPaymentInfoResponse.patientShareField + .toString())), + ]), + TableRow(children: [ + TableCell( + child: _getNormalText( + TranslationBase.of(context).patientTaxToDo)), + TableCell( + child: _getNormalText(widget + .covidPaymentInfoResponse + .patientTaxAmountField + .toString())), + ]), + TableRow(children: [ + TableCell( + child: _getNormalText(TranslationBase.of(context) + .patientShareTotalToDo)), + TableCell( + child: _getNormalText(widget + .covidPaymentInfoResponse + .patientShareWithTaxField + .toString())), + ]), + ], + ), + ], + ), + ), + Container( + margin: EdgeInsets.fromLTRB(0.0, 15.0, 0.0, 5.0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Checkbox( + value: isAgree, + onChanged: (value) { + setState(() { + isAgree = !isAgree; + }); + }, + activeColor: Colors.blue, + ), + Texts(TranslationBase.of(context) + .iAgreeToTheTermsAndConditions), + ], + ), + ), + Divider( + color: Colors.grey, + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.fromLTRB(20.0, 15.0, 20.0, 5.0), + child: Text("You can pay by following options: ", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.bold, + fontFamily: "Open-Sans")), + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 5.0), + child: Image.asset( + "assets/images/new-design/payment_options_invoice_confirmation.png", + width: 300), + ), + ], + ), + ), + ), + bottomSheet: Container( + margin: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 20.0), + child: Flex( + direction: Axis.horizontal, + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: () { + cancel(); + }, + child: Text("CANCEL", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 5.0, 0.0), + child: ButtonTheme( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + minWidth: MediaQuery.of(context).size.width * 0.7, + height: 45.0, + child: RaisedButton( + color: new Color(0xFF60686b), + textColor: Colors.white, + disabledTextColor: Colors.white, + disabledColor: Colors.grey[500], + onPressed: isAgree ? next : null, + child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + ), + ), + ), + ), + ], + ), + ), + ); + } + + void next() { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidTimeSlots( + projectID: widget.projectID, + ))); + } + + cancel() { + Navigator.pop(context); + } + + _getNormalText(text) { + return Container( + margin: EdgeInsets.only(top: 20.0, right: 10.0), + child: Text(text, + textAlign: TextAlign.end, + style: TextStyle( + fontSize: 15, + fontFamily: 'Open-Sans', + letterSpacing: 0.5, + color: Colors.grey[700])), + ); + } +} diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 796794b2..7c20b53d 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -107,7 +107,7 @@ class _ToDoState extends State { .liveCareAppo, style: TextStyle(fontSize: 12.0)) : Text(widget.appoList[index].projectName != null ? widget.appoList[index].projectName : "-", - style: TextStyle(fontSize: 12.0)), + style: TextStyle(fontSize: 11.0)), ), ], ), diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index d427c2f1..79671682 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -94,11 +94,11 @@ class _HomePageState extends State { children: [ Container( margin: EdgeInsets.only( - top: 15.0), + top: 15.0, left: 3.5, right: 3.5), child: SvgPicture.asset( 'assets/images/new-design/covid-19-car.svg', - width: 50.0, - height: 50.0), + width: 45.0, + height: 45.0), ), Container( margin: EdgeInsets.only( diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index a545f8a7..0c6a2144 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -29,9 +29,6 @@ import 'package:rxdart/rxdart.dart'; import 'home_page.dart'; - - - class LandingPage extends StatefulWidget { static bool isOpenCallPage = false; diff --git a/lib/services/covid-drivethru/covid-drivethru.dart b/lib/services/covid-drivethru/covid-drivethru.dart index a9ebbecd..2681783b 100644 --- a/lib/services/covid-drivethru/covid-drivethru.dart +++ b/lib/services/covid-drivethru/covid-drivethru.dart @@ -49,4 +49,78 @@ class CovidDriveThruService extends BaseService { }, body: request); return Future.value(localRes); } + + Future getCovidPaymentInformation(BuildContext context, int projectID) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "ProjectID": projectID, + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": authUser.outSA, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "License": true + }; + + dynamic localRes; + + await baseAppClient.post(GET_COVID_DRIVETHRU_PAYMENT_INFO, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + + Future getCovidFreeSlots(BuildContext context, int projectID) async { + Map request; + + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + + var languageID = await sharedPref.getString(APP_LANGUAGE); + Request req = appGlobal.getPublicRequest(); + request = { + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": "10.20.10.20", + "ProjectID": projectID, + "VersionID": req.VersionID, + "Channel": req.Channel, + "generalid": 'Cs2020@2016\$2958', + "PatientOutSA": authUser.outSA, + "TokenID": "", + "DeviceTypeID": req.DeviceTypeID, + "SessionID": "YckwoXhUmWBsnHKEKig", + "PatientID": authUser.patientID != null ? authUser.patientID : 0, + "License": true + }; + + dynamic localRes; + + await baseAppClient.post(GET_COVID_DRIVETHRU_FREE_SLOTS, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } } From a8ee7db62b038f5895cace43ac58edc84410a2ec Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 11 Oct 2020 13:20:22 +0300 Subject: [PATCH 29/37] fixes # Conflicts: # lib/config/config.dart --- lib/config/config.dart | 9 ++++++++- .../AlHabibMedicalService/​ health_calculators.dart | 4 ++-- lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 96804aeb..0f92db66 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -258,6 +258,14 @@ const GET_PATIENT_INFO_BY_ID_AND_MOBILE_NUMBER = 'Services/Patients.svc/REST/AP_ const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/SendActivationCodeForAdvancePayment'; const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT = 'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment'; + +const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter'; + +const GET_COVID_DRIVETHRU_PAYMENT_INFO = 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation'; + +const GET_COVID_DRIVETHRU_FREE_SLOTS = 'Services/Doctors.svc/REST/COVID19_GetFreeSlots'; + + ///My Trackers const GET_DIABETIC_RESULT_AVERAGE='Services/Patients.svc/REST/Patient_GetDiabeticResultAverage'; const GET_DIABTEC_RESULT='Services/Patients.svc/REST/Patient_GetDiabtecResults'; @@ -304,7 +312,6 @@ const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities'; const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral"; const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals"; -const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter'; const TIMER_MIN = 10; diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart index 56fb0428..97141716 100644 --- a/lib/pages/AlHabibMedicalService/​ health_calculators.dart +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -1,5 +1,3 @@ -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; @@ -8,7 +6,9 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'health_calculator/bmi_calculator/bmi_calculator.dart'; import 'health_calculator/bmr_calculator/bmr_calculator.dart'; +import 'health_calculator/calorie_calculator/calorie_calculator.dart'; import 'health_calculator/ideal_body/ideal_body.dart'; class HealthCalculators extends StatefulWidget { diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 2113d2b5..8e9fe806 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -140,7 +140,6 @@ class _HospitalsLiveChatPageState extends State { icon: Icon( Icons .arrow_forward_ios, - .arrow_forward, color: tappedIndex == index ? Colors.white From 83735ab68d183f733387c5f278cd77e178275545 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 11 Oct 2020 15:23:01 +0300 Subject: [PATCH 30/37] modified Child vaccintion note --- lib/config/config.dart | 4 + .../childvaccines/delete_baby_model.dart | 76 ++++++ .../childvaccines/delete_baby_service.dart | 75 +++++ .../add_new_child_view_model.dart | 20 +- .../child_vaccines_view_model.dart | 40 +++ lib/locator.dart | 4 + .../ChildVaccines/add_newchild_page.dart | 79 +++--- lib/pages/ChildVaccines/child_page.dart | 57 ++-- .../ChildVaccines/child_vaccines_page.dart | 256 +----------------- .../dialogs/SelectGenderDialog.dart | 6 + .../ChildVaccines/dialogs/delete_child.dart | 103 +++++++ .../ChildVaccines/vaccinationtable_page.dart | 62 +---- lib/widgets/input/text_field.dart | 9 +- 13 files changed, 424 insertions(+), 367 deletions(-) create mode 100644 lib/core/model/childvaccines/delete_baby_model.dart create mode 100644 lib/core/service/childvaccines/delete_baby_service.dart create mode 100644 lib/pages/ChildVaccines/dialogs/delete_child.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index e45d5cf8..1342c28e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -84,6 +84,10 @@ const GET_NEW_USER_REQUEST= const GET_NEWCHILD_REQUEST= 'Services/Community.svc/REST/CreateNewBaby'; +///delteChild +const DELETE_CHILD_REQUEST= + 'Services/Community.svc/REST/DeleteBaby'; + ///addNewTABLE const GET_TABLE_REQUEST= diff --git a/lib/core/model/childvaccines/delete_baby_model.dart b/lib/core/model/childvaccines/delete_baby_model.dart new file mode 100644 index 00000000..9274b1e8 --- /dev/null +++ b/lib/core/model/childvaccines/delete_baby_model.dart @@ -0,0 +1,76 @@ +class DeleteBaby { + bool isLogin; + int babyID; + int editedBy; + double versionID; + int channel; + int languageID; + String iPAdress; + String generalid; + int patientOutSA; + String sessionID; + bool isDentalAllowedBackend; + int deviceTypeID; + int patientID; + String tokenID; + int patientTypeID; + int patientType; + + DeleteBaby( + {this.isLogin, + this.babyID, + this.editedBy, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType}); + + DeleteBaby.fromJson(Map json) { + isLogin = json['IsLogin']; + babyID = json['BabyID']; + editedBy = json['EditedBy']; + versionID = json['VersionID']; + channel = json['Channel']; + languageID = json['LanguageID']; + iPAdress = json['IPAdress']; + generalid = json['generalid']; + patientOutSA = json['PatientOutSA']; + sessionID = json['SessionID']; + isDentalAllowedBackend = json['isDentalAllowedBackend']; + deviceTypeID = json['DeviceTypeID']; + patientID = json['PatientID']; + tokenID = json['TokenID']; + patientTypeID = json['PatientTypeID']; + patientType = json['PatientType']; + } + + Map toJson() { + final Map data = new Map(); + data['IsLogin'] = this.isLogin; + data['BabyID'] = this.babyID; + data['EditedBy'] = this.editedBy; + data['VersionID'] = this.versionID; + data['Channel'] = this.channel; + data['LanguageID'] = this.languageID; + data['IPAdress'] = this.iPAdress; + data['generalid'] = this.generalid; + data['PatientOutSA'] = this.patientOutSA; + data['SessionID'] = this.sessionID; + data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; + data['DeviceTypeID'] = this.deviceTypeID; + data['PatientID'] = this.patientID; + data['TokenID'] = this.tokenID; + data['PatientTypeID'] = this.patientTypeID; + data['PatientType'] = this.patientType; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/childvaccines/delete_baby_service.dart b/lib/core/service/childvaccines/delete_baby_service.dart new file mode 100644 index 00000000..115d13c5 --- /dev/null +++ b/lib/core/service/childvaccines/delete_baby_service.dart @@ -0,0 +1,75 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; +import '../base_service.dart'; + + + +class DeleteBabyService extends BaseService{ + + List createNewBabyModelList = List(); + List userModelList = List(); + List newUserModelList = List(); + + List deleteBabyModelList= List(); + + + Future getDeleteBabyOrder({DeleteBaby deleteChild,int babyID}) async { + hasError = false; + await getUser(); + Map body = Map.from(deleteChild.toJson()); + // body['CreatedBy'] = 102; + body['EditedBy'] = 102; + //body['BabyID'] = babyID; + //body['BabyID'] = createNewBabyModelList ; + // body['AlertBy'] = 2; + // body['EmailAddress'] = user.emailAddress; + body['IsLogin'] = true; + body['LogInTokenID'] = await sharedPref.getString(TOKEN); + body['MobileNumber'] = user.mobileNumber; + body['NationalID'] = user.nationalityID; + body['ZipCode'] = user.zipCode; + + body['isDentalAllowedBackend'] = false; + + await baseAppClient.post(DELETE_CHILD_REQUEST, + onSuccess: (dynamic response, int statusCode) { + var asd =""; + }, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + // Future getCreateNewBabyOrders({CreateNewBaby newChild,int userID}) async { + // hasError = false; + // await getUser(); + // Map body = Map.from(newChild.toJson()); + // body['CreatedBy'] = 102; + // body['EditedBy'] = 102; + // body['UserID'] = userID; + // body['AlertBy'] = 2; + // body['EmailAddress'] = user.emailAddress; + // body['IsLogin'] = true; + // body['LogInTokenID'] = await sharedPref.getString(TOKEN); + // body['MobileNumber'] = user.mobileNumber; + // body['NationalID'] = user.nationalityID; + // body['ZipCode'] = user.zipCode; + // + // body['isDentalAllowedBackend'] = false; + // + // await baseAppClient.post(GET_NEWCHILD_REQUEST, + // onSuccess: (dynamic response, int statusCode) { + // var asd =""; + // }, + // onFailure: (String error, int statusCode) { + // hasError = true; + // super.error = error; + // }, body: body); + // } + +} \ No newline at end of file diff --git a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart index f0b55caa..eebaca02 100644 --- a/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart +++ b/lib/core/viewModels/child_vaccines/add_new_child_view_model.dart @@ -1,7 +1,9 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/delete_baby_service.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; @@ -11,6 +13,7 @@ class AddNewChildViewModel extends BaseViewModel { CreteNewBabyService _creteNewBabyService = locator(); ChildVaccinesService _childVaccinesService = locator(); + // DeleteBabyService _deleteBabyService = locator(); bool isAdded = false; ///create new baby createNewBabyOrders({ CreateNewBaby newChild}) async { @@ -22,15 +25,18 @@ class AddNewChildViewModel extends BaseViewModel { } else { isAdded = true; setState(ViewState.Idle); - // await _childVaccinesService.getAllBabyInformationOrders(); - // if (_childVaccinesService.hasError) { - // error = _childVaccinesService.error; - // setState(ViewState.Error); - // } else{ - // - // } + await _childVaccinesService.getAllBabyInformationOrders(); + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else{ + + } } } + + + } diff --git a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart index c19d9168..7c4af285 100644 --- a/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart +++ b/lib/core/viewModels/child_vaccines/child_vaccines_view_model.dart @@ -1,7 +1,12 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; +//======== +import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart'; +import 'package:diplomaticquarterapp/core/service/childvaccines/delete_baby_service.dart'; import '../../../locator.dart'; import '../base_view_model.dart'; @@ -11,6 +16,16 @@ class ChildVaccinesViewModel extends BaseViewModel{ List get babyInformationModelList=> _childVaccinesService.babyInformationModelList; + +//=========== + CreteNewBabyService _creteNewBabyService = locator(); + + DeleteBabyService _deleteBabyService = locator(); + bool isAdded = false; + bool isDeleted = false; + //============ + + getNewUserOrders() async { setState(ViewState.Busy); await _childVaccinesService.getNewUserOrders(); @@ -30,4 +45,29 @@ class ChildVaccinesViewModel extends BaseViewModel{ setState(ViewState.Idle); } + + + ///delete baby + deleteBabyOrders({ DeleteBaby newChild}) async { + setState(ViewState.Busy); + //await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild, userID: _childVaccinesService.userID); + await _deleteBabyService.getDeleteBabyOrder(deleteChild: newChild,babyID: newChild.babyID); + //getDeleteBabyOrder(deleteChild: newChild,); + // getDeleteBabyOrder + if (_creteNewBabyService.hasError) { + error = _creteNewBabyService.error; + setState(ViewState.Error); + } else { + isDeleted = true; + setState(ViewState.Idle); + await _childVaccinesService.getAllBabyInformationOrders(); + if (_childVaccinesService.hasError) { + error = _childVaccinesService.error; + setState(ViewState.Error); + } else{ + + } + } + } + } \ No newline at end of file diff --git a/lib/locator.dart b/lib/locator.dart index 734e281f..e6140ce1 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -13,6 +13,7 @@ import 'core/service/blood/blood_details_servies.dart'; import 'core/service/blood/blood_donation_service.dart'; import 'core/service/childvaccines/add_new_child_service.dart'; import 'core/service/childvaccines/child_vaccines_service.dart'; +import 'core/service/childvaccines/delete_baby_service.dart'; import 'core/service/childvaccines/user_information_service.dart'; import 'core/service/childvaccines/vaccination_table_service.dart'; import 'core/service/contactus/finadus_service.dart'; @@ -123,6 +124,9 @@ void setupLocator() { locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => UserInformationService()); locator.registerLazySingleton(() => CreteNewBabyService()); + locator.registerLazySingleton(() => DeleteBabyService()); + + locator.registerLazySingleton(() => VaccinationTableService()); diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart index a8e97b60..51b89f98 100644 --- a/lib/pages/ChildVaccines/add_newchild_page.dart +++ b/lib/pages/ChildVaccines/add_newchild_page.dart @@ -133,13 +133,16 @@ class _AddNewChildPageState extends State { height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, padding: EdgeInsets.all(12), + + child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisAlignment: MainAxisAlignment.center, children: [ Container( height: MediaQuery.of(context).size.height * 0.12, - width: 170, + width: 175, + color: Colors.white, child: SecondaryButton( textColor: checkedValue == 1 ? Colors.white : Colors.black, @@ -160,7 +163,8 @@ class _AddNewChildPageState extends State { ), Container( height: MediaQuery.of(context).size.height * 0.12, - width: 170, + width: 175, + color: Colors.white, child: SecondaryButton( textColor: checkedValue == 2 ? Colors.white : Colors.black, @@ -236,46 +240,47 @@ class _AddNewChildPageState extends State { SizedBox( height: 12, ), - //========= - ], - ), - ), - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.12, - width: double.infinity, - padding: EdgeInsets.all(12), - child: SecondaryButton( - textColor: Colors.white, - color: checkedValue == false - ? Colors.white24 - : Color.fromRGBO( - 63, - 72, - 74, - 1, - ), - label: "Add", - // - onTap: () async{ - newChild.babyName = _firstTextController.text + " " + _secondTextController.text; - newChild.gender = checkedValue.toString(); - newChild.strDOB = getStartDay(); - newChild.tempValue = true; - newChild.isLogin = true; + Container( + height: MediaQuery.of(context).size.height * 0.12, + width: double.infinity, + padding: EdgeInsets.all(15), + child: SecondaryButton( + textColor: Colors.white, + color: checkedValue == false + ? Colors.white24 + : Color.fromRGBO( + 63, + 72, + 74, + 1, + ), + label: "Add", + // + onTap: () async{ + newChild.babyName = _firstTextController.text + " " + _secondTextController.text; + newChild.gender = checkedValue.toString(); + newChild.strDOB = getStartDay(); + newChild.tempValue = true; + newChild.isLogin = true; - await model.createNewBabyOrders(newChild: newChild); - if(model.isAdded){ - AppToast.showSuccessToast(message: "Record Added"); - Navigator.pop(context,model.isAdded); - }else{ + await model.createNewBabyOrders(newChild: newChild); + if(model.isAdded){ + AppToast.showSuccessToast(message: "Record Added"); + Navigator.pop(context,model.isAdded); + }else{ - //TODO handling error - } + //TODO handling error + } - }, + }, + ), + ), + //========= + ], + ), ), ), + // bottomSheet: ), ); } diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart index 9f9f933c..806a5b71 100644 --- a/lib/pages/ChildVaccines/child_page.dart +++ b/lib/pages/ChildVaccines/child_page.dart @@ -1,8 +1,10 @@ import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; +import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'; import 'package:diplomaticquarterapp/pages/ChildVaccines/vaccinationtable_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -11,6 +13,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'dialogs/delete_child.dart'; + class ChildPage extends StatefulWidget { @override _ChildPageState createState() => _ChildPageState(); @@ -18,6 +22,9 @@ class ChildPage extends StatefulWidget { class _ChildPageState extends State with SingleTickerProviderStateMixin { + + DeleteBaby deleteBaby = DeleteBaby(); + @override Widget build(BuildContext context) { var checkedValue = true; @@ -84,23 +91,19 @@ class _ChildPageState extends State Icons.remove_red_eye, color: Colors.red, ), - tooltip: 'Increase volume by 10', + tooltip: '', onPressed: () { Navigator.push( context, FadePage( + + page: VaccinationTablePage(), - //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // HospitalsPage( - // findusHospitalModelList: model.FindusHospitalModelList, - // ) + ), ); - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); + }, ) ]), @@ -111,11 +114,10 @@ class _ChildPageState extends State IconButton( icon: new Image.asset( 'assets/images/new-design/calender-secondary.png'), - tooltip: 'Increase volume by 10', + tooltip: '', onPressed: () { setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); + }); }, ), @@ -128,14 +130,31 @@ class _ChildPageState extends State icon: new Image.asset( 'assets/images/new-design/garbage.png'), tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); + onPressed: ()async { + + //===================== + await model.deleteBabyOrders(newChild:deleteBaby ); + + + deleteBaby.babyID=model.babyInformationModelList[index] + .babyID; + + await model.deleteBabyOrders(newChild:deleteBaby ); + if(model.isDeleted){ + AppToast.showSuccessToast(message: "Record Deleted"); + Navigator.pop(context,model.isDeleted); + }else{ + + //TODO handling error + } + + + + + }, ), - Texts("Birthday"), + Texts("Delete"), ]), SizedBox( height: 12, @@ -153,7 +172,7 @@ class _ChildPageState extends State bottomSheet: Container( height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(15), child: SecondaryButton( textColor: Colors.white, color: checkedValue == false diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart index f8fe7b74..92f3a0be 100644 --- a/lib/pages/ChildVaccines/child_vaccines_page.dart +++ b/lib/pages/ChildVaccines/child_vaccines_page.dart @@ -50,7 +50,8 @@ class _ChildVaccinesPageState extends State child: Texts("Welcome back",fontSize: 20,), ) , ), - Divider(color:Colors.black ,), + Divider(color:Colors.black , indent: 10, + endIndent: 10,), SizedBox( height: 20, ), @@ -61,13 +62,17 @@ class _ChildVaccinesPageState extends State ) , ), - Divider(color:Colors.black ,), + Divider(color:Colors.black , indent: 10, + endIndent: 10,), Padding( padding: const EdgeInsets.all(10.0), child:Container( + margin: EdgeInsets.only(left: 10, right: 10, top: 15), child: TextFields( - hintText: model.user.emailAddress,//'Title', + fillColor: Colors.red, + + hintText: model.user.emailAddress, controller: titleController, fontSize: 20, hintColor: Colors.black, @@ -75,9 +80,7 @@ class _ChildVaccinesPageState extends State onChanged: (text) { addEmail=text; model.user.emailAddress==addEmail?checkedValue=false:checkedValue=true; - // checkedValue=true; - // print("First text field: $text"); - // print("First text field:"+ model.user.emailAddress); + }, validator: (value) { @@ -99,7 +102,7 @@ class _ChildVaccinesPageState extends State height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(15), child: SecondaryButton( textColor: Colors.white, color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), @@ -121,7 +124,7 @@ class _ChildVaccinesPageState extends State height: MediaQuery.of(context).size.height * 0.12, width: double.infinity, - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(15), child: SecondaryButton( textColor: Colors.white, color: Color.fromRGBO(63, 72, 74, 1,), @@ -140,6 +143,7 @@ class _ChildVaccinesPageState extends State ), ), + // Texts( // // TranslationBase.of(context).advancePaymentLabel, // model.user.emailAddress, @@ -148,253 +152,21 @@ class _ChildVaccinesPageState extends State SizedBox( height: 12, ), - // InkWell( - // onTap: () => confirmSelectHospitalDialog(model.CitiesModelList),//model.hospitals - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getHospitalName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), SizedBox( height: 12, ), - // InkWell( - // //======Gender======== - // onTap: () => confirmSelectGenderDialog(),//confirmSelectBeneficiaryDialog(model), - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // //Texts(getBeneficiaryType()), - // Texts(getGender()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // SizedBox( - // height: 12, - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // InkWell( - // onTap: () { - // model.getFamilyFiles().then((value) { - // confirmSelectFamilyDialog(model - // .getAllSharedRecordsByStatusResponse - // .getAllSharedRecordsByStatusList); - // }).showProgressBar( - // text: "Loading", - // backgroundColor: Colors.blue.withOpacity(0.6)); - // }, - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getFamilyMembersName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), SizedBox( height: 12, ), - // InkWell( - // //======Gender======== - // onTap: () => confirmSelectBloodDialog(),//confirmSelectBeneficiaryDialog(model), - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // //Texts(getBeneficiaryType()), - // Texts(getBlood()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // SizedBox( - // height: 12, - // ), - // if (beneficiaryType == BeneficiaryType.MyFamilyFiles) - // InkWell( - // onTap: () { - // model.getFamilyFiles().then((value) { - // confirmSelectFamilyDialog(model - // .getAllSharedRecordsByStatusResponse - // .getAllSharedRecordsByStatusList); - // }).showProgressBar( - // text: "Loading", - // backgroundColor: Colors.blue.withOpacity(0.6)); - // }, - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getFamilyMembersName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), + SizedBox( height: 12, ), - // Row( - // children: [ - // Container( - // child: Text(" To view the terms and conditions "), - // ), - // SizedBox( - // width: MediaQuery.of(context).size.height * 0.10, - // ), - // // InkWell( - // // onTap: () { - // // Navigator.of(context).push(MaterialPageRoute( - // // builder: (BuildContext context) => UserAgreementPage())); - // // }, - // // child: Container( - // // child: Texts(" Click here ",color: Colors.blue,), - // // ), - // // ) - // ], - // ), + SizedBox( height: 12, ), - // Row( - // children: [ - // Checkbox( - // onChanged: (bool value) { - // setState(() { - // checkedValue = value; - // }); - // }, - // // tristate: checkedValue==true,//i == 1, - // value: checkedValue, - // activeColor: Colors.red,//Color(0xFF6200EE), - // ), - // SizedBox(height: 10,), - // Row(children: [ - // - // ],), - // SizedBox( - // width: 10, - // ), - // Text( - // 'I agree to the terms and conditions ', - // style: Theme.of(context).textTheme.subtitle1.copyWith(color: checkedValue? Colors.red : Colors.black), - // ), - // ], - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).fileNumber, - // controller: _fileTextController, - // ), - // if (beneficiaryType == BeneficiaryType.OtherAccount) - // SizedBox( - // height: 12, - // ), - // if (beneficiaryType == BeneficiaryType.OtherAccount) - // InkWell( - // onTap: () { - // if (_fileTextController.text.isNotEmpty) - // model - // .getPatientInfoByPatientID( - // id: _fileTextController.text) - // .then((value) { - // confirmSelectPatientDialog(model.patientInfoList); - // }).showProgressBar( - // text: "Loading", - // backgroundColor: - // Colors.blue.withOpacity(0.6)); - // else - // AppToast.showErrorToast( - // message: 'Please Enter The File Number'); - // }, - // child: Container( - // padding: EdgeInsets.all(12), - // width: double.infinity, - // height: 65, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(12), - // color: Colors.white), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Texts(getPatientName()), - // Icon(Icons.arrow_drop_down) - // ], - // ), - // ), - // ), - // SizedBox( - // height: 12, - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).amount, - // keyboardType: TextInputType.number, - // onChanged: (value) { - // setState(() { - // amount = value; - // }); - // }, - // ), - // SizedBox( - // height: 12, - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).depositorEmail, - // initialValue: model.user.emailAddress, - // onChanged: (value) { - // email = value; - // }, - // ), - // SizedBox( - // height: 12, - // ), - // NewTextFields( - // hintText: TranslationBase.of(context).notes, - // controller: _notesTextController, - // ), SizedBox( height: 10, ), diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart index f84dea29..259bbdb7 100644 --- a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart +++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart @@ -1,10 +1,14 @@ import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class SelectGenderDialog extends StatefulWidget { + final Email; + + const SelectGenderDialog({Key key, this.Email}) : super(key: key); @override _SelectGenderDialogState createState() => _SelectGenderDialogState(); } @@ -31,6 +35,7 @@ class _SelectGenderDialogState extends State { child: ListTile( title: Text("Send the child's schedule to the email\n Tamer.dasdasdas@gmail.com "), + ), ), ) @@ -77,6 +82,7 @@ class _SelectGenderDialogState extends State { flex: 1, child: InkWell( onTap: () { + AppToast.showSuccessToast(message: "Email Sended"); // widget.onValueSelected(beneficiaryType); Navigator.pop(context); }, diff --git a/lib/pages/ChildVaccines/dialogs/delete_child.dart b/lib/pages/ChildVaccines/dialogs/delete_child.dart new file mode 100644 index 00000000..250f40d3 --- /dev/null +++ b/lib/pages/ChildVaccines/dialogs/delete_child.dart @@ -0,0 +1,103 @@ +import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + + +class DeleteChild extends StatefulWidget { + @override + _DeleteChildState createState() => _DeleteChildState(); +} + +class _DeleteChildState extends State { + @override + Widget build(BuildContext context) { + return SimpleDialog( + children: [ + Container( + child: Column( + children: [ + Divider(), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + setState(() { + //beneficiaryType = Gender.Male; + }); + }, + child: ListTile( + title: Text("Delete the child "), + + ), + ), + ) + ], + ), + SizedBox( + height: 5.0, + ), + + SizedBox( + height: 5.0, + ), + SizedBox( + height: 5.0, + ), + Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + child: Center( + child: Texts( + TranslationBase.of(context).cancel.toUpperCase(), + color: Colors.red, + ), + ), + ), + ), + ), + ), + Container( + width: 1, + height: 30, + color: Colors.grey[500], + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + // widget.onValueSelected(beneficiaryType); + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Center( + child: Texts( + TranslationBase.of(context).ok, + fontWeight: FontWeight.w400, + ), + ), + ), + ), + ), + ], + ) + ], + ), + ) + ], + ); + } +} diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart index 6ac11e4f..c160acfb 100644 --- a/lib/pages/ChildVaccines/vaccinationtable_page.dart +++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart @@ -61,67 +61,7 @@ class VaccinationTablePage extends StatelessWidget { ],), Divider(color:Colors.black ,), - // Row(children:[Texts("CHILD NAME"),]), - // Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), - - // Row( - // children: [IconButton( - // icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), - // tooltip: '', - // onPressed: () { - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - // }, - // ), - // Texts(model.babyInformationModelList[index].genderDescription), - // IconButton( - // icon: Icon(Icons.remove_red_eye,color: Colors.red,), - // tooltip: 'Increase volume by 10', - // onPressed: () { - // Navigator.push( - // context, - // FadePage( - // page: VaccinationTablePage(), - // - // //ChildPage(babyInformationModelList:model.BabyInformationModelList) - // // HospitalsPage( - // // findusHospitalModelList: model.FindusHospitalModelList, - // // ) - // - // ), - // ); - // // setState(() { - // // // _volume += 10; - // // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // // }); - // }, - // )] - // ), - // Row(children:[Texts("Birthday"),]), - // Row(children:[IconButton( - // icon: new Image.asset('assets/images/new-design/calender-secondary.png'), - // tooltip: 'Increase volume by 10', - // onPressed: () { - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - // }, - // ), - // Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), - // Row(children:[IconButton( - // icon: new Image.asset('assets/images/new-design/garbage.png'), - // tooltip: '', - // onPressed: () { - // setState(() { - // // _volume += 10; - // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - // }); - // }, - // ), - // Texts("Birthday"),]), + ], ) diff --git a/lib/widgets/input/text_field.dart b/lib/widgets/input/text_field.dart index 0476c352..7cfba5e6 100644 --- a/lib/widgets/input/text_field.dart +++ b/lib/widgets/input/text_field.dart @@ -46,6 +46,7 @@ class TextFields extends StatefulWidget { this.suffixIcon, this.autoFocus, this.onChanged, + // this.initialValue, this.minLines, this.maxLines, @@ -72,6 +73,7 @@ class TextFields extends StatefulWidget { this.fontSize = 16.0, this.fontWeight = FontWeight.w700, this.autoValidate = false, + this.fillColor, this.hintColor}) : super(key: key); @@ -108,6 +110,7 @@ class TextFields extends StatefulWidget { final bool focus; final bool borderOnlyError; final Color hintColor; + final Color fillColor; @override _TextFieldsState createState() => _TextFieldsState(); @@ -211,7 +214,7 @@ class _TextFieldsState extends State { blurRadius: focus ? 34.0 : 12.0) ]), child: TextFormField( - + keyboardAppearance: Theme.of(context).brightness, scrollPhysics: BouncingScrollPhysics(), autovalidate: widget.autoValidate, @@ -242,6 +245,7 @@ class _TextFieldsState extends State { .textTheme .body2 .copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight), + inputFormatters: widget.keyboardType == TextInputType.phone ? [ WhitelistingTextInputFormatter.digitsOnly, @@ -249,12 +253,15 @@ class _TextFieldsState extends State { ] : widget.inputFormatters, decoration: InputDecoration( + counterText: "", hintText: widget.hintText, hintStyle: TextStyle( fontSize: widget.fontSize, fontWeight: widget.fontWeight, color: widget.hintColor ?? Theme.of(context).hintColor, + + ), contentPadding: widget.padding != null ? widget.padding From c6a9b6653803b9ce3839e7df2c75b9ab4deac01e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Sun, 11 Oct 2020 16:11:57 +0300 Subject: [PATCH 31/37] women health --- .../bmr_calculator/bmr_calculator.dart | 6 +- .../health_calculator/body_fat/body_fat.dart | 593 +++++++++--------- .../calorie_calculator.dart | 6 +- .../health_calculator/carbs/carbs.dart | 2 +- .../delivery_due/delivery_due.dart | 146 +++++ .../delivery_due_result_page.dart | 106 ++++ .../ideal_body/ideal_body.dart | 300 ++++----- .../ovulation_period/ovulation_period.dart | 350 +++++++++++ .../ovulation_result_page.dart | 96 +++ .../​ health_calculators.dart | 22 +- 10 files changed, 1173 insertions(+), 454 deletions(-) create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart create mode 100644 lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart index 05d3d07a..3d287610 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart @@ -207,7 +207,7 @@ class _BmrCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -306,7 +306,7 @@ class _BmrCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -481,7 +481,7 @@ class _BmrCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart index 4a939b3f..ccc7d212 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart @@ -285,98 +285,101 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(heightCm.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(heightCm.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (heightCm < 250) + heightCm++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (heightCm < 250) - heightCm++; + if (heightCm > 0) + heightCm--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (heightCm > 0) - heightCm--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: heightCm.toDouble(), - min: 0, - max: 250, - onChanged: (double newValue) { - setState(() { - heightCm = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: heightCm.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + heightCm = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -458,96 +461,99 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(neck.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(neck.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (neck < 60) neck++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (neck < 60) neck++; + if (neck > 5) neck--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (neck > 5) neck--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: neck.toDouble(), - min: 5, - max: 60, - onChanged: (double newValue) { - setState(() { - neck = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: neck.toDouble(), + min: 5, + max: 60, + onChanged: (double newValue) { + setState(() { + neck = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -629,96 +635,100 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(waist.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(waist.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (waist < 200) + waist++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (waist < 200) waist++; + if (waist > 5) waist--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (waist > 5) waist--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: waist.toDouble(), - min: 5, - max: 200, - onChanged: (double newValue) { - setState(() { - waist = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: waist.toDouble(), + min: 5, + max: 200, + onChanged: (double newValue) { + setState(() { + waist = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -800,96 +810,99 @@ class _BodyFatState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(hip.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(hip.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, ), + onTap: () { + setState(() { + if (hip < 140) hip++; + }); + }, ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (hip < 140) hip++; + if (hip > 5) hip--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (hip > 5) hip--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: hip.toDouble(), - min: 5, - max: 140, - onChanged: (double newValue) { - setState(() { - hip = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: hip.toDouble(), + min: 5, + max: 140, + onChanged: (double newValue) { + setState(() { + hip = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart index ac1aacc3..994484e7 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart @@ -181,7 +181,7 @@ class _CalorieCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -280,7 +280,7 @@ class _CalorieCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, @@ -448,7 +448,7 @@ class _CalorieCalculatorState extends State { Row( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, diff --git a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart index 32ec9262..2dfc3f92 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart @@ -97,7 +97,7 @@ class _CarbsState extends State { Column( children: [ Container( - width: 335.0, + width: 340.0, height: 60.0, decoration: BoxDecoration( color: Colors.white, diff --git a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart new file mode 100644 index 00000000..1e8cb50c --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due.dart @@ -0,0 +1,146 @@ +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; +import 'package:intl/intl.dart'; + +import 'delivery_due_result_page.dart'; + +class DeliveryDue extends StatefulWidget { + @override + _DeliveryDueState createState() => _DeliveryDueState(); +} + +class _DeliveryDueState extends State { + DateTime bloodSugarDate = DateTime.now(); + DateTime timeSugarDate = DateTime.now(); + var dateFrom = DateTime.now(); + var dateTo = DateTime.now(); + var conceivedDate = DateTime.now(); + var deliveryDue = DateTime.now(); + var firstTrimester = DateTime.now(); + var secondTrimester = DateTime.now(); + var thirdTrimester = DateTime.now(); + var dt = DateTime.now(); + var newFormat = DateFormat("yy-MM-dd"); + + String getDate() { + return "${DateUtil.getMonth(bloodSugarDate.month)} ${bloodSugarDate.day}, ${bloodSugarDate.year}"; + } + + String getTime() { + return " ${timeSugarDate.hour}:${timeSugarDate.minute}"; + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Delivery Due Date', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 35.0, vertical: 20.0), + child: SingleChildScrollView( + child: Container( + child: Column( + //mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Texts( + 'Congratulations, you are pregnant! Now when will the new baby arrive? To estimate the due date, enter the date when the last menstrual perios began (the first day), then click calculate.', + ), + Divider( + //height: 2, + thickness: 2, + ), + Column( + children: [ + Texts( + 'What was the date of the first day of the last period?', + ), + InkWell( + onTap: () { + DatePicker.showDatePicker( + context, + showTitleActions: true, + minTime: DateTime(DateTime.now().year - 1, 1, 1), + maxTime: DateTime.now(), + onConfirm: (date) { + print('confirm $date'); + setState(() { + bloodSugarDate == date + ? null + : bloodSugarDate = DateTime.now(); + dateFrom = date.add(Duration(days: 10)); + + dateTo = date.add(Duration(days: 20)); + conceivedDate = date.add(Duration(days: 14)); + deliveryDue = date.add(Duration(days: 280)); + firstTrimester = date.add(Duration(days: 85)); + secondTrimester = date.add(Duration(days: 190)); + thirdTrimester = date.add(Duration(days: 280)); + }); + }, + currentTime: DateTime.now(), + ); + }, + child: Container( + padding: EdgeInsets.all(12), + width: double.infinity, + height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon(Icons.date_range_rounded), + Texts('Date'), + ], + ), + Texts(getDate()), + ], + ), + ), + ), + ], + ), + SizedBox( + height: 280.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => DeliveryDueResult( + conceivedDate: conceivedDate, + dateFrom: dateFrom, + dateTo: dateTo, + deliveryDue: deliveryDue, + firstTrimester: firstTrimester, + secondTrimester: secondTrimester, + thirdTrimester: thirdTrimester, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart new file mode 100644 index 00000000..fc53b044 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/delivery_due/delivery_due_result_page.dart @@ -0,0 +1,106 @@ +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; + +class DeliveryDueResult extends StatelessWidget { + var dateFrom; + var dateTo; + var conceivedDate; + var deliveryDue; + var firstTrimester; + var secondTrimester; + var thirdTrimester; + DeliveryDueResult( + {this.dateFrom, + this.dateTo, + this.conceivedDate, + this.deliveryDue, + this.firstTrimester, + this.secondTrimester, + this.thirdTrimester}); + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Delivery Due Date', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 30.0, vertical: 12.0), + child: SingleChildScrollView( + child: Container( + height: 750.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Texts( + 'The next ovulation period is estimated to be:', + fontWeight: FontWeight.w400, + ), + Texts( + 'From:', + fontWeight: FontWeight.w400, + ), + Texts(DateFormat.yMMMEd().format(dateFrom), + fontWeight: FontWeight.w800, + fontSize: 21.0, + color: Color(0xffC5272D)), + Texts( + 'To:', + fontWeight: FontWeight.w400, + ), + Texts(DateFormat.yMMMEd().format(dateTo), + fontWeight: FontWeight.w800, + fontSize: 21.0, + color: Color(0xffC5272D)), + Texts( + 'You have conceived on:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(conceivedDate), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'First Trimester Ends (12 weeks):', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(firstTrimester), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'Second Trimester Ends (27 weeks):', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(secondTrimester), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'Third Trimester, Estimated Due Date (40 weeks):', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(thirdTrimester), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart index f534416f..fb4f8948 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart @@ -29,7 +29,7 @@ class _IdealBodyState extends State { double overWeightBy; int weight = 0; double idealWeight = 0; - String dropdownValue; + String dropdownValue = 'Medium(fingers touch)'; double calories = 0; String textResult = ''; double maxIdealWeight; @@ -126,97 +126,100 @@ class _IdealBodyState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(height.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(height.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), ), ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (height < 250) + height++; + }); + }, + ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (height < 250) - height++; + if (height > 0) height--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (height > 0) height--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: height.toDouble(), - min: 0, - max: 250, - onChanged: (double newValue) { - setState(() { - height = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: height.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + height = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], @@ -304,97 +307,100 @@ class _IdealBodyState extends State { ), Row( children: [ - Container( - width: 335.0, - height: 60.0, - decoration: BoxDecoration( - color: Colors.white, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.symmetric( - vertical: 10.0, horizontal: 8.0), - child: Center( - child: Container( - width: 60.0, - foregroundDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(5.0), - border: Border.all( - color: Colors.blueGrey, - width: 2.0, + Expanded( + child: Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: + BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), ), - ), - child: Row( - children: [ - Expanded( - child: Center( - child: Text(weight.toString()), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(weight.toString()), + ), ), - ), - Container( - height: 38.0, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - width: 0.5, + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), ), ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (weight < 250) + weight++; + }); + }, + ), ), - child: InkWell( + InkWell( child: Icon( - Icons.arrow_drop_up, + Icons.arrow_drop_down, size: 18.0, ), onTap: () { setState(() { - if (weight < 250) - weight++; + if (weight > 0) weight--; }); }, ), - ), - InkWell( - child: Icon( - Icons.arrow_drop_down, - size: 18.0, - ), - onTap: () { - setState(() { - if (weight > 0) weight--; - }); - }, - ), - ], + ], + ), ), - ), - ], + ], + ), ), ), ), - ), - Expanded( - child: Slider( - value: weight.toDouble(), - min: 0, - max: 250, - onChanged: (double newValue) { - setState(() { - weight = newValue.round(); - }); - }, - activeColor: Color(0xffC5272D), - inactiveColor: Color(0xffF3C5C6), + Expanded( + child: Slider( + value: weight.toDouble(), + min: 0, + max: 250, + onChanged: (double newValue) { + setState(() { + weight = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), ), - ), - ], + ], + ), ), ), ], diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart new file mode 100644 index 00000000..adc2f06d --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart @@ -0,0 +1,350 @@ +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart'; +import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; +import 'package:intl/intl.dart'; + +class OvulationPeriod extends StatefulWidget { + @override + _OvulationPeriodState createState() => _OvulationPeriodState(); +} + +class _OvulationPeriodState extends State { + DateTime bloodSugarDate = DateTime.now(); + DateTime timeSugarDate = DateTime.now(); + int cycleLength = 0; + int lutealPhaseLength = 0; + String selectedDate; + var dateFrom = DateTime.now(); + var dateTo = DateTime.now(); + var conceivedDate = DateTime.now(); + var deliveryDue = DateTime.now(); + var dt = DateTime.now(); + var newFormat = DateFormat("yy-MM-dd"); + String updatedDt; + + String getTime() { + return " ${timeSugarDate.hour}:${timeSugarDate.minute}"; + } + + String getDate() { + return "${DateUtil.getMonth(bloodSugarDate.month)} ${bloodSugarDate.day}, ${bloodSugarDate.year}"; + } + + // void calculate() {} + // + // void calculateFertility(DateTime selectedDate) {const diff = Date.} + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Ovulation Period', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 700.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts('Calculates Ovulation Period'), + SizedBox( + height: 12.0, + ), + Divider( + //height: 2, + thickness: 2, + ), + SizedBox( + height: 12.0, + ), + InkWell( + onTap: () { + DatePicker.showDatePicker( + context, + showTitleActions: true, + minTime: DateTime(DateTime.now().year - 1, 1, 1), + maxTime: DateTime.now(), + onConfirm: (date) { + print('confirm $date'); + setState(() { + bloodSugarDate = date; + dateFrom = date.add(Duration(days: 10)); + updatedDt = DateFormat.yMMMEd().format(dateFrom); + + dateTo = date.add(Duration(days: 20)); + conceivedDate = date.add(Duration(days: 14)); + deliveryDue = date.add(Duration(days: 280)); + }); + }, + currentTime: DateTime.now(), + ); + }, + child: Container( + padding: EdgeInsets.all(12), + width: double.infinity, + height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: Colors.white), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Texts('Date'), + Texts(getDate()), + ], + ), + ), + ), + SizedBox( + height: 5.0, + ), + Texts( + 'Average Cycle Length (usually 28 days):', + fontWeight: FontWeight.w400, + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: Text(cycleLength.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (cycleLength < 45) + cycleLength++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (cycleLength > 0) + cycleLength--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: cycleLength.toDouble(), + min: 0, + max: 45, + onChanged: (double newValue) { + setState(() { + cycleLength = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + Texts( + 'Average Luteal Phase Length (usually 14 days):', + fontWeight: FontWeight.w400, + ), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Container( + width: 340.0, + height: 60.0, + decoration: BoxDecoration( + color: Colors.white, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 8.0), + child: Center( + child: Container( + width: 60.0, + foregroundDecoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + border: Border.all( + color: Colors.blueGrey, + width: 2.0, + ), + ), + child: Row( + children: [ + Expanded( + child: Center( + child: + Text(lutealPhaseLength.toString()), + ), + ), + Container( + height: 38.0, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0.5, + ), + ), + ), + child: InkWell( + child: Icon( + Icons.arrow_drop_up, + size: 18.0, + ), + onTap: () { + setState(() { + if (lutealPhaseLength < 15) + lutealPhaseLength++; + }); + }, + ), + ), + InkWell( + child: Icon( + Icons.arrow_drop_down, + size: 18.0, + ), + onTap: () { + setState(() { + if (lutealPhaseLength > 0) + lutealPhaseLength--; + }); + }, + ), + ], + ), + ), + ], + ), + ), + ), + ), + Expanded( + child: Slider( + value: lutealPhaseLength.toDouble(), + min: 0, + max: 15, + onChanged: (double newValue) { + setState(() { + lutealPhaseLength = newValue.round(); + }); + }, + activeColor: Color(0xffC5272D), + inactiveColor: Color(0xffF3C5C6), + ), + ), + ], + ), + ), + ], + ), + SizedBox( + height: 220.0, + ), + Container( + height: 100.0, + width: 350.0, + child: Button( + label: 'CALCULATE', + onTap: () { + setState(() { + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => OvulationResult( + conceivedDate: conceivedDate, + dateFrom: dateFrom, + dateTo: dateTo, + deliveryDue: deliveryDue, + )), + ); + } + }); + }, + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart new file mode 100644 index 00000000..6669bf75 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_result_page.dart @@ -0,0 +1,96 @@ +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; + +class OvulationResult extends StatelessWidget { + var dateFrom; + var dateTo; + var conceivedDate; + var deliveryDue; + OvulationResult( + {this.dateFrom, this.dateTo, this.deliveryDue, this.conceivedDate}); + //var newFormat = DateFormat("yy-MM-dd"); + + @override + Widget build(BuildContext context) { + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Ovulation Period', + body: Padding( + padding: EdgeInsets.symmetric(horizontal: 30.0, vertical: 15.0), + child: SingleChildScrollView( + child: Container( + height: 750.0, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Texts( + 'The next ovulation period is estimated to be:', + fontWeight: FontWeight.w400, + ), + Texts( + 'From:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(dateFrom), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'To:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(dateTo), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'Useful Information:', + color: Color(0xffC5272D), + ), + Texts( + 'You have conceived on:', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(conceivedDate), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'The baby\'s age right now:', + fontWeight: FontWeight.w400, + ), + Texts( + '5 Weeks, 2', + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Texts( + 'The delivery due date is estimated to be on the: ', + fontWeight: FontWeight.w400, + ), + Texts( + DateFormat.yMMMEd().format(deliveryDue), + fontWeight: FontWeight.w800, + fontSize: 21.0, + ), + Container( + width: 350, + child: Button( + label: 'See List Of Doctors', + ), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart index 56fb0428..15f7209b 100644 --- a/lib/pages/AlHabibMedicalService/​ health_calculators.dart +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -2,6 +2,7 @@ import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/page import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -9,6 +10,7 @@ import 'package:flutter/material.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'health_calculator/bmr_calculator/bmr_calculator.dart'; +import 'health_calculator/delivery_due/delivery_due.dart'; import 'health_calculator/ideal_body/ideal_body.dart'; class HealthCalculators extends StatefulWidget { @@ -233,10 +235,10 @@ class _HealthCalculatorsState extends State flex: 1, child: InkWell( onTap: () { - // Navigator.push( - // context, - // FadePage(page: BloodSugar()), - // ); + Navigator.push( + context, + FadePage(page: OvulationPeriod()), + ); }, child: MedicalProfileItem( title: 'Ovulation', @@ -249,12 +251,12 @@ class _HealthCalculatorsState extends State flex: 1, child: InkWell( onTap: () { - // Navigator.push( - // context, - // FadePage( - // page: BloodCholesterol(), - // ), - // ); + Navigator.push( + context, + FadePage( + page: DeliveryDue(), + ), + ); }, child: MedicalProfileItem( title: 'Delivery', From 3ad928902bedf0df8ad065261fc55fbffe1084ce Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 12 Oct 2020 11:44:32 +0300 Subject: [PATCH 32/37] voice command --- assets/images/book.svg | 1 - assets/images/{ => svg}/robort_svg.svg | 0 assets/images/{ => svg}/symptom.svg | 0 lib/core/service/client/base_app_client.dart | 27 +- lib/main.dart | 8 +- .../E-Referral/e_referral_index_page.dart | 109 ++++--- .../h2o/h2o_index_page.dart | 2 +- .../AlHabibMedicalService/h2o/today_page.dart | 73 ++--- lib/pages/Blood/my_balance_page.dart | 5 +- lib/pages/BookAppointment/SearchResults.dart | 7 +- .../BookAppointment/widgets/BranchView.dart | 19 +- lib/pages/landing/home_page.dart | 36 ++- lib/pages/landing/landing_page.dart | 2 +- .../medical/balance/my_balance_page.dart | 5 +- .../my_trackers/Weight/WeightHomePage.dart | 2 +- .../my_trackers/Weight/WeightMonthlyPage.dart | 21 +- .../my_trackers/Weight/WeightWeeklyPage.dart | 34 +- .../my_trackers/Weight/WeightYeaPage.dart | 20 +- .../blood_pressure/BloodPressureHomePage.dart | 2 +- .../blood_pressure/BloodPressureMonthly.dart | 14 +- .../blood_pressure/BloodPressureYeaPage.dart | 9 +- .../bloodPressureWeeklyPage.dart | 42 ++- .../my_trackers/blood_suger/BloodMonthly.dart | 150 ++++----- .../my_trackers/blood_suger/BloodYeaPage.dart | 9 +- .../blood_suger/blood_sugar_home_page.dart | 30 +- .../blood_suger/blood_sugar_weekly_page.dart | 42 ++- .../vital_sign_details_wideget.dart | 4 +- .../medical/vital_sign/vital_sign_item.dart | 18 +- lib/pages/paymentService/payment_service.dart | 8 +- .../rate_appointment_clinic.dart | 2 +- .../rate_appointment_doctor.dart | 6 +- lib/services/robo_search/search_provider.dart | 2 +- lib/widgets/buttons/button.dart | 2 +- .../medical/laboratory_result_widget.dart | 30 +- .../medical/medical_profile_item.dart | 2 +- .../others/app_expandable_notifier.dart | 14 +- lib/widgets/others/app_scaffold_widget.dart | 2 +- .../others/floating_button_search.dart | 210 +++++++------ lib/widgets/robo-search/robosearch.dart | 297 ++++++++++++++---- pubspec.yaml | 6 +- 40 files changed, 797 insertions(+), 475 deletions(-) delete mode 100644 assets/images/book.svg rename assets/images/{ => svg}/robort_svg.svg (100%) rename assets/images/{ => svg}/symptom.svg (100%) diff --git a/assets/images/book.svg b/assets/images/book.svg deleted file mode 100644 index d4679486..00000000 --- a/assets/images/book.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/images/robort_svg.svg b/assets/images/svg/robort_svg.svg similarity index 100% rename from assets/images/robort_svg.svg rename to assets/images/svg/robort_svg.svg diff --git a/assets/images/symptom.svg b/assets/images/svg/symptom.svg similarity index 100% rename from assets/images/symptom.svg rename to assets/images/svg/symptom.svg diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index f5494049..16b3286c 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -32,7 +32,9 @@ class BaseAppClient { var user = await sharedPref.getObject(USER_PROFILE); if (body.containsKey('SetupID')) { body['SetupID'] = body.containsKey('SetupID') - ? body['SetupID'] != null ? body['SetupID'] : SETUP_ID + ? body['SetupID'] != null + ? body['SetupID'] + : SETUP_ID : SETUP_ID; } body['VersionID'] = VERSION_ID; @@ -41,7 +43,9 @@ class BaseAppClient { body['IPAdress'] = IP_ADDRESS; body['generalid'] = GENERAL_ID; body['PatientOutSA'] = body.containsKey('PatientOutSA') - ? body['PatientOutSA'] != null ? body['PatientOutSA'] : PATIENT_OUT_SA + ? body['PatientOutSA'] != null + ? body['PatientOutSA'] + : PATIENT_OUT_SA : PATIENT_OUT_SA; if (body.containsKey('isDentalAllowedBackend')) { @@ -55,30 +59,32 @@ class BaseAppClient { body['DeviceTypeID'] = DeviceTypeID; - if(!body.containsKey('IsPublicRequest')) { + if (!body.containsKey('IsPublicRequest')) { body['PatientType'] = body.containsKey('PatientType') - ? body['PatientType'] != null ? body['PatientType'] : PATIENT_TYPE + ? body['PatientType'] != null + ? body['PatientType'] + : PATIENT_TYPE : PATIENT_TYPE; body['PatientTypeID'] = body.containsKey('PatientTypeID') ? body['PatientTypeID'] != null - ? body['PatientTypeID'] - : PATIENT_TYPE_ID + ? body['PatientTypeID'] + : PATIENT_TYPE_ID : PATIENT_TYPE_ID; if (user != null) { body['TokenID'] = token; body['PatientID'] = - body['PatientID'] != null ? body['PatientID'] : user['PatientID']; + body['PatientID'] != null ? body['PatientID'] : user['PatientID']; body['PatientOutSA'] = user['OutSA']; - body['SessionID'] = getSessionId(token); + body['SessionID'] = SESSION_ID;//getSessionId(token); } } print("URL : $url"); print("Body : ${json.encode(body)}"); - var asd=""; + var asd = ""; if (await Utils.checkConnection()) { final response = await http.post(url.trim(), body: json.encode(body), @@ -139,6 +145,7 @@ class BaseAppClient { } String getSessionId(String id) { - return id.replaceAll(RegExp('/[^a-zA-Z ]'), ''); + ///return id.replaceAll(RegExp('/[^\w\s]/'), ''); + // return id.replaceAll(RegExp('/[^a-zA-Z ]'), ''); } } diff --git a/lib/main.dart b/lib/main.dart index ec42e7a3..d8e3307d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -66,7 +66,8 @@ class MyApp extends StatelessWidget { hintColor: Colors.grey[400], disabledColor: Colors.grey[300], errorColor: Color.fromRGBO(235, 80, 60, 1.0), - scaffoldBackgroundColor:Hexcolor('#E9E9E9'),// Colors.grey[100], + scaffoldBackgroundColor: + HexColor('#E9E9E9'), // Colors.grey[100], textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5), textSelectionHandleColor: Colors.grey, canvasColor: Colors.white, @@ -74,9 +75,8 @@ class MyApp extends StatelessWidget { highlightColor: Colors.grey[100].withOpacity(0.4), splashColor: Colors.transparent, primaryColor: Colors.grey, - bottomSheetTheme:BottomSheetThemeData( - backgroundColor: Hexcolor('#E0E0E0') - ) , + bottomSheetTheme: BottomSheetThemeData( + backgroundColor: HexColor('#E0E0E0')), cursorColor: Colors.grey, iconTheme: IconThemeData(), appBarTheme: AppBarTheme( diff --git a/lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart b/lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart index 00148889..ef0be383 100644 --- a/lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart +++ b/lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart @@ -17,66 +17,63 @@ import 'e_referral_page.dart'; class EReferralIndexPage extends StatelessWidget { @override Widget build(BuildContext context) { - return AppScaffold( - isShowAppBar: true, - appBarTitle: "Service Information", - body: SingleChildScrollView( + return AppScaffold( + isShowAppBar: true, + appBarTitle: "Service Information", + body: SingleChildScrollView( padding: EdgeInsets.all(12), - child: - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts( - "E-Referral: ", - fontWeight: FontWeight.normal, - fontSize: 25, - color: Hexcolor("#60686b"), - ), - SizedBox( - height: 12, - ), - Texts( - "This service allows you to submit a Referral request from any health care providers either inside or outside the kingdom of Saudi Arabia to any of HMG Hospitals, By filling some of the patient's data and attaching the medical reports, moreover you can track the request status (Under process, Accepted or Rejected)", - fontWeight: FontWeight.normal, - fontSize: 17, - ), - SizedBox( - height: 22, - ), - Center( - child: SizedBox( - height: MediaQuery.of(context).size.height * 0.55, - width: MediaQuery.of(context).size.width * 0.50, - child: CarouselSlider( - imagesUrlList: [ - "https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/0.png", - "https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/1.png" - ], - ), - ), - ), - SizedBox( - height: 77, - ), - ], - ) - - ), - bottomSheet: Container( - height: MediaQuery.of(context).size.height * 0.10, - width: double.infinity, child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - width: MediaQuery.of(context).size.width * 0.9, - child: SecondaryButton( - onTap: ()=> Navigator.push(context, FadePage(page: EReferralPage())), - label: "E-Referral", - textColor: Theme.of(context).backgroundColor), + Texts( + "E-Referral: ", + fontWeight: FontWeight.normal, + fontSize: 25, + color: HexColor("#60686b"), + ), + SizedBox( + height: 12, + ), + Texts( + "This service allows you to submit a Referral request from any health care providers either inside or outside the kingdom of Saudi Arabia to any of HMG Hospitals, By filling some of the patient's data and attaching the medical reports, moreover you can track the request status (Under process, Accepted or Rejected)", + fontWeight: FontWeight.normal, + fontSize: 17, + ), + SizedBox( + height: 22, + ), + Center( + child: SizedBox( + height: MediaQuery.of(context).size.height * 0.55, + width: MediaQuery.of(context).size.width * 0.50, + child: CarouselSlider( + imagesUrlList: [ + "https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/0.png", + "https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/1.png" + ], + ), + ), + ), + SizedBox( + height: 77, ), ], - ), - - )); + )), + bottomSheet: Container( + height: MediaQuery.of(context).size.height * 0.10, + width: double.infinity, + child: Column( + children: [ + Container( + width: MediaQuery.of(context).size.width * 0.9, + child: SecondaryButton( + onTap: () => Navigator.push( + context, FadePage(page: EReferralPage())), + label: "E-Referral", + textColor: Theme.of(context).backgroundColor), + ), + ], + ), + )); } } diff --git a/lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart b/lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart index 9ce35d27..68ce1936 100644 --- a/lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart +++ b/lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart @@ -23,7 +23,7 @@ class H2OPageIndexPage extends StatelessWidget { "Water Tracker:", fontWeight: FontWeight.normal, fontSize: 25, - color: Hexcolor("#60686b"), + color: HexColor("#60686b"), ), SizedBox( height: 12, diff --git a/lib/pages/AlHabibMedicalService/h2o/today_page.dart b/lib/pages/AlHabibMedicalService/h2o/today_page.dart index 55767e5a..b92efc9e 100644 --- a/lib/pages/AlHabibMedicalService/h2o/today_page.dart +++ b/lib/pages/AlHabibMedicalService/h2o/today_page.dart @@ -6,10 +6,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:percent_indicator/circular_percent_indicator.dart'; + class TodayPage extends StatelessWidget { @override Widget build(BuildContext context) { - return BaseView( + return BaseView( onModelReady: (model) => model.getUserProgressForTodayData(), builder: (_, model, widget) => AppScaffold( isShowAppBar: false, @@ -27,11 +28,11 @@ class TodayPage extends StatelessWidget { animation: true, animationDuration: 1200, lineWidth: 15.0, - percent:model.userProgressData ==null ?0.0: - (model.userProgressData.percentageConsumed / - 100) >= 1 ? 1 : (model.userProgressData - .percentageConsumed / - 100), + percent: model.userProgressData == null + ? 0.0 + : (model.userProgressData.percentageConsumed / 100) >= 1 + ? 1 + : (model.userProgressData.percentageConsumed / 100), //, center: Center( child: Column( @@ -46,13 +47,16 @@ class TodayPage extends StatelessWidget { SizedBox( height: 4, ), - Text(model.userProgressData ==null ?"0.0": - model.userProgressData.quantityConsumed - .toString() + 'ml', + Text( + model.userProgressData == null + ? "0.0" + : model.userProgressData.quantityConsumed + .toString() + + 'ml', style: TextStyle( fontWeight: FontWeight.bold, fontSize: 20.0, - color: Hexcolor("#60BCF9")), + color: HexColor("#60BCF9")), ), SizedBox( height: 4, @@ -60,9 +64,7 @@ class TodayPage extends StatelessWidget { SizedBox( height: 5, width: 50, - child: Container( - - ), + child: Container(), ), SizedBox( height: 4, @@ -74,23 +76,28 @@ class TodayPage extends StatelessWidget { SizedBox( height: 4, ), - Text(model.userProgressData ==null ?"0.0": - (model.userProgressData.quantityLimit - - model.userProgressData - .quantityConsumed) < 0 ? "0 ml" : - (model.userProgressData.quantityLimit - - model.userProgressData - .quantityConsumed).toString() + ' ml', + Text( + model.userProgressData == null + ? "0.0" + : (model.userProgressData.quantityLimit - + model.userProgressData + .quantityConsumed) < + 0 + ? "0 ml" + : (model.userProgressData.quantityLimit - + model.userProgressData + .quantityConsumed) + .toString() + + ' ml', style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 18.0), + fontWeight: FontWeight.bold, fontSize: 18.0), ), ], ), ), circularStrokeCap: CircularStrokeCap.butt, - backgroundColor: Hexcolor("#D1E3F6"), - progressColor: Hexcolor("#60BCF9"), + backgroundColor: HexColor("#D1E3F6"), + progressColor: HexColor("#60BCF9"), ), ), Row( @@ -105,9 +112,9 @@ class TodayPage extends StatelessWidget { height: 30, width: 70, decoration: BoxDecoration( - color: Hexcolor("#D1E3F6"), - borderRadius: BorderRadius.all( - Radius.circular(30))), + color: HexColor("#D1E3F6"), + borderRadius: + BorderRadius.all(Radius.circular(30))), ), ), Text( @@ -125,9 +132,9 @@ class TodayPage extends StatelessWidget { height: 30, width: 70, decoration: BoxDecoration( - color: Hexcolor("#60BCF9"), - borderRadius: BorderRadius.all( - Radius.circular(30))), + color: HexColor("#60BCF9"), + borderRadius: + BorderRadius.all(Radius.circular(30))), ), ), Text( @@ -143,10 +150,7 @@ class TodayPage extends StatelessWidget { ), SizedBox( height: 0.5, - width: MediaQuery - .of(context) - .size - .width, + width: MediaQuery.of(context).size.width, child: Container( color: Colors.grey, ), @@ -163,4 +167,3 @@ class TodayPage extends StatelessWidget { ); } } - diff --git a/lib/pages/Blood/my_balance_page.dart b/lib/pages/Blood/my_balance_page.dart index 07d27e2d..26665c2b 100644 --- a/lib/pages/Blood/my_balance_page.dart +++ b/lib/pages/Blood/my_balance_page.dart @@ -39,7 +39,7 @@ class MyBalancePage extends StatelessWidget { width: double.infinity, height: 65, decoration: BoxDecoration( - color: Hexcolor('#B61422'), + color: HexColor('#B61422'), shape: BoxShape.rectangle, borderRadius: BorderRadius.circular(7), ), @@ -97,7 +97,8 @@ class MyBalancePage extends StatelessWidget { textColor: Colors.white, label: TranslationBase.of(context).createAdvancedPayment, onTap: () { - Navigator.push(context, + Navigator.push( + context, //FadePage(page: AdvancePaymentPage())); FadePage(page: BloodDonationPage())); }, diff --git a/lib/pages/BookAppointment/SearchResults.dart b/lib/pages/BookAppointment/SearchResults.dart index e9767072..bd4bb601 100644 --- a/lib/pages/BookAppointment/SearchResults.dart +++ b/lib/pages/BookAppointment/SearchResults.dart @@ -21,12 +21,6 @@ class _SearchResultsState extends State { // var event = RobotProvider(); List tempList = []; - @override - void initState() { - // event.controller.stream.listen((p) {}); - super.initState(); - } - @override Widget build(BuildContext context) { return AppScaffold( @@ -41,6 +35,7 @@ class _SearchResultsState extends State { ...List.generate( widget.patientDoctorAppointmentListHospital.length, (index) => AppExpandableNotifier( + isExpand: index == 1 ? true : false, title: widget.patientDoctorAppointmentListHospital[index] .filterName + " - " + diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart index 455a579b..58ccbd1a 100644 --- a/lib/pages/BookAppointment/widgets/BranchView.dart +++ b/lib/pages/BookAppointment/widgets/BranchView.dart @@ -31,6 +31,7 @@ class _BranchViewState extends State { body: new ListView.builder( itemBuilder: (BuildContext context, int index) { return new ExpandableListView( + isExpanded: index == 0 ? true : false, result2: widget.result, resultDistance: widget.resultDistance, val: index, @@ -48,8 +49,14 @@ class ExpandableListView extends StatefulWidget { final List doctorsList2; final val; static int doctorListheight = 0; + final bool isExpanded; const ExpandableListView( - {Key key, this.result2, this.resultDistance, this.val, this.doctorsList2}) + {Key key, + this.result2, + this.resultDistance, + this.val, + this.doctorsList2, + this.isExpanded}) : super(key: key); @override @@ -58,9 +65,17 @@ class ExpandableListView extends StatefulWidget { class _ExpandableListViewState extends State { bool expandFlag = false; - + @override + void initState() { + setState(() { + expandFlag = widget.isExpanded; + setDoctorViewHeight(widget.result2[widget.val].toString()); + }); + super.initState(); + } @override Widget build(BuildContext context) { + return new Container( width: MediaQuery.of(context).size.width * 0.6, margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 0.0), diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 9b702ff3..3c253aa8 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -123,7 +123,7 @@ class _HomePageState extends State { width: double.infinity, height: 125, decoration: BoxDecoration( - color: Hexcolor('#A59E9E'), + color: HexColor('#A59E9E'), shape: BoxShape.rectangle, border: Border.all( color: Colors.transparent, width: 0.5), @@ -169,7 +169,7 @@ class _HomePageState extends State { width: 90, height: 30, decoration: BoxDecoration( - color: Hexcolor('#D81A2E'), + color: HexColor('#D81A2E'), shape: BoxShape.rectangle, border: Border.all( color: Colors.transparent, @@ -196,7 +196,7 @@ class _HomePageState extends State { width: double.infinity, height: 130, decoration: BoxDecoration( - color: Hexcolor('#A59E9E'), + color: HexColor('#A59E9E'), shape: BoxShape.rectangle, border: Border.all( color: Colors.transparent, width: 0.5), @@ -256,7 +256,7 @@ class _HomePageState extends State { width: 90, height: 30, decoration: BoxDecoration( - color: Hexcolor('#D81A2E'), + color: HexColor('#D81A2E'), shape: BoxShape.rectangle, border: Border.all( color: Colors.transparent, @@ -364,7 +364,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 5, + height: 3, ), Texts( TranslationBase.of(context) @@ -401,7 +401,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, color: Colors.white, bold: true, - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: SizeConfig.textMultiplier * 1.7, ) ], ), @@ -422,21 +422,21 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 5, + height: 3, ), Texts( TranslationBase.of(context).emergencyService, textAlign: TextAlign.center, color: Colors.white, bold: true, - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: SizeConfig.textMultiplier * 1.7, ) ], ), ), ), height: MediaQuery.of(context).size.width * 0.4, - color: Hexcolor("#747C80"), + color: HexColor("#747C80"), imageName: 'emergency_service_image.png', ), ], @@ -473,7 +473,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: SizeConfig.textMultiplier * 1.9, + fontSize: SizeConfig.textMultiplier * 1.7, ) ], ), @@ -497,7 +497,7 @@ class _HomePageState extends State { height: 55, ), SizedBox( - height: 15, + height: 10, ), Texts( TranslationBase.of(context) @@ -505,7 +505,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: SizeConfig.textMultiplier * 2, + fontSize: SizeConfig.textMultiplier * 1.7, ) ], ), @@ -537,7 +537,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 10, ), Texts( TranslationBase.of(context) @@ -545,7 +545,7 @@ class _HomePageState extends State { textAlign: TextAlign.center, color: Colors.black87, bold: false, - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: SizeConfig.textMultiplier * 1.7, ) ], ), @@ -563,7 +563,7 @@ class _HomePageState extends State { ), ), SizedBox( - height: 8, + height: 5, ), Container( margin: EdgeInsets.only(left: 15, right: 15), @@ -698,7 +698,9 @@ class DashboardItem extends StatelessWidget { : MediaQuery.of(context).size.height * 0.35, decoration: BoxDecoration( color: !hasBorder - ? color != null ? color : Hexcolor('#050705').withOpacity(opacity) + ? color != null + ? color + : HexColor('#050705').withOpacity(opacity) : Colors.white, borderRadius: BorderRadius.circular(6.0), border: hasBorder @@ -706,7 +708,7 @@ class DashboardItem extends StatelessWidget { : Border.all(width: 0.0, color: Colors.transparent), image: imageName != null ? DecorationImage( - image: AssetImage('assets/images/$imageName'), + image: ExactAssetImage('assets/images/$imageName'), fit: BoxFit.cover, colorFilter: new ColorFilter.mode( Colors.black.withOpacity(0.2), BlendMode.dstIn), diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 23d1645c..dcfa3ba8 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -348,7 +348,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { actions: [ IconButton( iconSize: 70, - icon: SvgPicture.asset('assets/images/robort_svg.svg', + icon: SvgPicture.asset('assets/images/svg/robort_svg.svg', height: 100, width: 100, fit: BoxFit.cover), onPressed: () { triggerRobot(); diff --git a/lib/pages/medical/balance/my_balance_page.dart b/lib/pages/medical/balance/my_balance_page.dart index 446333cc..421e2bed 100644 --- a/lib/pages/medical/balance/my_balance_page.dart +++ b/lib/pages/medical/balance/my_balance_page.dart @@ -38,7 +38,7 @@ class MyBalancePage extends StatelessWidget { width: double.infinity, height: 65, decoration: BoxDecoration( - color: Hexcolor('#B61422'), + color: HexColor('#B61422'), shape: BoxShape.rectangle, borderRadius: BorderRadius.circular(7), ), @@ -96,8 +96,7 @@ class MyBalancePage extends StatelessWidget { textColor: Colors.white, label: TranslationBase.of(context).createAdvancedPayment, onTap: () { - Navigator.push(context, - FadePage(page: AdvancePaymentPage())); + Navigator.push(context, FadePage(page: AdvancePaymentPage())); }, ), ), diff --git a/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart b/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart index 7d7c5dd5..8e6f808c 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart @@ -135,7 +135,7 @@ class _WeightHomePageState extends State width: 55, height: 55, decoration: BoxDecoration( - shape: BoxShape.circle, color: Hexcolor('515B5D')), + shape: BoxShape.circle, color: HexColor('515B5D')), child: Center( child: Icon( Icons.add, diff --git a/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart b/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart index 5bdbfeab..9f7063f1 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart @@ -15,8 +15,7 @@ class WeightMonthlyPage extends StatelessWidget { final List> data; final List diabtecPatientResult; - const WeightMonthlyPage( - {Key key, this.data, this.diabtecPatientResult}) + const WeightMonthlyPage({Key key, this.data, this.diabtecPatientResult}) : super(key: key); @override @@ -67,7 +66,7 @@ class WeightMonthlyPage extends StatelessWidget { children: [ Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -83,18 +82,26 @@ class WeightMonthlyPage extends StatelessWidget { ), Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Time', color: Colors.white,fontSize: 15,), + child: Texts( + 'Time', + color: Colors.white, + fontSize: 15, + ), ), height: 40), Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Value', color: Colors.white,fontSize: 15,), + child: Texts( + 'Value', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ], diff --git a/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart b/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart index ac1a3214..9c3363dd 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart @@ -29,8 +29,9 @@ class WeightWeeklyPage extends StatelessWidget { dateTimeFactory: const charts.LocalDateTimeFactory(), ), ), - SizedBox(height: 12,), - + SizedBox( + height: 12, + ), Padding( padding: const EdgeInsets.all(8.0), child: Texts('Details'), @@ -62,7 +63,7 @@ class WeightWeeklyPage extends StatelessWidget { children: [ Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -78,37 +79,50 @@ class WeightWeeklyPage extends StatelessWidget { ), Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Time', color: Colors.white,fontSize: 15,), + child: Texts( + 'Time', + color: Colors.white, + fontSize: 15, + ), ), height: 40), Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Value', color: Colors.white,fontSize: 15,), + child: Texts( + 'Value', + color: Colors.white, + fontSize: 15, + ), ), height: 40), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), ), child: Center( - child: Texts('Edit', color: Colors.white,fontSize: 15,), + child: Texts( + 'Edit', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), ], ), ); - diabtecPatientResult.forEach((diabtec) { + diabtecPatientResult.forEach( + (diabtec) { tableRow.add( TableRow( children: [ diff --git a/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart b/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart index 3ddeaa82..587cc3f6 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart @@ -65,7 +65,7 @@ class WeightYearPage extends StatelessWidget { children: [ Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -81,25 +81,33 @@ class WeightYearPage extends StatelessWidget { ), Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Time', color: Colors.white,fontSize: 15,), + child: Texts( + 'Time', + color: Colors.white, + fontSize: 15, + ), ), height: 40), Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Value', color: Colors.white,fontSize: 15,), + child: Texts( + 'Value', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ], ), ); diabtecPatientResult.forEach( - (diabtec) { + (diabtec) { tableRow.add( TableRow( children: [ diff --git a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart index c118f2ca..d2bcde47 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart @@ -138,7 +138,7 @@ class _BloodPressureHomePageState extends State width: 55, height: 55, decoration: BoxDecoration( - shape: BoxShape.circle, color: Hexcolor('515B5D')), + shape: BoxShape.circle, color: HexColor('515B5D')), child: Center( child: Icon( Icons.add, diff --git a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureMonthly.dart b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureMonthly.dart index f38cc3b6..8b9e504f 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureMonthly.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureMonthly.dart @@ -67,7 +67,7 @@ class BloodPressureMonthlyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -85,7 +85,7 @@ class BloodPressureMonthlyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( child: Texts( @@ -99,7 +99,7 @@ class BloodPressureMonthlyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( child: Texts( @@ -113,7 +113,7 @@ class BloodPressureMonthlyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), @@ -149,7 +149,8 @@ class BloodPressureMonthlyPage extends StatelessWidget { ), ), ), - Container(child: Container( + Container( + child: Container( height: 70, padding: EdgeInsets.all(10), color: Colors.white, @@ -160,7 +161,8 @@ class BloodPressureMonthlyPage extends StatelessWidget { fontSize: 12, ), ), - ),), + ), + ), Container( child: Container( height: 70, diff --git a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureYeaPage.dart b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureYeaPage.dart index dfcf42ae..0c67be7c 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureYeaPage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureYeaPage.dart @@ -65,7 +65,7 @@ class BloodPressureYearPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -83,7 +83,7 @@ class BloodPressureYearPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( child: Texts( @@ -97,7 +97,7 @@ class BloodPressureYearPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( child: Texts( @@ -108,11 +108,10 @@ class BloodPressureYearPage extends StatelessWidget { ), height: 40), ), - Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), diff --git a/lib/pages/medical/my_trackers/blood_pressure/bloodPressureWeeklyPage.dart b/lib/pages/medical/my_trackers/blood_pressure/bloodPressureWeeklyPage.dart index fbcbf417..52313483 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/bloodPressureWeeklyPage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/bloodPressureWeeklyPage.dart @@ -30,8 +30,9 @@ class BloodPressureWeeklyPage extends StatelessWidget { dateTimeFactory: const charts.LocalDateTimeFactory(), ), ), - SizedBox(height: 12,), - + SizedBox( + height: 12, + ), Padding( padding: const EdgeInsets.all(8.0), child: Texts('Details'), @@ -64,7 +65,7 @@ class BloodPressureWeeklyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -82,50 +83,67 @@ class BloodPressureWeeklyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Time', color: Colors.white,fontSize: 15,), + child: Texts( + 'Time', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Measured', color: Colors.white,fontSize: 15,), + child: Texts( + 'Measured', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Value', color: Colors.white,fontSize: 15,), + child: Texts( + 'Value', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), ), child: Center( - child: Texts('Edit', color: Colors.white,fontSize: 15,), + child: Texts( + 'Edit', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), ], ), ); - diabtecPatientResult.forEach((diabtec) { + diabtecPatientResult.forEach( + (diabtec) { tableRow.add( TableRow( children: [ diff --git a/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart b/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart index da31c4ed..fdd7b348 100644 --- a/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart +++ b/lib/pages/medical/my_trackers/blood_suger/BloodMonthly.dart @@ -1,4 +1,3 @@ - import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart'; import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/WeekChartDate.dart'; import 'package:diplomaticquarterapp/core/model/my_trakers/chartData/YearMonthlyChartDate.dart'; @@ -14,7 +13,8 @@ class BloodMonthlyPage extends StatelessWidget { final List> data; final List diabtecPatientResult; - const BloodMonthlyPage({Key key, this.data,this.diabtecPatientResult}) : super(key: key); + const BloodMonthlyPage({Key key, this.data, this.diabtecPatientResult}) + : super(key: key); @override Widget build(BuildContext context) { return AppScaffold( @@ -24,14 +24,14 @@ class BloodMonthlyPage extends StatelessWidget { width: double.maxFinite, height: 180, color: Colors.white, - child: charts.LineChart( - data, + child: charts.LineChart(data, //animate: animate, - defaultRenderer: new charts.LineRendererConfig(includePoints: true) - ), + defaultRenderer: + new charts.LineRendererConfig(includePoints: true)), + ), + SizedBox( + height: 12, ), - SizedBox(height: 12,), - Padding( padding: const EdgeInsets.all(8.0), child: Texts('Details'), @@ -51,7 +51,6 @@ class BloodMonthlyPage extends StatelessWidget { ], ), ) - ], ), ); @@ -65,7 +64,7 @@ class BloodMonthlyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -83,105 +82,116 @@ class BloodMonthlyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Time', color: Colors.white,fontSize: 15,), + child: Texts( + 'Time', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Measured', color: Colors.white,fontSize: 15,), + child: Texts( + 'Measured', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), - Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), ), child: Center( - child: Texts('Value', color: Colors.white,fontSize: 15,), + child: Texts( + 'Value', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), ], ), ); - diabtecPatientResult.forEach((diabtec) { - tableRow.add( - TableRow( - children: [ - Container( - child: Container( - height: 70, - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: Texts( - '${DateUtil.getMonthDayYearDateFormatted(diabtec.dateChart)} ', - textAlign: TextAlign.center, - fontSize: 12, + diabtecPatientResult.forEach( + (diabtec) { + tableRow.add( + TableRow( + children: [ + Container( + child: Container( + height: 70, + padding: EdgeInsets.all(10), + color: Colors.white, + child: Center( + child: Texts( + '${DateUtil.getMonthDayYearDateFormatted(diabtec.dateChart)} ', + textAlign: TextAlign.center, + fontSize: 12, + ), ), ), ), - ), - Container( - child: Container( - height: 70, - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: Texts( - '${diabtec.dateChart.hour}:${diabtec.dateChart.minute}', - textAlign: TextAlign.center, - fontSize: 12, + Container( + child: Container( + height: 70, + padding: EdgeInsets.all(10), + color: Colors.white, + child: Center( + child: Texts( + '${diabtec.dateChart.hour}:${diabtec.dateChart.minute}', + textAlign: TextAlign.center, + fontSize: 12, + ), ), ), ), - ), - Container( - child: Container( - height: 70, - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: Texts( - '${diabtec.measuredDesc}', - textAlign: TextAlign.center, - fontSize: 12, + Container( + child: Container( + height: 70, + padding: EdgeInsets.all(10), + color: Colors.white, + child: Center( + child: Texts( + '${diabtec.measuredDesc}', + textAlign: TextAlign.center, + fontSize: 12, + ), ), ), ), - ), - Container( - child: Container( - height: 70, - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: Texts( - '${diabtec.resultValue}', - textAlign: TextAlign.center, - fontSize: 12, + Container( + child: Container( + height: 70, + padding: EdgeInsets.all(10), + color: Colors.white, + child: Center( + child: Texts( + '${diabtec.resultValue}', + textAlign: TextAlign.center, + fontSize: 12, + ), ), ), ), - ), - - ], - ), - ); - }, + ], + ), + ); + }, ); return tableRow; } diff --git a/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart b/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart index 3bddab88..47f87847 100644 --- a/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart +++ b/lib/pages/medical/my_trackers/blood_suger/BloodYeaPage.dart @@ -64,7 +64,7 @@ class BloodYearPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -82,7 +82,7 @@ class BloodYearPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( child: Texts( @@ -96,7 +96,7 @@ class BloodYearPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( child: Texts( @@ -107,11 +107,10 @@ class BloodYearPage extends StatelessWidget { ), height: 40), ), - Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), diff --git a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart index 1190b6b6..c8c7fa4a 100644 --- a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart +++ b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart @@ -37,7 +37,6 @@ class _BloodSugarHomePageState extends State _tabController.dispose(); } - @override Widget build(BuildContext context) { return BaseView( @@ -78,7 +77,8 @@ class _BloodSugarHomePageState extends State indicatorSize: TabBarIndicatorSize.label, indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, - labelPadding: EdgeInsets.only(top: 4.0, left: 5.0, right: 5.0), + labelPadding: + EdgeInsets.only(top: 4.0, left: 5.0, right: 5.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( @@ -114,27 +114,37 @@ class _BloodSugarHomePageState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - BloodSugarWeeklyPage(data: model.getBloodWeeklySeries(),diabtecPatientResult: model.weekDiabtecPatientResult,), - BloodMonthlyPage(data: model.getBloodMonthlyTimeSeriesSales(),diabtecPatientResult: model.monthDiabtecPatientResult,), - BloodYearPage(data: model.getBloodYearTimeSeriesSales(),diabtecPatientResult: model.yearDiabtecPatientResult,) + BloodSugarWeeklyPage( + data: model.getBloodWeeklySeries(), + diabtecPatientResult: model.weekDiabtecPatientResult, + ), + BloodMonthlyPage( + data: model.getBloodMonthlyTimeSeriesSales(), + diabtecPatientResult: model.monthDiabtecPatientResult, + ), + BloodYearPage( + data: model.getBloodYearTimeSeriesSales(), + diabtecPatientResult: model.yearDiabtecPatientResult, + ) ], ), ) ], ), floatingActionButton: InkWell( - onTap: (){ + onTap: () { Navigator.push(context, FadePage(page: AddBloodSugarPage())); }, child: Container( width: 55, height: 55, decoration: BoxDecoration( - shape: BoxShape.circle, - color: Hexcolor('515B5D') - ), + shape: BoxShape.circle, color: HexColor('515B5D')), child: Center( - child: Icon(Icons.add,color: Colors.white,), + child: Icon( + Icons.add, + color: Colors.white, + ), ), ), ), diff --git a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart index 6b892162..4b007929 100644 --- a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart +++ b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_weekly_page.dart @@ -29,8 +29,9 @@ class BloodSugarWeeklyPage extends StatelessWidget { dateTimeFactory: const charts.LocalDateTimeFactory(), ), ), - SizedBox(height: 12,), - + SizedBox( + height: 12, + ), Padding( padding: const EdgeInsets.all(8.0), child: Texts('Details'), @@ -63,7 +64,7 @@ class BloodSugarWeeklyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -81,50 +82,67 @@ class BloodSugarWeeklyPage extends StatelessWidget { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Time', color: Colors.white,fontSize: 15,), + child: Texts( + 'Time', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Measured', color: Colors.white,fontSize: 15,), + child: Texts( + 'Measured', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), ), child: Center( - child: Texts('Value', color: Colors.white,fontSize: 15,), + child: Texts( + 'Value', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), ), child: Center( - child: Texts('Edit', color: Colors.white,fontSize: 15,), + child: Texts( + 'Edit', + color: Colors.white, + fontSize: 15, + ), ), height: 40), ), ], ), ); - diabtecPatientResult.forEach((diabtec) { + diabtecPatientResult.forEach( + (diabtec) { tableRow.add( TableRow( children: [ diff --git a/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart b/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart index ad5c6ffb..589284a1 100644 --- a/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart +++ b/lib/pages/medical/vital_sign/vital_sign_details_wideget.dart @@ -52,7 +52,7 @@ class _VitalSignDetailsWidgetState extends State { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -69,7 +69,7 @@ class _VitalSignDetailsWidgetState extends State { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), diff --git a/lib/pages/medical/vital_sign/vital_sign_item.dart b/lib/pages/medical/vital_sign/vital_sign_item.dart index 9586fb25..fb44772d 100644 --- a/lib/pages/medical/vital_sign/vital_sign_item.dart +++ b/lib/pages/medical/vital_sign/vital_sign_item.dart @@ -45,16 +45,22 @@ class VitalSignItem extends StatelessWidget { child: Text( des, style: TextStyle( - fontSize: 1.7 * SizeConfig.textMultiplier, - color: Hexcolor('#B8382C'), - fontWeight: FontWeight.bold,), + fontSize: 1.7 * SizeConfig.textMultiplier, + color: HexColor('#B8382C'), + fontWeight: FontWeight.bold, + ), ), ), ), ), Expanded( flex: 1, - child: Container(child: Icon(icon,size: 40,),), + child: Container( + child: Icon( + icon, + size: 40, + ), + ), ) ], ), @@ -65,7 +71,7 @@ class VitalSignItem extends StatelessWidget { child: Align( alignment: Alignment.topRight, child: Container( - margin: EdgeInsets.only(left: 5,right: 5), + margin: EdgeInsets.only(left: 5, right: 5), child: RichText( text: TextSpan( style: TextStyle(color: Colors.black), @@ -74,7 +80,7 @@ class VitalSignItem extends StatelessWidget { TextSpan( text: unit, style: TextStyle( - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), ), ), ]), diff --git a/lib/pages/paymentService/payment_service.dart b/lib/pages/paymentService/payment_service.dart index 15a1f699..0d19045b 100644 --- a/lib/pages/paymentService/payment_service.dart +++ b/lib/pages/paymentService/payment_service.dart @@ -41,7 +41,7 @@ class PaymentService extends StatelessWidget { children: [ Texts( TranslationBase.of(context).payment, - color: Hexcolor('#B61422'), + color: HexColor('#B61422'), bold: true, ), Texts( @@ -73,11 +73,11 @@ class PaymentService extends StatelessWidget { children: [ Texts( TranslationBase.of(context).onlineCheckIn, - color: Hexcolor('#B61422'), + color: HexColor('#B61422'), bold: true, ), Texts( - TranslationBase.of(context).appointment, + TranslationBase.of(context).appointment, fontSize: 14, fontWeight: FontWeight.normal, ), @@ -115,7 +115,7 @@ class PaymentService extends StatelessWidget { children: [ Texts( 'My Balances', - color: Hexcolor('#B61422'), + color: HexColor('#B61422'), bold: true, ), Texts( diff --git a/lib/pages/rateAppointment/rate_appointment_clinic.dart b/lib/pages/rateAppointment/rate_appointment_clinic.dart index 74f134ae..38fdd008 100644 --- a/lib/pages/rateAppointment/rate_appointment_clinic.dart +++ b/lib/pages/rateAppointment/rate_appointment_clinic.dart @@ -226,7 +226,7 @@ class _RateAppointmentClinicState extends State { child: Texts( 'Later', decoration: TextDecoration.underline, - color: Hexcolor('#151DFE'), + color: HexColor('#151DFE'), fontSize: 18, ), ) diff --git a/lib/pages/rateAppointment/rate_appointment_doctor.dart b/lib/pages/rateAppointment/rate_appointment_doctor.dart index 1583f033..83674906 100644 --- a/lib/pages/rateAppointment/rate_appointment_doctor.dart +++ b/lib/pages/rateAppointment/rate_appointment_doctor.dart @@ -177,7 +177,9 @@ class _RateAppointmentDoctorState extends State { }, ), ), - SizedBox(height: 12,), + SizedBox( + height: 12, + ), Container( width: double.infinity, child: Column( @@ -222,7 +224,7 @@ class _RateAppointmentDoctorState extends State { child: Texts( 'Later', decoration: TextDecoration.underline, - color: Hexcolor('#151DFE'), + color: HexColor('#151DFE'), fontSize: 18, ), ) diff --git a/lib/services/robo_search/search_provider.dart b/lib/services/robo_search/search_provider.dart index 5a192d74..82c32f91 100644 --- a/lib/services/robo_search/search_provider.dart +++ b/lib/services/robo_search/search_provider.dart @@ -14,7 +14,7 @@ class SearchProvider with ChangeNotifier { static var sessionID = new DateTime.now().millisecondsSinceEpoch; Future getBotPages(request) async { try { - request['SessionID'] = sessionID; + request['SessionID'] = '123'; await BaseAppClient().post(SEARCH_BOT, onSuccess: (dynamic response, int statusCode) { pageData = response; diff --git a/lib/widgets/buttons/button.dart b/lib/widgets/buttons/button.dart index f8aff960..b6ae08b1 100644 --- a/lib/widgets/buttons/button.dart +++ b/lib/widgets/buttons/button.dart @@ -105,7 +105,7 @@ class _ButtonState extends State