Merge branch 'development_new_design_2.0' into mirza_home_page

# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
#	lib/widgets/drawer/app_drawer_widget.dart
merge-update-with-lab-changes
Mirza.Shafique 5 years ago
commit bd1cf9bcc7

@ -127,11 +127,14 @@ const INSERT_ER_INERT_PRES_ORDER =
/// ER RRT /// ER RRT
const GET_ALL_RC_TRANSPORTATION = 'rc/api/Transportation/getalltransportation'; const GET_ALL_RC_TRANSPORTATION = 'rc/api/Transportation/getalltransportation';
const GET_ALL_TRANSPORTATIONS_RC = 'rc/api/Transportation/getalltransportation';
const GET_ALL_RRT_QUESTIONS = const GET_ALL_RRT_QUESTIONS =
'Services/Patients.svc/REST/PatientER_RRT_GetAllQuestions'; 'Services/Patients.svc/REST/PatientER_RRT_GetAllQuestions';
const GET_RRT_SERVICE_PRICE = const GET_RRT_SERVICE_PRICE =
'Services/Patients.svc/REST/PatientE_RealRRT_GetServicePrice'; 'Services/Patients.svc/REST/PatientE_RealRRT_GetServicePrice';
const INSERT_TRANSPORTATION_ORDER_RC = "rc/api/Transportation/add";
///FindUs ///FindUs
const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations'; const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations';

@ -8,7 +8,7 @@ class PatientER {
int languageID; int languageID;
String iPAdress; String iPAdress;
String generalid; String generalid;
int patientOutSA; dynamic patientOutSA;
String sessionID; String sessionID;
bool isDentalAllowedBackend; bool isDentalAllowedBackend;
int deviceTypeID; int deviceTypeID;
@ -164,7 +164,7 @@ class PatientER {
data['SessionID'] = this.sessionID; data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID; data['DeviceTypeID'] = this.deviceTypeID;
data['PatientID'] = this.patientID; data['PatientID'] = this.patientID.toString();
data['TokenID'] = this.tokenID; data['TokenID'] = this.tokenID;
data['PatientTypeID'] = this.patientTypeID; data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType; data['PatientType'] = this.patientType;

@ -1,79 +1,56 @@
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
class PatientERTransportationMethod { class PatientERTransportationMethod {
dynamic id; int id;
DateTime createDate; String serviceID;
DateTime lastEditDate; int orderServiceID;
dynamic createdBy; String text;
dynamic lastEditBy; String textN;
bool isActive;
String title;
String titleAR;
dynamic price; dynamic price;
dynamic isDefault; dynamic priceVAT;
dynamic visibility; dynamic priceTotal;
dynamic durationId; bool isEnabled;
String description; int orderId;
String descriptionAR; int quantity;
dynamic totalPrice;
dynamic vAT;
PatientERTransportationMethod( PatientERTransportationMethod(
{ {this.id,
this.id, this.serviceID,
this.createDate, this.orderServiceID,
this.lastEditDate, this.text,
this.createdBy, this.textN,
this.lastEditBy,
this.isActive,
this.title,
this.titleAR,
this.price, this.price,
this.isDefault, this.priceVAT,
this.visibility, this.priceTotal,
this.durationId, this.isEnabled,
this.description, this.orderId,
this.descriptionAR, this.quantity});
this.totalPrice,
this.vAT});
PatientERTransportationMethod.fromJson( PatientERTransportationMethod.fromJson(Map<String, dynamic> json) {
Map<String, dynamic> json) { id = json['id'];
id = json['Id']; serviceID = json['serviceID'];
createDate = DateUtil.convertStringToDate(json['CreateDate']); orderServiceID = json['orderServiceID'];
lastEditDate = DateUtil.convertStringToDate(json['LastEditDate']); text = json['text'];
createdBy = json['CreatedBy']; textN = json['textN'];
lastEditBy = json['LastEditBy']; price = json['price'];
isActive = json['IsActive']; priceVAT = json['priceVAT'];
title = json['Title']; priceTotal = json['priceTotal'];
titleAR = json['TitleAR']; isEnabled = json['isEnabled'];
price = json['Price']; orderId = json['orderId'];
isDefault = json['isDefault']; quantity = json['quantity'];
visibility = json['Visibility'];
durationId = json['DurationId'];
description = json['Description'];
descriptionAR = json['DescriptionAR'];
totalPrice = json['TotalPrice'];
vAT = json['VAT'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['Id'] = this.id; data['id'] = this.id;
data['CreateDate'] = this.createDate; data['serviceID'] = this.serviceID;
data['LastEditDate'] = this.lastEditDate; data['orderServiceID'] = this.orderServiceID;
data['CreatedBy'] = this.createdBy; data['text'] = this.text;
data['LastEditBy'] = this.lastEditBy; data['textN'] = this.textN;
data['IsActive'] = this.isActive; data['price'] = this.price;
data['Title'] = this.title; data['priceVAT'] = this.priceVAT;
data['TitleAR'] = this.titleAR; data['priceTotal'] = this.priceTotal;
data['Price'] = this.price; data['isEnabled'] = this.isEnabled;
data['isDefault'] = this.isDefault; data['orderId'] = this.orderId;
data['Visibility'] = this.visibility; data['quantity'] = this.quantity;
data['DurationId'] = this.durationId;
data['Description'] = this.description;
data['DescriptionAR'] = this.descriptionAR;
data['TotalPrice'] = this.totalPrice;
data['VAT'] = this.vAT;
return data; return data;
} }
} }

@ -118,7 +118,8 @@ class BaseAppClient {
} }
print("URL : $url"); print("URL : $url");
print("Body : ${json.encode(body)}"); final jsonBody = json.encode(body);
print(jsonBody);
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
final response = await http.post(url.trim(), body: json.encode(body), headers: headers); final response = await http.post(url.trim(), body: json.encode(body), headers: headers);

@ -1,11 +1,11 @@
import 'package:diplomaticquarterapp/config/config.dart'; 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/enum/OrderService.dart';
import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientAllPresOrders.dart';
import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart';
import 'package:diplomaticquarterapp/core/model/er/PickUpRequestPresOrder.dart'; import 'package:diplomaticquarterapp/core/model/er/PickUpRequestPresOrder.dart';
import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import '../base_service.dart'; import '../base_service.dart';
class AmService extends BaseService { class AmService extends BaseService {
@ -22,16 +22,27 @@ class AmService extends BaseService {
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
body['IdentificationNo'] = user.patientIdentificationNo; body['IdentificationNo'] = user.patientIdentificationNo;
await baseAppClient.post(GET_AMBULANCE_REQUEST, await baseAppClient.get(
onSuccess: (dynamic response, int statusCode) { GET_ALL_TRANSPORTATIONS_RC + "?patientID=" + user.patientID.toString(),
isExternal: false, onSuccess: (dynamic response, int statusCode) {
amModelList.clear(); amModelList.clear();
response['PatientER_RRT_GetAllTransportationMethodList'].forEach((item) { response['data']['transportationservices'].forEach((item) {
amModelList.add(PatientERTransportationMethod.fromJson(item)); amModelList.add(PatientERTransportationMethod.fromJson(item));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); });
// await baseAppClient.post(GET_AMBULANCE_REQUEST,
// onSuccess: (dynamic response, int statusCode) {
// amModelList.clear();
// response['PatientER_RRT_GetAllTransportationMethodList'].forEach((item) {
// amModelList.add(PatientERTransportationMethod.fromJson(item));
// });
// }, onFailure: (String error, int statusCode) {
// hasError = true;
// super.error = error;
// }, body: body);
} }
Future getPatientAllPresOrdersList() async { Future getPatientAllPresOrdersList() async {
@ -85,9 +96,8 @@ class AmService extends BaseService {
body['PresOrderStatus'] = OrderService.AMBULANCE.getIdOrderService(); body['PresOrderStatus'] = OrderService.AMBULANCE.getIdOrderService();
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
await baseAppClient.post(UPDATE_PRESS_ORDER, await baseAppClient.post(UPDATE_PRESS_ORDER,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {},
onFailure: (String error, int statusCode) {
}, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
@ -96,10 +106,9 @@ class AmService extends BaseService {
Future insertERPressOrder({@required PatientER patientER}) async { Future insertERPressOrder({@required PatientER patientER}) async {
hasError = false; hasError = false;
await baseAppClient.post(INSERT_ER_INERT_PRES_ORDER, await baseAppClient.post(INSERT_TRANSPORTATION_ORDER_RC,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {},
onFailure: (String error, int statusCode) {
}, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: patientER.toJson()); }, body: patientER.toJson());

@ -14,7 +14,6 @@ import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service
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/card/rounded_container.dart'; import 'package:diplomaticquarterapp/widgets/card/rounded_container.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';
@ -44,7 +43,6 @@ class _SearchByClinicState extends State<SearchByClinic> {
bool isProjectLoaded = false; bool isProjectLoaded = false;
ListClinicCentralized selectedClinic; ListClinicCentralized selectedClinic;
final GlobalKey dropdownKey = GlobalKey();
AuthenticatedUser authUser = new AuthenticatedUser(); AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider(); AuthProvider authProvider = new AuthProvider();
@ -58,127 +56,87 @@ class _SearchByClinicState extends State<SearchByClinic> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.all(10.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Row(
padding: const EdgeInsets.only(left: 2,right: 2), children: <Widget>[
child: Row( Checkbox(
children: <Widget>[ activeColor: new Color(0xFF40ACC9),
Checkbox( value: nearestAppo,
activeColor: new Color(0xFF40ACC9), onChanged: (bool value) {
value: nearestAppo, setState(() {
onChanged: (bool value) { nearestAppo = value;
setState(() { print(nearestAppo);
nearestAppo = value; if (nearestAppo)
print(nearestAppo); getProjectsList();
if (nearestAppo) else
getProjectsList(); isProjectLoaded = false;
else });
isProjectLoaded = false; },
}); ),
}, Text(TranslationBase.of(context).nearestAppo, style: TextStyle(fontSize: 16.0, letterSpacing: 0.9)),
), ],
Text(
TranslationBase.of(context).nearestAppo,
style: TextStyle(fontSize: 14.0, letterSpacing: -0.56),
),
],
),
), ),
widget.clnicIds != null && widget.clnicIds.length > 1 && isLoaded == true widget.clnicIds != null && widget.clnicIds.length > 1 && isLoaded == true
? Padding( ? Column(
padding: const EdgeInsets.only(left: 20,right: 20), crossAxisAlignment: CrossAxisAlignment.start,
child: Column( children: clinicsList.map<Widget>((result) {
crossAxisAlignment: CrossAxisAlignment.start, return RoundedContainer(
children: clinicsList.map<Widget>((result) { child: ListTile(
return RoundedContainer( onTap: () {
child: ListTile( // setState(() {
onTap: () { dropdownValue = result.clinicID.toString();
// setState(() { setState(() {
dropdownValue = result.clinicID.toString(); if (!isDentalSelectedAndSupported()) {
setState(() { projectDropdownValue = "";
if (!isDentalSelectedAndSupported()) { getDoctorsList(context);
projectDropdownValue = ""; } else {}
getDoctorsList(context); });
} },
}); title: Text(result.clinicDescription, style: TextStyle(fontSize: 14.0, color: Colors.grey[700], letterSpacing: 1.0))));
}, }).toList())
title: Text(result.clinicDescription, style: TextStyle(fontSize: 14.0, color: Colors.grey[700], letterSpacing: 1.0)))); : Container(
}).toList()), height: 60.0,
) decoration: BoxDecoration(
: InkWell( color: Colors.white,
onTap: () { border: Border.all(
dropdownKey.currentState; color: Colors.grey[400],
}, width: 1.0,
child: Container( ),
width: double.infinity, borderRadius: BorderRadius.circular(10),
margin: const EdgeInsets.only(left: 16,right: 16), ),
decoration: containerRadius(Colors.white, 12), // margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 20.0),
padding: EdgeInsets.only(left: 12, right: 12, top: 14, bottom: 14), padding: EdgeInsets.all(8.0),
child: Row( width: MediaQuery.of(context).size.width,
children: [ child: DropdownButtonHideUnderline(
Flexible( child: DropdownButton<String>(
child: Column( hint: new Text(TranslationBase.of(context).selectClinic),
crossAxisAlignment: CrossAxisAlignment.start, value: dropdownValue,
children: [ items: clinicsList.map((item) {
Text( return new DropdownMenuItem<String>(
"Select Clinic", value: item.clinicID.toString() + "-" + item.isLiveCareClinicAndOnline.toString() + "-" + item.liveCareClinicID.toString() + "-" + item.liveCareServiceID.toString(),
style: TextStyle( child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
color: Colors.black, Text(item.clinicDescription),
fontSize: 11, item.isLiveCareClinicAndOnline ? SvgPicture.asset('assets/images/new-design/video_icon_green_right.svg', height: 15, width: 15, fit: BoxFit.cover) : Container(),
letterSpacing: -0.44, ]),
fontWeight: FontWeight.w600, );
), }).toList(),
), onChanged: (newValue) {
Container( setState(() {
height: 20, print(newValue);
child: DropdownButtonHideUnderline( dropdownValue = newValue;
child: DropdownButton<String>( if (!isDentalSelectedAndSupported() && !nearestAppo) {
key: dropdownKey, projectDropdownValue = "";
hint: new Text(TranslationBase.of(context).selectClinic), getDoctorsList(context);
value: dropdownValue, } else {
iconSize: 0, print("Dental");
style: TextStyle( }
color: Color(0xFF575757), });
fontSize: 14, },
letterSpacing: -0.56, ),
), )),
isExpanded: true,
items: clinicsList.map((item) {
return new DropdownMenuItem<String>(
value: item.clinicID.toString() +
"-" +
item.isLiveCareClinicAndOnline.toString() +
"-" +
item.liveCareClinicID.toString() +
"-" +
item.liveCareServiceID.toString(),
child: Text(item.clinicDescription),
);
}).toList(),
onChanged: (newValue) {
setState(() {
print(newValue);
dropdownValue = newValue;
if (!isDentalSelectedAndSupported() && !nearestAppo) {
projectDropdownValue = "";
getDoctorsList(context);
}
});
},
),
),
),
],
),
),
Icon(
Icons.keyboard_arrow_down_rounded,
),
],
)),
),
isDentalSelectedAndSupported() == true || (nearestAppo && isProjectLoaded) isDentalSelectedAndSupported() == true || (nearestAppo && isProjectLoaded)
? Container( ? Container(
height: 60.0, height: 60.0,
@ -218,7 +176,10 @@ class _SearchByClinicState extends State<SearchByClinic> {
} }
bool isDentalSelectedAndSupported() { bool isDentalSelectedAndSupported() {
return dropdownValue != "" && (dropdownValue == "17") && isMobileAppDentalAllow; if (dropdownValue != null)
return dropdownValue != "" && (dropdownValue.split("-")[0] == "17") && isMobileAppDentalAllow;
else
return false;
} }
getClinicsList() { getClinicsList() {
@ -265,9 +226,9 @@ class _SearchByClinicState extends State<SearchByClinic> {
// TODO Mosa_REMARk to come back later // TODO Mosa_REMARk to come back later
getDoctorsList(BuildContext context) { getDoctorsList(BuildContext context) {
SearchInfo searchInfo = new SearchInfo(); SearchInfo searchInfo = new SearchInfo();
if (dropdownValue == "17") { if (dropdownValue.split("-")[0] == "17") {
searchInfo.ProjectID = int.parse(projectDropdownValue); searchInfo.ProjectID = int.parse(projectDropdownValue);
searchInfo.ClinicID = int.parse(dropdownValue); searchInfo.ClinicID = int.parse(dropdownValue.split("-")[0]);
searchInfo.date = DateTime.now(); searchInfo.date = DateTime.now();
navigateToDentalComplaints(context, searchInfo); navigateToDentalComplaints(context, searchInfo);

@ -36,9 +36,6 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
@override @override
void initState() { void initState() {
WidgetsBinding.instance
.addPostFrameCallback((_) => getProjectsList(context));
imagesInfo.add( imagesInfo.add(
ImagesInfo( ImagesInfo(
imageEn: 'https://hmgwebservices.com/Images/MobileApp/covid/en/0.png', imageEn: 'https://hmgwebservices.com/Images/MobileApp/covid/en/0.png',
@ -353,6 +350,7 @@ class _CovidDrivethruLocationState extends State<CovidDrivethruLocation> {
CovidDriveThruService service = new CovidDriveThruService(); CovidDriveThruService service = new CovidDriveThruService();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
service.getCovidProjectsList(context).then((res) { service.getCovidProjectsList(context).then((res) {
projectsList.clear();
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() { setState(() {
res['List_COVID19_ProjectDriveThroughTestingCenter'].forEach((v) { res['List_COVID19_ProjectDriveThroughTestingCenter'].forEach((v) {

@ -126,7 +126,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.vAT}', TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.priceVAT}',
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -167,7 +167,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.totalPrice}', TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.priceTotal}',
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
textAlign: TextAlign.start, textAlign: TextAlign.start,

@ -97,9 +97,9 @@ class _SelectTransportationMethodState
child: ListTile( child: ListTile(
title: Texts(projectViewModel.isArabic title: Texts(projectViewModel.isArabic
? widget.amRequestViewModel ? widget.amRequestViewModel
.amRequestModeList[index].titleAR .amRequestModeList[index].textN
: widget.amRequestViewModel : widget.amRequestViewModel
.amRequestModeList[index].title), .amRequestModeList[index].text),
leading: Radio( leading: Radio(
value: widget value: widget
.amRequestViewModel.amRequestModeList[index], .amRequestViewModel.amRequestModeList[index],
@ -317,10 +317,10 @@ class _SelectTransportationMethodState
_orderService.getIdOrderService(); _orderService.getIdOrderService();
widget.patientER.pickupUrgency = 1; widget.patientER.pickupUrgency = 1;
widget.patientER.lineItemNo = 1; widget.patientER.lineItemNo = 1;
widget.patientER.cost = _erTransportationMethod.price; widget.patientER.cost = _erTransportationMethod.price.toDouble();
widget.patientER.vAT = _erTransportationMethod.vAT ?? 0; widget.patientER.vAT = _erTransportationMethod.priceVAT ?? 0;
widget.patientER.totalPrice = widget.patientER.totalPrice =
_erTransportationMethod.totalPrice; _erTransportationMethod.priceTotal.toDouble();
widget.changeCurrentTab(1); widget.changeCurrentTab(1);
}); });
}, },

@ -44,7 +44,7 @@ class _SummaryState extends State<Summary> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts(TranslationBase.of(context).transportMethod,color: Colors.grey,), Texts(TranslationBase.of(context).transportMethod,color: Colors.grey,),
Texts('${widget.patientER.patientERTransportationMethod.title}',bold: true,), Texts('${widget.patientER.patientERTransportationMethod.text}',bold: true,),
SizedBox(height: 8,), SizedBox(height: 8,),
Texts(TranslationBase.of(context).directions,color: Colors.grey,), Texts(TranslationBase.of(context).directions,color: Colors.grey,),
@ -84,7 +84,7 @@ class _SummaryState extends State<Summary> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(TranslationBase.of(context).patientShareTotal+':'), Texts(TranslationBase.of(context).patientShareTotal+':'),
Texts(TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.totalPrice}') Texts(TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.priceTotal}')
], ],
), ),
), ),

@ -179,7 +179,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
buttonIcon: 'assets/images/new/Boo_ Appointment.svg', buttonIcon: 'assets/images/new/Boo_ Appointment.svg',
showConfirmMessageDialog: false, showConfirmMessageDialog: false,
onRatingAndReviewTap: getDoctorRatingsDetails, onRatingAndReviewTap: getDoctorRatingsDetails,
onTap: (){}, onTap: () {},
), ),
SizedBox(height: 10), SizedBox(height: 10),
TabBar( TabBar(

@ -227,7 +227,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
locationUtils = locationUtils =
new LocationUtils(isShowConfirmDialog: false, context: context); new LocationUtils(isShowConfirmDialog: false, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
locationUtils.getCurrentLocation(); // locationUtils.getCurrentLocation();
if (projectViewModel.isLogin) { if (projectViewModel.isLogin) {
familyFileProvider.getSharedRecordByStatus(); familyFileProvider.getSharedRecordByStatus();
} }
@ -254,7 +254,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
if (projectViewModel.isLogin) this.getNotificationCount(DEVICE_TOKEN); if (projectViewModel.isLogin) this.getNotificationCount(DEVICE_TOKEN);
} }
}); });
if (results[Permission.location].isGranted) ; if (results[Permission.location].isGranted) {}
// if (results[Permission.storage].isGranted) ; // if (results[Permission.storage].isGranted) ;
// if (results[Permission.camera].isGranted) ; // if (results[Permission.camera].isGranted) ;
// if (results[Permission.photos].isGranted) ; // if (results[Permission.photos].isGranted) ;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save