Updates & fixes

merge-update-with-lab-changes
haroon amjad 4 years ago
parent e1e31de818
commit 894cc0e336

@ -85,8 +85,11 @@ const SEND_RAD_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendRadReportEmai
///Feedback ///Feedback
const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList'; const SEND_FEEDBACK = 'Services/COCWS.svc/REST/InsertCOCItemInSPList';
const GET_STATUS_FOR_COCO = 'Services/COCWS.svc/REST/GetStatusforCOC'; const GET_STATUS_FOR_COCO = 'Services/COCWS.svc/REST/GetStatusforCOC';
// const GET_PATIENT_AppointmentHistory = 'Services'
// '/Doctors.svc/REST/PateintHasAppoimentHistory';
const GET_PATIENT_AppointmentHistory = 'Services' const GET_PATIENT_AppointmentHistory = 'Services'
'/Doctors.svc/REST/PateintHasAppoimentHistory'; '/Doctors.svc/REST/PateintHasAppoimentHistory_Async';
///VITAL SIGN ///VITAL SIGN
const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign'; const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
@ -166,7 +169,8 @@ const INSERT_REQUEST_FOR_MEDICAL_REPORT = 'Services/Doctors.svc/REST/InsertReque
const SEND_MEDICAL_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendMedicalReportEmail'; const SEND_MEDICAL_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendMedicalReportEmail';
///Rate ///Rate
const IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated'; // const IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated';
const IS_LAST_APPOITMENT_RATED = 'Services/Doctors.svc/REST/IsLastAppoitmentRated_Async';
const GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo'; const GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo';
const NEW_RATE_APPOINTMENT_URL = "Services/Doctors.svc/REST/AppointmentsRating_InsertAppointmentRate"; const NEW_RATE_APPOINTMENT_URL = "Services/Doctors.svc/REST/AppointmentsRating_InsertAppointmentRate";
const NEW_RATE_DOCTOR_URL = "Services/Doctors.svc/REST/DoctorsRating_InsertDoctorRate"; const NEW_RATE_DOCTOR_URL = "Services/Doctors.svc/REST/DoctorsRating_InsertDoctorRate";
@ -207,7 +211,8 @@ const SEND_REPORT_EYE_EMAIL = "Services/Notifications.svc/REST/SendGlassesPrescr
const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL = "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail"; const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL = "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
//URL to get patient appointment curfew history //URL to get patient appointment curfew history
const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY = "Services/Doctors.svc/REST/AppoimentHistoryForCurfew"; // const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY = "Services/Doctors.svc/REST/AppoimentHistoryForCurfew";
const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY = "Services/Doctors.svc/REST/AppoimentHistoryForCurfew_Async";
//URL to confirm appointment //URL to confirm appointment
const CONFIRM_APPOINTMENT = "Services/MobileNotifications.svc/REST/ConfirmAppointment"; const CONFIRM_APPOINTMENT = "Services/MobileNotifications.svc/REST/ConfirmAppointment";

@ -625,7 +625,7 @@ const Map localizedValues = {
"select-gender": {"en": "Select Gender", "ar": "اختر الجنس"}, "select-gender": {"en": "Select Gender", "ar": "اختر الجنس"},
"i-am-a": {"en": "I am a ...", "ar": "أنا ..."}, "i-am-a": {"en": "I am a ...", "ar": "أنا ..."},
"select-age": {"en": "Select Your Age", "ar": "حدد العمر"}, "select-age": {"en": "Select Your Age", "ar": "حدد العمر"},
"select": {"en": "Select", "ar": "يختار"}, "select": {"en": "Select", "ar": "اختر"},
"i-am": {"en": "I am", "ar": "أنا"}, "i-am": {"en": "I am", "ar": "أنا"},
"years-old": {"en": "years old", "ar": "سنة"}, "years-old": {"en": "years old", "ar": "سنة"},
"drag-point": {"en": "Drag point to change your age", "ar": "اسحب لتغيير عمرك"}, "drag-point": {"en": "Drag point to change your age", "ar": "اسحب لتغيير عمرك"},
@ -1626,4 +1626,8 @@ const Map localizedValues = {
"cholesTitle": {"en": "Blood Cholesterol", "ar": " الكولسترول في الدم"}, "cholesTitle": {"en": "Blood Cholesterol", "ar": " الكولسترول في الدم"},
"laserClinic": {"en": "Laser Clinic", "ar": "عيادة الليزر"}, "laserClinic": {"en": "Laser Clinic", "ar": "عيادة الليزر"},
"noImage": {"en": "No Image", "ar": "لا توجد صورة"}, "noImage": {"en": "No Image", "ar": "لا توجد صورة"},
"signoutMessage": {"en": "Are you sure you want to logout?", "ar": "هل أنت متأكد أنك تريد تسجيل الخروج؟"},
"RRTTitle": {"en": "RRT", "ar": "خدمة فريق"},
"RRTSubTitle": {"en": "Service", "ar": "الاستجابة السريع"},
"transportation": {"en": "Transportation", "ar": "النقل"},
}; };

@ -124,7 +124,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1009199553; // body['IdentificationNo'] = 1009199553;
// body['MobileNo'] = "966545156035"; // body['MobileNo'] = "966545156035";
// body['PatientID'] = 1018977; // body['PatientID'] = 1018977; //3844083
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
body.removeWhere((key, value) => key == null || value == null); body.removeWhere((key, value) => key == null || value == null);

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
@ -25,8 +26,8 @@ class HospitalService extends BaseService {
if(isResBasedOnLoc) if(isResBasedOnLoc)
await _getCurrentLocation(); await _getCurrentLocation();
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['Latitude'] = isResBasedOnLoc?_latitude:0; body['Latitude'] = await this.sharedPref.getDouble(USER_LAT);
body['Longitude'] = isResBasedOnLoc?_longitude:0; body['Longitude'] = await this.sharedPref.getDouble(USER_LONG);
body['IsOnlineCheckIn'] = isResBasedOnLoc; body['IsOnlineCheckIn'] = isResBasedOnLoc;
body['PatientOutSA'] = 0; body['PatientOutSA'] = 0;

@ -170,7 +170,6 @@ class _NewCMCStepTowPageState extends State<NewCMCStepTowPage> {
child: Container( child: Container(
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
width: double.infinity, width: double.infinity,
// height: 65,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: Colors.white, color: Colors.white,

@ -149,23 +149,15 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage> with Tick
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
TranslationBase.of(context).serviceName + ": ", TranslationBase.of(context).hospital + ": ",
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
), ),
Column( Expanded(
children: [ child: Text(
...List.generate( widget.model.pendingOrder.nearestProjectName.toString(),
widget.model.hhcAllOrderDetail.length, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56),
(index) => Container( ),
child: Texts( ),
projectViewModel.isArabic ? widget.model.hhcAllOrderDetail[index].descriptionN : widget.model.hhcAllOrderDetail[index].description.capitalize(),
fontSize: 13,
bold: false,
),
),
)
],
)
], ],
) )
], ],

@ -2,11 +2,8 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart'; import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart'; import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h20_setting.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h20_setting.dart';
import 'package:diplomaticquarterapp/pages/Blood/user_agreement_page.dart'; import 'package:diplomaticquarterapp/pages/Blood/user_agreement_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
@ -44,12 +41,9 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
String amount = ""; String amount = "";
String email; String email;
AuthenticatedUser authenticatedUser;
GetAllSharedRecordsByStatusList selectedPatientFamily;
AdvanceModel advanceModel = AdvanceModel();
List_BloodGroupDetailsModel bloodDetails = List_BloodGroupDetailsModel(bloodGroup: "A-"); List_BloodGroupDetailsModel bloodDetails = List_BloodGroupDetailsModel(bloodGroup: "A-");
AppSharedPreferences sharedPref = AppSharedPreferences(); AppSharedPreferences sharedPref = AppSharedPreferences();
AuthenticatedUser authUser;
var checkedValue = false; var checkedValue = false;
List<ImagesInfo> imagesInfo = List(); List<ImagesInfo> imagesInfo = List();
@ -60,9 +54,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
imagesInfo.add( imagesInfo.add(
ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/blood/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/blood/ar/0.png'), ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/blood/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/blood/ar/0.png'),
); );
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {});
if (projectProvider.isLogin) authUser = projectProvider.user;
});
super.initState(); super.initState();
} }
@ -82,7 +74,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
return BaseView<MyBalanceViewModel>( return BaseView<MyBalanceViewModel>(
onModelReady: (model) { onModelReady: (model) {
if (projectProvider.isLogin) { if (projectProvider.isLogin && projectProvider.user != null) {
model.getCities().then((value) { model.getCities().then((value) {
model.getBlood().then((value) { model.getBlood().then((value) {
if (model.bloodModelList.length > 0) { if (model.bloodModelList.length > 0) {

@ -58,7 +58,6 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectViewModel = Provider.of(context); projectViewModel = Provider.of(context);
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/covid/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/covid/ar/0.png'));
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).covidTest, appBarTitle: TranslationBase.of(context).covidTest,
isShowAppBar: true, isShowAppBar: true,

@ -55,51 +55,6 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
// 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: <Widget>[
// 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: <Widget>[
// Container(
// margin: EdgeInsets.only(
// left: 20.0, right: 20.0, top: 20.0),
// child: Text(TranslationBase.of(context).covidTest,
// 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(TranslationBase.of(context).driveThru,
// style: TextStyle(
// color: Colors.white, fontSize: 24.0)),
// ),
// ],
// ),
// ],
// ),
// ),
Text(TranslationBase.of(context).covidSelectProcedure, style: TextStyle(color: Colors.black, fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold)), Text(TranslationBase.of(context).covidSelectProcedure, style: TextStyle(color: Colors.black, fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.bold)),
...List.generate( ...List.generate(
widget.proceduresList.length, widget.proceduresList.length,
@ -144,29 +99,6 @@ class _CovidPaymentDetailsState extends State<CovidPaymentDetails> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
// ListTile(
// title: Text(
// projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName,
// style: TextStyle(
// fontSize: 12.0,
// letterSpacing: -0.48,
// fontWeight: FontWeight.w600,
// ),
// ),
// leading: Radio(
// value: widget.proceduresList[index],
// groupValue: widget.selectedProcedure,
// activeColor: Colors.red[800],
// toggleable: true,
// onChanged: (value) {
// setState(() {
// widget.selectedProcedure = value;
// print(widget.selectedProcedure.procedureName);
// getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID);
// });
// },
// ),
// ),
], ],
), ),
), ),

@ -78,7 +78,7 @@ class _AmbulanceReqState extends State<AmbulanceReq> with SingleTickerProviderSt
), ),
Expanded( Expanded(
child: TabBarView( child: TabBarView(
physics: BouncingScrollPhysics(), physics: NeverScrollableScrollPhysics(),
controller: _tabController, controller: _tabController,
children: <Widget>[ children: <Widget>[
AmbulanceRequestIndexPage( AmbulanceRequestIndexPage(

@ -2,10 +2,9 @@ import 'package:diplomaticquarterapp/core/enum/Ambulate.dart';
import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart';
import 'package:diplomaticquarterapp/core/model/er/PatientER_RC.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER_RC.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -45,269 +44,229 @@ class _BillAmountState extends State<BillAmount> {
body: SingleChildScrollView( body: SingleChildScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(
margin: EdgeInsets.only(left: 12, right: 12), margin: EdgeInsets.only(left: 12, right: 12, top: 12),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase.of(context).billAmount), Text(TranslationBase.of(context).billAmount, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Table( Container(
border: TableBorder.symmetric(inside: BorderSide(width: 1.0, color: Colors.grey[300]), outside: BorderSide(width: 1.0, color: Colors.grey[300])), decoration: cardRadius(12),
children: [ child: Padding(
TableRow( padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// Text(TranslationBase.of(context).testFee,
// style: TextStyle(
// color: Colors.black,
// fontSize: 16.0,
// fontWeight: FontWeight.w600,
// letterSpacing: -0.64,
// )),
Container( Container(
height: MediaQuery.of(context).size.height * 0.09, width: double.infinity,
decoration: BoxDecoration( padding: EdgeInsets.only(top: 10, bottom: 3),
color: Colors.white, child: Row(
borderRadius: BorderRadius.only( children: [
topLeft: Radius.circular(10.0), Expanded(
), child: _getNormalText(TranslationBase.of(context).patientShareToDo),
), ),
child: Padding( Expanded(
padding: const EdgeInsets.all(8.0), child: _getNormalText(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.price}', isBold: true),
child: Texts( )
TranslationBase.of(context).patientShareB, ],
textAlign: TextAlign.start,
color: Colors.black,
fontSize: 15,
),
), ),
), ),
mDivider(Colors.grey[200]),
Container( Container(
height: MediaQuery.of(context).size.height * 0.09, width: double.infinity,
decoration: BoxDecoration( padding: EdgeInsets.only(top: 3, bottom: 3),
color: Colors.white, child: Row(
borderRadius: BorderRadius.only( children: [
topRight: Radius.circular(10.0), Expanded(
), child: _getNormalText(TranslationBase.of(context).patientTaxToDo),
), ),
child: Padding( Expanded(
padding: const EdgeInsets.all(8.0), child: _getNormalText(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.priceVAT}', isBold: true),
child: Texts( )
TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.price}', ],
color: Colors.black,
textAlign: TextAlign.start,
fontSize: 15,
),
), ),
), ),
], mDivider(Colors.grey[200]),
),
TableRow(
children: [
Container( Container(
color: Colors.white, width: double.infinity,
height: MediaQuery.of(context).size.height * 0.09, padding: EdgeInsets.only(top: 3, bottom: 3),
child: Padding( child: Row(
padding: const EdgeInsets.all(8.0), children: [
child: Texts( Expanded(
TranslationBase.of(context).patientShareTax, child: _getNormalText(TranslationBase.of(context).patientShareTotalToDo),
color: Colors.black, ),
fontSize: 15, Expanded(
textAlign: TextAlign.start, child: _getNormalText(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.priceTotal}', isBold: true, isTotal: true),
), )
), ],
),
Container(
height: MediaQuery.of(context).size.height * 0.09,
color: Colors.white,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Texts(
TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.priceVAT}',
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(
TranslationBase.of(context).patientShareTotal,
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(
TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.priceTotal}',
color: Colors.black,
fontSize: 15,
textAlign: TextAlign.start,
),
),
),
],
),
],
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Texts( Text(TranslationBase.of(context).selectAmbulate, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
TranslationBase.of(context).selectAmbulate,
bold: false,
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Row( Row(
children: [ children: [
Expanded( InkWell(
child: InkWell( onTap: () {
onTap: () { setState(() {
setState(() { _ambulate = Ambulate.Wheelchair;
_ambulate = Ambulate.Wheelchair; });
}); },
}, child: Container(
child: Container( width: MediaQuery.of(context).size.width * 0.9,
decoration: BoxDecoration( child: ListTile(
shape: BoxShape.rectangle, contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
borderRadius: BorderRadius.circular(8), title: Row(
border: Border.all(color: Colors.grey, width: 0.5), children: [
color: Colors.white, Radio(
), value: Ambulate.Wheelchair,
child: ListTile( groupValue: _ambulate,
title: Text(TranslationBase.of(context).wheelchair, style: TextStyle( onChanged: (value) {
fontSize: 14.0 setState(() {
)), _ambulate = value;
leading: Radio( });
value: Ambulate.Wheelchair, },
groupValue: _ambulate, ),
onChanged: (value) { Text(
setState(() { TranslationBase.of(context).wheelchair,
_ambulate = value; style: TextStyle(
}); fontSize: 12.0,
}, letterSpacing: -0.48,
), fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
), ),
Expanded( ],
child: InkWell( ),
onTap: () { Row(
setState(() { children: [
_ambulate = Ambulate.Walker; InkWell(
}); onTap: () {
}, setState(() {
child: Container( _ambulate = Ambulate.Walker;
decoration: BoxDecoration( });
shape: BoxShape.rectangle, },
borderRadius: BorderRadius.circular(8), child: Container(
border: Border.all(color: Colors.grey, width: 0.5), width: MediaQuery.of(context).size.width * 0.9,
color: Colors.white, child: ListTile(
), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
child: ListTile( title: Row(
title: Text(TranslationBase.of(context).walker, style: TextStyle( children: [
fontSize: 14.0 Radio(
)), value: Ambulate.Walker,
leading: Radio( groupValue: _ambulate,
value: Ambulate.Walker, onChanged: (value) {
groupValue: _ambulate, setState(() {
onChanged: (value) { _ambulate = value;
setState(() { });
_ambulate = value; },
}); ),
}, Text(
), TranslationBase.of(context).walker,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
), ),
], ],
), ),
SizedBox(
height: 5,
),
Row( Row(
children: [ children: [
Expanded( InkWell(
child: InkWell( onTap: () {
onTap: () { setState(() {
setState(() { _ambulate = Ambulate.Stretcher;
_ambulate = Ambulate.Stretcher; });
}); },
}, child: Container(
child: Container( width: MediaQuery.of(context).size.width * 0.9,
decoration: BoxDecoration( child: ListTile(
shape: BoxShape.rectangle, contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
borderRadius: BorderRadius.circular(8), title: Row(
border: Border.all(color: Colors.grey, width: 0.5), children: [
color: Colors.white, Radio(
), value: Ambulate.Stretcher,
child: ListTile( groupValue: _ambulate,
title: Text(TranslationBase.of(context).stretcher, style: TextStyle( onChanged: (value) {
fontSize: 14.0 setState(() {
)), _ambulate = value;
leading: Radio( });
value: Ambulate.Stretcher, },
groupValue: _ambulate, ),
onChanged: (value) { Text(
setState(() { TranslationBase.of(context).stretcher,
_ambulate = value; style: TextStyle(
}); fontSize: 12.0,
}, letterSpacing: -0.48,
), fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
), ),
Expanded( ],
child: InkWell( ),
onTap: () { Row(
setState(() { children: [
_ambulate = Ambulate.None; InkWell(
}); onTap: () {
}, setState(() {
child: Container( _ambulate = Ambulate.None;
decoration: BoxDecoration( });
shape: BoxShape.rectangle, },
borderRadius: BorderRadius.circular(8), child: Container(
border: Border.all(color: Colors.grey, width: 0.5), width: MediaQuery.of(context).size.width * 0.9,
color: Colors.white, child: ListTile(
), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
child: ListTile( title: Row(
title: Text(TranslationBase.of(context).none, style: TextStyle( children: [
fontSize: 14.0 Radio(
)), value: Ambulate.None,
leading: Radio( groupValue: _ambulate,
value: Ambulate.None, onChanged: (value) {
groupValue: _ambulate, setState(() {
onChanged: (value) { _ambulate = value;
setState(() { });
_ambulate = value; },
}); ),
}, Text(
), TranslationBase.of(context).none,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
@ -317,14 +276,21 @@ class _BillAmountState extends State<BillAmount> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
NewTextFields( Container(
hintText: TranslationBase.of(context).notes, decoration: cardRadius(10),
initialValue: note, child: Padding(
onChanged: (value) { padding: EdgeInsets.all(8.0),
setState(() { child: TextField(
note = value; maxLines: 5,
}); decoration: InputDecoration.collapsed(
}, hintText: TranslationBase.of(context).notes, hintStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16)),
onChanged: (value) {
setState(() {
note = value;
});
},
),
),
), ),
SizedBox( SizedBox(
height: 100, height: 100,
@ -352,4 +318,20 @@ class _BillAmountState extends State<BillAmount> {
), ),
); );
} }
_getNormalText(text, {bool isBold = false, bool isTotal = false}) {
return Text(
text,
style: TextStyle(
fontSize: isBold
? isTotal
? 16
: 12
: 10,
letterSpacing: -0.5,
color: isBold ? Colors.black : Colors.grey[700],
fontWeight: FontWeight.w600,
),
);
}
} }

@ -4,7 +4,6 @@ import 'package:diplomaticquarterapp/core/model/er/PatientER_RC.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.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/ErService/widgets/AppointmentCard.dart';
import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart'; import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -13,12 +12,12 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/radio_selection_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/pickupLocation/PickupLocationFromMap.dart'; import 'package:diplomaticquarterapp/widgets/pickupLocation/PickupLocationFromMap.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart';
@ -51,9 +50,7 @@ class _PickupLocationState extends State<PickupLocation> {
void initState() { void initState() {
super.initState(); super.initState();
_getCurrentLocation(); _getCurrentLocation();
setState(() { setState(() {});
});
} }
_getCurrentLocation() async { _getCurrentLocation() async {
@ -64,7 +61,6 @@ class _PickupLocationState extends State<PickupLocation> {
_longitude = 0; _longitude = 0;
_latitude = 0; _latitude = 0;
}); });
} }
@override @override
@ -75,7 +71,7 @@ class _PickupLocationState extends State<PickupLocation> {
body: SingleChildScrollView( body: SingleChildScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(
margin: EdgeInsets.only(left: 12, right: 12), margin: EdgeInsets.only(left: 12, right: 12, top: 12),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -83,43 +79,66 @@ class _PickupLocationState extends State<PickupLocation> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase.of(context).pickupLocation), Text(TranslationBase.of(context).pickupLocation, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 15, height: 15,
), ),
InkWell( Container(
onTap: () { padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
Navigator.push( alignment: Alignment.center,
context, decoration: BoxDecoration(
FadePage( borderRadius: BorderRadius.circular(15),
page: PickupLocationFromMap( color: Colors.white,
latitude: _latitude??0, border: Border.all(
longitude: _longitude??0, color: Color(0xffefefef),
onPick: (value) { width: 1,
setState(() {
_result = value;
});
},
)),
);
},
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: InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PickupLocationFromMap(
latitude: _latitude ?? 0,
longitude: _longitude ?? 0,
onPick: (value) {
setState(() {
_result = value;
});
},
)),
);
},
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded(child: Texts(getSelectFromMapName(context))), Expanded(
Icon( child: Column(
FontAwesomeIcons.mapMarkerAlt, crossAxisAlignment: CrossAxisAlignment.start,
size: 24, children: [
color: Colors.black, Text(
) TranslationBase.of(context).selectMap,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
Text(
getSelectFromMapName(context),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
],
),
),
Icon(Icons.arrow_drop_down),
], ],
), ),
), ),
@ -127,7 +146,7 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase.of(context).pickupSpot), Text(TranslationBase.of(context).pickupSpot, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -138,21 +157,27 @@ class _PickupLocationState extends State<PickupLocation> {
}); });
}, },
child: Container( 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( child: ListTile(
title: Texts(TranslationBase.of(context).insideHome), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Checkbox( title: Row(
value: _isInsideHome, children: [
onChanged: (value) { Checkbox(
setState(() { value: _isInsideHome,
_isInsideHome = value; onChanged: (value) {
}); setState(() {
}, _isInsideHome = value;
});
},
),
Text(
TranslationBase.of(context).insideHome,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
@ -160,7 +185,7 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase.of(context).haveAppo), Text(TranslationBase.of(context).haveAppo, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -177,25 +202,31 @@ class _PickupLocationState extends State<PickupLocation> {
} }
}, },
child: Container( 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( child: ListTile(
title: Texts(TranslationBase.of(context).yes), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: HaveAppointment.YES, children: [
groupValue: _haveAppointment, Radio(
onChanged: (value) { value: HaveAppointment.YES,
if (myAppointment == null) { groupValue: _haveAppointment,
getAppointment(); onChanged: (value) {
setState(() { if (myAppointment == null) {
_haveAppointment = value; getAppointment();
}); setState(() {
} _haveAppointment = value;
}, });
}
},
),
Text(
TranslationBase.of(context).yes,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
@ -210,23 +241,29 @@ class _PickupLocationState extends State<PickupLocation> {
}); });
}, },
child: Container( 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( child: ListTile(
title: Texts(TranslationBase.of(context).no), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: HaveAppointment.NO, children: [
groupValue: _haveAppointment, Radio(
onChanged: (value) { value: HaveAppointment.NO,
setState(() { groupValue: _haveAppointment,
_haveAppointment = value; onChanged: (value) {
myAppointment = null; setState(() {
}); _haveAppointment = value;
}, myAppointment = null;
});
},
),
Text(
TranslationBase.of(context).no,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
), ),
), ),
), ),
@ -249,31 +286,54 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase.of(context).dropoffLocation), Text(TranslationBase.of(context).dropoffLocation, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
InkWell( Container(
onTap: () { padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
confirmSelectHospitalDialog(widget.amRequestViewModel.hospitals); alignment: Alignment.center,
}, decoration: BoxDecoration(
child: Container( borderRadius: BorderRadius.circular(12),
padding: EdgeInsets.all(12), color: Colors.white,
decoration: BoxDecoration( border: Border.all(
shape: BoxShape.rectangle, color: Color(0xffefefef),
borderRadius: BorderRadius.circular(8), width: 1,
border: Border.all(color: Colors.grey, width: 0.5),
color: Colors.white,
), ),
),
child: InkWell(
onTap: () {
confirmSelectHospitalDialog(widget.amRequestViewModel.hospitals);
},
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(getHospitalName(TranslationBase.of(context).selectHospital)), Expanded(
Icon( child: Column(
Icons.arrow_drop_down, crossAxisAlignment: CrossAxisAlignment.start,
size: 24, children: [
color: Colors.black, Text(
) TranslationBase.of(context).selectHospital,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
Text(
getHospitalName(""),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
],
),
),
Icon(Icons.arrow_drop_down),
], ],
), ),
), ),
@ -284,26 +344,54 @@ class _PickupLocationState extends State<PickupLocation> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase.of(context).pickupLocation), Text(TranslationBase.of(context).pickupLocation, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 15, height: 15,
), ),
InkWell( Container(
onTap: () { padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
confirmSelectHospitalDialog(widget.amRequestViewModel.hospitals); alignment: Alignment.center,
}, decoration: BoxDecoration(
child: Container( borderRadius: BorderRadius.circular(12),
padding: EdgeInsets.all(12), color: Colors.white,
decoration: BoxDecoration( border: Border.all(
shape: BoxShape.rectangle, color: Color(0xffefefef),
borderRadius: BorderRadius.circular(8), width: 1,
border: Border.all(color: Colors.grey, width: 0.5),
color: Colors.white,
), ),
),
child: InkWell(
onTap: () {
confirmSelectHospitalDialog(widget.amRequestViewModel.hospitals);
},
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(getHospitalName(TranslationBase.of(context).pickupLocation)), Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
TranslationBase.of(context).selectHospital,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
Text(
getHospitalName(""),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
],
),
),
Icon( Icon(
Icons.arrow_drop_down, Icons.arrow_drop_down,
size: 24, size: 24,
@ -316,44 +404,67 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase.of(context).dropoffLocation), Text(TranslationBase.of(context).dropoffLocation, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
InkWell( Container(
onTap: () { padding: EdgeInsets.only(left: 16, right: 16, bottom: 15, top: 15),
Navigator.push( alignment: Alignment.center,
context, decoration: BoxDecoration(
FadePage( borderRadius: BorderRadius.circular(12),
page: PickupLocationFromMap( color: Colors.white,
latitude: _latitude, border: Border.all(
longitude: _longitude, color: Color(0xffefefef),
onPick: (value) { width: 1,
setState(() {
_result = value;
});
},
),
),
);
},
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: InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PickupLocationFromMap(
latitude: _latitude,
longitude: _longitude,
onPick: (value) {
setState(() {
_result = value;
});
},
),
),
);
},
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded(child: Texts(getSelectFromMapName(context))), Expanded(
Icon( child: Column(
FontAwesomeIcons.mapMarkerAlt, crossAxisAlignment: CrossAxisAlignment.start,
size: 24, children: [
color: Colors.black, Text(
) TranslationBase.of(context).selectMap,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
Text(
getSelectFromMapName(context),
style: TextStyle(
fontSize: 14,
height: 21 / 14,
fontWeight: FontWeight.w400,
color: Color(0xff2B353E),
letterSpacing: -0.44,
),
),
],
),
),
Icon(Icons.arrow_drop_down),
], ],
), ),
), ),
@ -442,16 +553,22 @@ class _PickupLocationState extends State<PickupLocation> {
); );
} }
int _selectedHospitalIndex = -1;
void confirmSelectHospitalDialog(List<HospitalsModel> hospitals) { void confirmSelectHospitalDialog(List<HospitalsModel> hospitals) {
List<RadioSelectionDialogModel> list = [
for (int i = 0; i < hospitals.length; i++) RadioSelectionDialogModel(hospitals[i].name + ' ${hospitals[i].distanceInKilometers} ' + TranslationBase.of(context).km, i),
];
showDialog( showDialog(
context: context, context: context,
child: SelectHospitalDialog( child: RadioSelectionDialog(
hospitals: hospitals, listData: list,
selectedHospital: _selectedHospital, selectedIndex: _selectedHospitalIndex,
onValueSelected: (value) { isScrollable: true,
setState(() { onValueSelected: (index) {
_selectedHospital = value; _selectedHospitalIndex = index;
}); _selectedHospital = hospitals[index];
setState(() {});
}, },
), ),
); );
@ -462,7 +579,7 @@ class _PickupLocationState extends State<PickupLocation> {
} }
String getSelectFromMapName(context) { String getSelectFromMapName(context) {
return _result != null ? _result.formattedAddress : TranslationBase.of(context).selectMap; return _result != null ? _result.formattedAddress : "";
} }
getAppointment() { getAppointment() {

@ -5,8 +5,8 @@ import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -71,56 +71,77 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase.of(context).transportHeading), Text(TranslationBase.of(context).transportHeading, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
...List.generate( Container(
widget.amRequestViewModel.amRequestModeList.length, margin: EdgeInsets.only(top: 12),
(index) => InkWell( decoration: cardRadius(12),
onTap: () { child: Column(
setState(() { crossAxisAlignment: CrossAxisAlignment.start,
_erTransportationMethod = widget.amRequestViewModel.amRequestModeList[index]; children: [
}); ...List.generate(
}, widget.amRequestViewModel.amRequestModeList.length,
child: Container( (index) => InkWell(
margin: EdgeInsets.all(5), onTap: () {
decoration: BoxDecoration( setState(() {
shape: BoxShape.rectangle, _erTransportationMethod = widget.amRequestViewModel.amRequestModeList[index];
borderRadius: BorderRadius.circular(8), });
border: Border.all(color: Colors.grey, width: 0.5), },
color: Colors.white, child: Container(
), child: Row(
child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( Expanded(
flex: 3, flex: 4,
child: ListTile( child: ListTile(
title: Texts(projectViewModel.isArabic ? widget.amRequestViewModel.amRequestModeList[index].textN : widget.amRequestViewModel.amRequestModeList[index].text), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: widget.amRequestViewModel.amRequestModeList[index], children: [
groupValue: _erTransportationMethod, Radio(
onChanged: (value) { value: widget.amRequestViewModel.amRequestModeList[index],
setState(() { groupValue: _erTransportationMethod,
_erTransportationMethod = value; onChanged: (value) {
}); setState(() {
}, _erTransportationMethod = value;
), });
},
),
Flexible(
child: Text(
projectViewModel.isArabic ? widget.amRequestViewModel.amRequestModeList[index].textN : widget.amRequestViewModel.amRequestModeList[index].text,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
),
],
),
),
),
Expanded(
flex: 1,
child: Text(
TranslationBase.of(context).sar + ' ${widget.amRequestViewModel.amRequestModeList[index].price}',
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
)
],
), ),
), ),
Expanded( ),
flex: 1,
child: Texts(TranslationBase.of(context).sar + ' ${widget.amRequestViewModel.amRequestModeList[index].price}'),
)
],
), ),
), ],
), ),
), ),
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts(TranslationBase.of(context).directionHeading), Text(TranslationBase.of(context).directionHeading, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox(
height: 5,
),
Container( Container(
width: double.maxFinite, width: double.maxFinite,
child: Row( child: Row(
@ -136,22 +157,26 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
}, },
child: Container( child: Container(
width: double.maxFinite, 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( child: ListTile(
title: Texts(TranslationBase.of(context).toHospital), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: Direction.ToHospital, children: [
groupValue: _direction, Radio(
onChanged: (value) { value: Direction.ToHospital,
setState(() { groupValue: _direction,
_direction = value; onChanged: (value) {
}); setState(() {
}, _direction = value;
});
},
),
Text(TranslationBase.of(context).toHospital,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
)),
],
), ),
), ),
), ),
@ -166,22 +191,26 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
}, },
child: Container( child: Container(
width: double.maxFinite, 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( child: ListTile(
title: Texts(TranslationBase.of(context).fromHospital), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: Direction.FromHospital, children: [
groupValue: _direction, Radio(
onChanged: (value) { value: Direction.FromHospital,
setState(() { groupValue: _direction,
_direction = value; onChanged: (value) {
}); setState(() {
}, _direction = value;
});
},
),
Text(TranslationBase.of(context).fromHospital,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
)),
],
), ),
), ),
), ),
@ -197,7 +226,7 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts(TranslationBase.of(context).wayHeading), Text(TranslationBase.of(context).wayHeading, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -213,22 +242,26 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
}); });
}, },
child: Container( 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( child: ListTile(
title: Texts(TranslationBase.of(context).oneDirec), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: Way.OneWay, children: [
groupValue: _way, Radio(
onChanged: (value) { value: Way.OneWay,
setState(() { groupValue: _way,
_way = value; onChanged: (value) {
}); setState(() {
}, _way = value;
});
},
),
Text(TranslationBase.of(context).oneDirec,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
)),
],
), ),
), ),
), ),
@ -242,22 +275,26 @@ class _SelectTransportationMethodState extends State<SelectTransportationMethod>
}); });
}, },
child: Container( 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( child: ListTile(
title: Texts(TranslationBase.of(context).twoDirec), contentPadding: EdgeInsets.only(left: 0.0, right: 0.0),
leading: Radio( title: Row(
value: Way.TwoWays, children: [
groupValue: _way, Radio(
onChanged: (value) { value: Way.TwoWays,
setState(() { groupValue: _way,
_way = value; onChanged: (value) {
}); setState(() {
}, _way = value;
});
},
),
Text(TranslationBase.of(context).twoDirec,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
)),
],
), ),
), ),
), ),

@ -3,8 +3,8 @@ import 'package:diplomaticquarterapp/core/model/er/PatientER_RC.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -31,91 +31,73 @@ class _SummaryState extends State<Summary> {
isShowAppBar: false, isShowAppBar: false,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
margin: EdgeInsets.only(left: 12, right: 12), margin: EdgeInsets.only(left: 12, right: 12, top: 12),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase.of(context).RRTSummary), Text(TranslationBase.of(context).RRTSummary, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
decoration: BoxDecoration( // margin: EdgeInsets.only(top: 12),
color: Colors.white, decoration: cardRadius(12),
borderRadius: BorderRadius.circular(12),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( _getNormalText(TranslationBase.of(context).transportMethod),
TranslationBase.of(context).transportMethod,
color: Colors.grey,
),
projectViewModel.isArabic projectViewModel.isArabic
? Texts( ? _getNormalText(
'${widget.patientER_RC.patientERTransportationMethod.textN}', '${widget.patientER_RC.patientERTransportationMethod.textN}',
bold: true, isBold: true,
) )
: Texts( : _getNormalText(
'${widget.patientER_RC.patientERTransportationMethod.text}', '${widget.patientER_RC.patientERTransportationMethod.text}',
bold: true, isBold: true,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts( _getNormalText(TranslationBase.of(context).directions),
TranslationBase.of(context).directions, _getNormalText(
color: Colors.grey,
),
Texts(
widget.patientER_RC.transportationDetails.direction == 0 ? TranslationBase.of(context).toHospital : TranslationBase.of(context).fromHospital, widget.patientER_RC.transportationDetails.direction == 0 ? TranslationBase.of(context).toHospital : TranslationBase.of(context).fromHospital,
bold: true, isBold: true,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts( _getNormalText(
TranslationBase.of(context).pickupLocation, TranslationBase.of(context).pickupLocation,
color: Colors.grey,
), ),
Texts( _getNormalText(
'${widget.patientER_RC.transportationDetails.pickupLocationName}', '${widget.patientER_RC.transportationDetails.pickupLocationName}',
bold: true, isBold: true,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts( _getNormalText(TranslationBase.of(context).dropoffLocation),
TranslationBase.of(context).dropoffLocation, _getNormalText(
color: Colors.grey,
),
Texts(
'${widget.patientER_RC.transportationDetails.dropoffLocationName}', '${widget.patientER_RC.transportationDetails.dropoffLocationName}',
bold: true, isBold: true,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts( _getNormalText(TranslationBase.of(context).selectAmbulate),
TranslationBase.of(context).selectAmbulate, _getNormalText(
color: Colors.grey,
),
Texts(
'${widget.patientER_RC.transportationDetails.ambulateTitle}', '${widget.patientER_RC.transportationDetails.ambulateTitle}',
bold: true, isBold: true,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts( _getNormalText(TranslationBase.of(context).notes),
TranslationBase.of(context).notes, _getNormalText(
color: Colors.grey,
),
Texts(
'${widget.patientER_RC.transportationDetails.notes ?? '---'}', '${widget.patientER_RC.transportationDetails.notes ?? '---'}',
bold: true, isBold: true,
), ),
SizedBox( SizedBox(
height: 8, height: 8,
@ -126,23 +108,26 @@ class _SummaryState extends State<Summary> {
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Texts( Text(TranslationBase.of(context).billAmount, style: TextStyle(fontSize: 16.0, letterSpacing: -0.64, fontWeight: FontWeight.w600)),
TranslationBase.of(context).billAmount,
textAlign: TextAlign.start,
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Container( Container(
height: 55, height: 55,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)), decoration: cardRadius(12),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Texts(TranslationBase.of(context).patientShareTotal + ':'), Texts(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.priceTotal}')], children: [
_getNormalText(TranslationBase.of(context).patientShareTotal + ':'),
Container(
padding: EdgeInsets.only(left: 20.0, right: 20.0),
child: _getNormalText(TranslationBase.of(context).sar + ' ${widget.patientER_RC.patientERTransportationMethod.priceTotal}', isBold: true, isTotal: true)
),
],
), ),
), ),
SizedBox(height: 130), SizedBox(height: 50),
], ],
), ),
), ),
@ -156,4 +141,20 @@ class _SummaryState extends State<Summary> {
), ),
); );
} }
_getNormalText(text, {bool isBold = false, bool isTotal = false}) {
return Text(
text,
style: TextStyle(
fontSize: isBold
? isTotal
? 16
: 12
: 10,
letterSpacing: -0.5,
color: isBold ? Colors.black : Colors.grey[700],
fontWeight: FontWeight.w600,
),
);
}
} }

@ -9,7 +9,6 @@ import 'package:provider/provider.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
import 'AmbulanceReq.dart'; import 'AmbulanceReq.dart';
import 'EdOnline/DdServicesPage.dart';
import 'NearestEr.dart'; import 'NearestEr.dart';
class ErOptions extends StatefulWidget { class ErOptions extends StatefulWidget {
@ -75,26 +74,26 @@ class _ErOptionsState extends State<ErOptions> {
), ),
InkWell( InkWell(
onTap: () { onTap: () {
// Navigator.push(context, FadePage(page: DdServicesPage())); if (rrtLocked) Navigator.push(context, FadePage(page: RRTMainScreen()));
}, },
child: MedicalProfileItem( child: MedicalProfileItem(
title: "ED", title: TranslationBase.of(context).RRTTitle,
imagePath: 'assets/images/new-design/AM.PNG', imagePath: 'assets/images/new-design/AM.PNG',
subTitle: TranslationBase.of(context).service, subTitle: TranslationBase.of(context).RRTSubTitle,
isPngImage: true, isPngImage: true,
isEnable: false, isEnable: rrtLocked,
), ),
), ),
InkWell( InkWell(
onTap: () { onTap: () {
if(rrtLocked) Navigator.push(context, FadePage(page: RRTMainScreen())); // Navigator.push(context, FadePage(page: DdServicesPage()));
}, },
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).rrtService, title: "ED",
imagePath: 'assets/images/new-design/AM.PNG', imagePath: 'assets/images/new-design/AM.PNG',
subTitle: TranslationBase.of(context).service, subTitle: TranslationBase.of(context).service,
isPngImage: true, isPngImage: true,
isEnable: rrtLocked, isEnable: false,
), ),
), ),
], ],

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/others/OrderLogItem.dart'; import 'package:diplomaticquarterapp/widgets/others/OrderLogItem.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -15,7 +16,7 @@ class OrderLogPage extends StatelessWidget {
return Container( return Container(
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: ListView.builder( child: amRequestViewModel.patientAmbulanceRequestOrdersList.length > 0 ? ListView.builder(
itemCount: amRequestViewModel.patientAmbulanceRequestOrdersList.length, itemCount: amRequestViewModel.patientAmbulanceRequestOrdersList.length,
itemBuilder: (context, index) => Container( itemBuilder: (context, index) => Container(
margin: EdgeInsets.all(8), margin: EdgeInsets.all(8),
@ -69,7 +70,7 @@ class OrderLogPage extends StatelessWidget {
], ],
), ),
), ),
), ) : getNoDataWidget(context),
); );
} }

@ -103,21 +103,21 @@ class RRTLogListItemState extends State<RRTLogListItem> {
'${TranslationBase.of(context).requestID}: ${widget.order.iD}', '${TranslationBase.of(context).requestID}: ${widget.order.iD}',
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
), ),
Row( // Row(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
Text( // Text(
TranslationBase.of(context).locationa + ": ", // TranslationBase.of(context).locationa + ": ",
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10), // style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
), // ),
Expanded( // Expanded(
child: Text( // child: Text(
widget.order.projectName.toString(), // widget.order.projectName.toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56), // style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56),
), // ),
), // ),
], // ],
), // ),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

@ -43,7 +43,7 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
static CameraPosition cameraPosition = CameraPosition( static CameraPosition cameraPosition = CameraPosition(
target: LatLng(37.42796133580664, -122.085749655962), target: LatLng(37.42796133580664, -122.085749655962),
zoom: 14.4746, zoom: 17,
); );
LatLng currentPostion; LatLng currentPostion;
@ -71,7 +71,6 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
_updatePosition(camera); _updatePosition(camera);
}, },
onMapCreated: () { onMapCreated: () {
// goToCurrentLocation();
_getUserLocation(); _getUserLocation();
setState(() {}); setState(() {});
}, },
@ -97,8 +96,6 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
latitude = double.parse(latLongArr[0]); latitude = double.parse(latLongArr[0]);
longitude = double.parse(latLongArr[1]); longitude = double.parse(latLongArr[1]);
print("sssss1 " + latitude.toString());
print("sssss2 " + longitude.toString());
currentPostion = LatLng(latitude, longitude); currentPostion = LatLng(latitude, longitude);
setMap(); setMap();
} }
@ -108,7 +105,7 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
setState(() { setState(() {
cameraPosition = CameraPosition( cameraPosition = CameraPosition(
target: currentPostion, target: currentPostion,
zoom: 14.4746, zoom: 16,
); );
appMap.moveTo(cameraPostion: cameraPosition); appMap.moveTo(cameraPostion: cameraPosition);
selectedAddress.latLong = currentPostion.latitude.toString() + "," + currentPostion.longitude.toString(); selectedAddress.latLong = currentPostion.latitude.toString() + "," + currentPostion.longitude.toString();

@ -63,7 +63,7 @@ class RRTPlaceOrderPage extends StatelessWidget {
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
child: Image.network( child: Image.network(
"https://maps.googleapis.com/maps/api/staticmap?center=$lat,$lng &zoom=16&size=800x600&maptype=roadmap&markers=color:red%7C$lat,$lng&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8", "https://maps.googleapis.com/maps/api/staticmap?center=$lat,$lng &zoom=17&size=800x600&maptype=roadmap&markers=color:red%7C$lat,$lng&key=AIzaSyCyDbWUM9d_sBUGIE8PcuShzPaqO08NSC8",
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),

@ -1,5 +1,4 @@
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.dart'; import 'package:diplomaticquarterapp/models/rrt/service_price.dart';
import 'package:diplomaticquarterapp/pages/ErService/rapid-response-team/rrt-order-list-item.dart'; import 'package:diplomaticquarterapp/pages/ErService/rapid-response-team/rrt-order-list-item.dart';
@ -10,6 +9,7 @@ import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -65,7 +65,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
child: Text(TranslationBase.of(context).youCanPayByTheFollowingOptions, child: Text(TranslationBase.of(context).youCanPayByTheFollowingOptions,
style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w500), maxLines: 2)), style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w500), maxLines: 2)),
paymentOptions(), Container(margin: EdgeInsets.only(left: 15.0, right: 15.0, top: 10.0), child: getPaymentMethods())
], ],
), ),
), ),

@ -1,5 +1,7 @@
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -12,216 +14,331 @@ class StepsWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); return Container(
return projectViewModel.isArabic? width: double.infinity,
Stack( padding: EdgeInsets.only(left: 12, right: 12, bottom: 12),
children: [ child: Row(
Container( children: [
height: 50, Expanded(
width: MediaQuery.of(context).size.width, child: showProgress(
color: Colors.transparent, title: TranslationBase.of(context).transportation,
child: Center( status: index == 0
child: Divider( ? TranslationBase.of(context).inPrgress
color: Colors.grey, : index > 0
height: 0.75, ? TranslationBase.of(context).completed
thickness: 0.75, : TranslationBase.of(context).locked,
color: index == 0 ? CustomColors.orange : CustomColors.green,
), ),
), ),
), Expanded(
Positioned( child: showProgress(
top: 10, title: TranslationBase.of(context).locationa,
right: 0, status: index == 1
child: InkWell( ? TranslationBase.of(context).inPrgress
onTap: () => changeCurrentTab(0), : index > 1
child: Container( ? TranslationBase.of(context).completed
width: 35, : TranslationBase.of(context).locked,
height: 35, color: index == 1
decoration: BoxDecoration( ? CustomColors.orange
border: index > 0 ? null:Border.all(color: Colors.black,width: 0.75), : index > 1
shape: BoxShape.circle, ? CustomColors.green
color: index == 0 ? Colors.grey[800] : index > 0 ?Colors.green: Colors.white, : CustomColors.grey2,
),
child: Center(
child: Texts(
'1',
color: index == 0 ? Colors.white : index > 0 ?Colors.white: Colors.grey[800],
),
),
), ),
), ),
), Expanded(
Positioned( child: showProgress(
top: 10, title: TranslationBase.of(context).otherInfo,
right: MediaQuery.of(context).size.width * 0.3, status: index == 2
child: InkWell( ? TranslationBase.of(context).inPrgress
onTap: () => index >= 2 ? changeCurrentTab(1) : null, : index > 2
child: Container( ? TranslationBase.of(context).completed
width: 35, : TranslationBase.of(context).locked,
height: 35, color: index == 2
decoration: BoxDecoration( ? CustomColors.orange
border: index > 1 ? null:Border.all(color: Colors.black,width: 0.75), : index > 2
shape: BoxShape.circle, ? CustomColors.green
color: index == 1 ? Colors.grey[800] : index > 1 ?Colors.green: Colors.white, : CustomColors.grey2,
),
child: Center(
child: Texts(
'2',
color: index == 1? Colors.white : index > 1 ?Colors.white: Colors.grey[800],
),
),
), ),
), ),
), showProgress(
Positioned( title: TranslationBase.of(context).RRTSummary,
top: 10, status: index == 3 ? TranslationBase.of(context).inPrgress : TranslationBase.of(context).locked,
right: MediaQuery.of(context).size.width * 0.6, color: index == 3
child: InkWell( ? CustomColors.orange
onTap: () => index >= 3 ? changeCurrentTab(2) : null, : index > 4
child: Container( ? CustomColors.green
width: 35, : CustomColors.grey2,
height: 35, isNeedBorder: false,
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, // return projectViewModel.isArabic?
color: index == 3 ? Colors.grey[800] : Colors.white, // Stack(
), // children: [
child: Center( // Container(
child: Texts( // height: 50,
'4', // width: MediaQuery.of(context).size.width,
color: index == 3 ? Colors.white : Colors.grey[800], // color: Colors.transparent,
), // child: Center(
), // child: Divider(
), // color: Colors.grey,
), // height: 0.75,
), // thickness: 0.75,
], // ),
): // ),
Stack( // ),
// 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],
// ),
// ),
// ),
// ),
// ),
// ],
// ):
// 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,
// left: 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,
// left: 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,
// left: 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,
// right: 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],
// ),
// ),
// ),
// ),
// ),
// ],
// );
}
Widget showProgress({String title, String status, Color color, bool isNeedBorder = true}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Column(
height: 50, crossAxisAlignment: CrossAxisAlignment.start,
width: MediaQuery.of(context).size.width, children: [
color: Colors.transparent, Row(
child: Center( children: [
child: Divider( Container(
color: Colors.grey, width: 26,
height: 0.75, height: 26,
thickness: 0.75, decoration: containerRadius(color, 200),
), child: Icon(
), Icons.done,
), color: Colors.white,
Positioned( size: 16,
top: 10, ),
left: 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,
left: 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],
), ),
), if (isNeedBorder)
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: mDivider(Colors.grey),
)),
],
), ),
), mHeight(8),
), Text(
Positioned( title,
top: 10, style: TextStyle(
left: MediaQuery.of(context).size.width * 0.6, fontSize: 11,
child: InkWell( fontWeight: FontWeight.w600,
onTap: () => index >= 3 ? changeCurrentTab(2) : null, letterSpacing: -0.44,
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],
),
), ),
), ),
), mHeight(2),
), Container(
Positioned( padding: EdgeInsets.all(5),
top: 10, decoration: containerRadius(color.withOpacity(0.2), 4),
right: 0, child: Text(
child: InkWell( status,
onTap: () => index == 2 ?changeCurrentTab(3):null, style: TextStyle(
child: Container( fontSize: 8,
width: 35, fontWeight: FontWeight.w600,
height: 35, letterSpacing: -0.32,
decoration: BoxDecoration( color: color,
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],
), ),
), ),
), ),
), ],
), )
], ],
); );
} }

@ -8,8 +8,9 @@ import 'package:flutter/material.dart';
class PaymentMethod extends StatefulWidget { class PaymentMethod extends StatefulWidget {
Function onSelectedMethod; Function onSelectedMethod;
bool isShowInstallments;
PaymentMethod({this.onSelectedMethod}); PaymentMethod({this.onSelectedMethod, this.isShowInstallments = false});
@override @override
_PaymentMethodState createState() => _PaymentMethodState(); _PaymentMethodState createState() => _PaymentMethodState();
@ -185,55 +186,56 @@ class _PaymentMethodState extends State<PaymentMethod> {
), ),
), ),
), ),
Container( if (widget.isShowInstallments)
width: double.infinity, Container(
child: InkWell( width: double.infinity,
onTap: () { child: InkWell(
updateSelectedPaymentMethod("Installment"); onTap: () {
}, updateSelectedPaymentMethod("Installment");
child: Card( },
elevation: 0.0, child: Card(
margin: EdgeInsets.fromLTRB(8.0, 16.0, 8.0, 8.0), elevation: 0.0,
color: Colors.white, margin: EdgeInsets.fromLTRB(8.0, 16.0, 8.0, 8.0),
shape: RoundedRectangleBorder( color: Colors.white,
borderRadius: BorderRadius.circular(10), shape: RoundedRectangleBorder(
side: selectedPaymentMethod == "Installment" ? BorderSide(color: Colors.green, width: 2.0) : BorderSide(color: Colors.transparent, width: 0.0), borderRadius: BorderRadius.circular(10),
), side: selectedPaymentMethod == "Installment" ? BorderSide(color: Colors.green, width: 2.0) : BorderSide(color: Colors.transparent, width: 0.0),
child: Padding( ),
padding: const EdgeInsets.all(12.0), child: Padding(
child: Row( padding: const EdgeInsets.all(12.0),
children: [ child: Row(
Container( children: [
width: 24,
height: 24,
decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "Installment" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
),
mWidth(12),
Container(
height: 60.0,
padding: EdgeInsets.all(7.0),
width: 60,
child: Image.asset("assets/images/new/payment/installments.png"),
),
mFlex(1),
if (selectedPaymentMethod == "Installment")
Container( Container(
decoration: containerRadius(CustomColors.green, 200), width: 24,
padding: EdgeInsets.only(top: 6, bottom: 6, left: 12, right: 12), height: 24,
child: Text( decoration: containerColorRadiusBorderWidth(selectedPaymentMethod == "Installment" ? CustomColors.accentColor : Colors.transparent, 100, Colors.grey, 0.5),
TranslationBase.of(context).paymentSelected, ),
style: TextStyle( mWidth(12),
color: Colors.white, Container(
fontSize: 11, height: 60.0,
padding: EdgeInsets.all(7.0),
width: 60,
child: Image.asset("assets/images/new/payment/installments.png"),
),
mFlex(1),
if (selectedPaymentMethod == "Installment")
Container(
decoration: containerRadius(CustomColors.green, 200),
padding: EdgeInsets.only(top: 6, bottom: 6, left: 12, right: 12),
child: Text(
TranslationBase.of(context).paymentSelected,
style: TextStyle(
color: Colors.white,
fontSize: 11,
),
), ),
), ),
), ],
], ),
), ),
), ),
), ),
), ),
),
Platform.isIOS Platform.isIOS
? Container( ? Container(
width: double.infinity, width: double.infinity,

@ -313,9 +313,11 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
page: PaymentMethod(onSelectedMethod: (String metohd) { page: PaymentMethod(
setState(() {}); onSelectedMethod: (String metohd) {
}), setState(() {});
},
isShowInstallments: num.tryParse(amount) >= 1000 ? true : false),
), ),
).then( ).then(
(value) { (value) {

@ -2610,6 +2610,14 @@ class TranslationBase {
String get laserClinic => localizedValues["laserClinic"][locale.languageCode]; String get laserClinic => localizedValues["laserClinic"][locale.languageCode];
String get noImage => localizedValues["noImage"][locale.languageCode]; String get noImage => localizedValues["noImage"][locale.languageCode];
String get signoutMessage => localizedValues["signoutMessage"][locale.languageCode];
String get RRTTitle => localizedValues["RRTTitle"][locale.languageCode];
String get RRTSubTitle => localizedValues["RRTSubTitle"][locale.languageCode];
String get transportation => localizedValues["transportation"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -28,6 +28,7 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -475,20 +476,28 @@ class _AppDrawerState extends State<AppDrawer> {
} }
logout() async { logout() async {
authenticatedUserObject.logout(); ConfirmDialog dialog = new ConfirmDialog(
projectProvider.isLogin = false; context: context,
await authenticatedUserObject.getUser(); confirmMessage: TranslationBase.of(context).signoutMessage,
_vitalSignService.heightCm = ""; okText: TranslationBase.of(context).confirm,
_vitalSignService.weightKg = ""; cancelText: TranslationBase.of(context).cancel_nocaps,
await _privilegeService.getPrivilege(); okFunction: () async {
projectProvider.setPrivilegeModelList(privilege: _privilegeService.privilegeModelList); authenticatedUserObject.logout();
var appLanguage = await sharedPref.getString(APP_LANGUAGE); projectProvider.isLogin = false;
await sharedPref.clear(); await authenticatedUserObject.getUser();
await sharedPref.setString(APP_LANGUAGE, appLanguage); _vitalSignService.heightCm = "";
await sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL); _vitalSignService.weightKg = "";
this.user = null; await _privilegeService.getPrivilege();
Navigator.of(context).pushNamed(HOME); projectProvider.setPrivilegeModelList(privilege: _privilegeService.privilegeModelList);
// projectProvider.platformBridge().unRegisterHmgGeofences(); var appLanguage = await sharedPref.getString(APP_LANGUAGE);
await sharedPref.clear();
await sharedPref.setString(APP_LANGUAGE, appLanguage);
await sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
this.user = null;
Navigator.of(context).pushNamed(HOME);
},
cancelFunction: () => {});
dialog.showAlertDialog(context);
} }
login() async { login() async {

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/borderedButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/borderedButton.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/close_back.dart'; import 'package:diplomaticquarterapp/widgets/others/close_back.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -30,19 +31,23 @@ class PickupLocationFromMap extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return Scaffold( return AppScaffold(
appBar: isWithAppBar isShowAppBar: true,
? AppBar( showNewAppBarTitle: true,
elevation: 0, showNewAppBar: true,
textTheme: TextTheme( appBarTitle: TranslationBase.of(context).selectLocation,
headline6: // appBar: isWithAppBar
TextStyle(color: Colors.white, fontWeight: FontWeight.bold), // ? AppBar(
), // elevation: 0,
title: Text('Location'), // textTheme: TextTheme(
leading: CloseBack(), // headline6:
centerTitle: true, // TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
) // ),
: null, // title: Text('Location'),
// leading: CloseBack(),
// centerTitle: true,
// )
// : null,
body: PlacePicker( body: PlacePicker(
apiKey: GOOGLE_API_KEY, apiKey: GOOGLE_API_KEY,
enableMyLocationButton: true, enableMyLocationButton: true,

Loading…
Cancel
Save