RRT Updates

merge-requests/598/head
haroon amjad 4 years ago
parent 72e5d0a2be
commit 4ba37d342c

@ -96,7 +96,6 @@
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
</intent-filter>
</receiver>
<receiver android:exported="true" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
<!-- Geofencing -->
<service android:name=".geofence.intent_receivers.GeofenceTransitionsJobIntentService" android:exported="true" android:permission="android.permission.BIND_JOB_SERVICE" />

@ -19,8 +19,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:3334/';
// var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_URL = 'https://hmgwebservices.com/';
var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
// var BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@ -272,6 +272,9 @@ var GET_OBGYNE_DOCTORS_LIST =
var OBGYNE_PROCEDURE_UPDATE =
"services/Patients.svc/REST/HIS_OBGYNEProcedure_Update";
var GET_RRT_PROCEDURE_LIST =
"Services/Patients.svc/REST/GetRRTProcedureDetailsListFromVida";
var DOCTOR_SCHEDULE_URL =
'Services/Doctors.svc/REST/GetDoctorWorkingHoursTable';
@ -392,7 +395,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnar
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 7.6;
var VERSION_ID = 7.7;
var SETUP_ID = '91877';
var LANGUAGE = 2;
var PATIENT_OUT_SA = 0;

@ -9,7 +9,9 @@ import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer
import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart';
import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/models/rrt/RRTProcedureList.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -21,6 +23,8 @@ class _RRTServiceData {
List<GetCMCAllOrdersResponseModel> pendingOrders = [];
List<GetCMCAllOrdersResponseModel> completedOrders = [];
ServicePrice servicePrice;
// RRTProcedureList rrtProcedureList;
}
class RRTViewModel extends BaseViewModel {
@ -28,15 +32,18 @@ class RRTViewModel extends BaseViewModel {
var _pharmacy_service = locator<PharmacyModuleService>();
var _pharmacy_address_service = locator<PharmacyAddressService>();
CustomerAddressesService _customerAddressesService = locator<CustomerAddressesService>();
List<VidaProcedureList> rrtProcedureList = [];
List<AddressInfo> get addressesList => _customerAddressesService.addressesList;
_RRTServiceData rrtServiceData = _RRTServiceData();
Future<_RRTServiceData> loadRequiredData() async {
await getServicePrice();
// await getServicePrice();
// await getAllOrders();
await getProcedureDetails();
await getAllOrdersRC();
// getProcedureDetails();
return rrtServiceData;
}
@ -94,7 +101,7 @@ class RRTViewModel extends BaseViewModel {
}
Future<_RRTServiceData> getAllOrdersRC() async {
await _service.baseAppClient.post(GET_ALL_RRT_ORDERS_RC, isRCService: true, body: {}, onSuccess: (response, statusCode) {
await _service.baseAppClient.post(GET_ALL_RRT_ORDERS_RC, isRCService: true, body: {}, onSuccess: (response, statusCode) {
var data = response["response"];
rrtServiceData.completedOrders.clear();
rrtServiceData.pendingOrders.clear();
@ -113,6 +120,22 @@ class RRTViewModel extends BaseViewModel {
return rrtServiceData;
}
Future<_RRTServiceData> getProcedureDetails() async {
DoctorsListService service = new DoctorsListService();
await service.getRRTProcedures(15).then((res) {
rrtProcedureList.clear();
var data = res["Vida_ProcedureList"];
data.forEach((json) {
rrtProcedureList.add(VidaProcedureList.fromJson(json));
});
print(rrtProcedureList.length);
}).catchError((err) {
AppToast.showErrorToast(message: err);
print(err);
});
return rrtServiceData;
}
Future getOrderDetails() async {
return null;
}

@ -0,0 +1,56 @@
class RRTProcedureList {
List<VidaProcedureList> vidaProcedureList;
RRTProcedureList({this.vidaProcedureList});
RRTProcedureList.fromJson(Map<String, dynamic> json) {
if (json['Vida_ProcedureList'] != null) {
vidaProcedureList = <VidaProcedureList>[];
json['Vida_ProcedureList'].forEach((v) {
vidaProcedureList.add(new VidaProcedureList.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.vidaProcedureList != null) {
data['Vida_ProcedureList'] =
this.vidaProcedureList.map((v) => v.toJson()).toList();
}
return data;
}
}
class VidaProcedureList {
num patientShare;
num patientShareWithTax;
num patientTaxAmount;
String procedureID;
String procedureName;
VidaProcedureList(
{this.patientShare,
this.patientShareWithTax,
this.patientTaxAmount,
this.procedureID,
this.procedureName});
VidaProcedureList.fromJson(Map<String, dynamic> json) {
patientShare = json['PatientShare'];
patientShareWithTax = json['PatientShareWithTax'];
patientTaxAmount = json['PatientTaxAmount'];
procedureID = json['ProcedureID'];
procedureName = json['ProcedureName'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['PatientShare'] = this.patientShare;
data['PatientShareWithTax'] = this.patientShareWithTax;
data['PatientTaxAmount'] = this.patientTaxAmount;
data['ProcedureID'] = this.procedureID;
data['ProcedureName'] = this.procedureName;
return data;
}
}

@ -67,7 +67,7 @@ class RRTMainScreenState extends State<RRTMainScreen> with SingleTickerProviderS
return Center(child: CircularProgressIndicator());
// else if(viewModel.state == ViewState.Error)
} else if (viewModel.rrtServiceData != null && viewModel.rrtServiceData.servicePrice != null) {
} else if (viewModel.rrtServiceData != null && viewModel.rrtProcedureList != null) {
return Column(
children: [tabBar(), Expanded(child: contentPager())],
);
@ -127,7 +127,7 @@ class RRTMainScreenState extends State<RRTMainScreen> with SingleTickerProviderS
onPageChanged: onPageChanged,
controller: pageController,
children: [
RRTRequestPage(servicePrice: viewModel.rrtServiceData.servicePrice, pendingOrders: viewModel.rrtServiceData.pendingOrders),
RRTRequestPage(servicePrice: viewModel.rrtServiceData.servicePrice, pendingOrders: viewModel.rrtServiceData.pendingOrders, viewModel: viewModel),
RRTLogPage(orders: viewModel.rrtServiceData.completedOrders),
],
);

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/rrt/RRTProcedureList.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/reminder_dialog.dart';
@ -28,8 +29,9 @@ import 'rrt-place-order.dart';
class RRTRequestPickupAddressPage extends StatefulWidget {
final ServicePrice servicePrice;
final VidaProcedureList selectedProcedure;
RRTRequestPickupAddressPage({@required this.servicePrice});
RRTRequestPickupAddressPage({@required this.servicePrice, @required this.selectedProcedure});
@override
State<StatefulWidget> createState() => RRTRequestPickupAddressPageState();
@ -145,7 +147,6 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
Container(
margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12),
decoration: cardRadius(12),
child: Container(
child: InkWell(
onTap: () => confirmSelectLocationDialog(myAddresses),
@ -259,6 +260,7 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
page: RRTPlaceOrderPage(
selectedAddress: selectedAddress,
servicePrice: widget.servicePrice,
selectedProcedure: widget.selectedProcedure,
)));
}),
);

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/rrt/RRTProcedureList.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_dialog.dart';
import 'package:diplomaticquarterapp/pages/ErService/rapid-response-team/rrt-main-screen.dart';
@ -23,8 +24,9 @@ class RRTPlaceOrderPage extends StatelessWidget {
RRTViewModel viewModel;
AddressInfo selectedAddress;
final ServicePrice servicePrice;
final VidaProcedureList selectedProcedure;
RRTPlaceOrderPage({@required this.selectedAddress, @required this.servicePrice});
RRTPlaceOrderPage({@required this.selectedAddress, @required this.servicePrice, @required this.selectedProcedure});
TextEditingController noteController = TextEditingController(text: '');
BuildContext _context;
@ -89,7 +91,7 @@ class RRTPlaceOrderPage extends StatelessWidget {
height: 5,
),
Text(
"${servicePrice.totalPrice ?? '- - -'} ${localize.sar}",
"${selectedProcedure.patientShareWithTax ?? '- - -'} ${localize.sar}",
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
),
],
@ -178,7 +180,8 @@ class RRTPlaceOrderPage extends StatelessWidget {
params['longitude'] = latlng.longitude;
params['additionalDetails'] = noteController.text;
params['nationality'] = projectViewModel.user.nationalityID;
params['paymentAmount'] = servicePrice.totalPrice;
params['paymentAmount'] = selectedProcedure.patientShareWithTax;
params['procedureId'] = selectedProcedure.procedureID;
// var response = await viewModel.createOrder(params);
// var requestId = await viewModel.createOrder(params);

@ -1,10 +1,12 @@
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart';
import 'package:diplomaticquarterapp/models/rrt/RRTProcedureList.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-pickup-address-page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/reports/user_agreement_page.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
@ -18,8 +20,9 @@ import 'package:flutter/material.dart';
class RRTRequestPage extends StatefulWidget {
final List<GetCMCAllOrdersResponseModel> pendingOrders;
final ServicePrice servicePrice;
RRTViewModel viewModel;
RRTRequestPage({this.pendingOrders, this.servicePrice});
RRTRequestPage({this.pendingOrders, this.servicePrice, this.viewModel});
@override
State<StatefulWidget> createState() => RRTRequestPageState();
@ -27,13 +30,20 @@ class RRTRequestPage extends StatefulWidget {
class RRTRequestPageState extends State<RRTRequestPage> {
bool acceptTerms = false;
RRTViewModel viewModel;
VidaProcedureList selectedProcedure;
@override
void initState() {
// getProcedureDetails();
super.initState();
}
@override
Widget build(BuildContext context) {
return BaseView<RRTViewModel>(
onModelReady: (vm) {
viewModel = vm;
// viewModel = vm;
selectedProcedure = widget.viewModel.rrtProcedureList[0];
},
builder: (ctx, vm, widgetState) {
if (widget.pendingOrders.isNotEmpty)
@ -53,10 +63,69 @@ class RRTRequestPageState extends State<RRTRequestPage> {
children: [
serviceDescription(context),
SizedBox(height: 20),
Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
...List.generate(
widget.viewModel.rrtProcedureList.length,
(index) => Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 1,
),
Row(
children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
setState(() {
selectedProcedure = widget.viewModel.rrtProcedureList[index];
// getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID);
});
},
child: Row(
children: [
Radio(
value: widget.viewModel.rrtProcedureList[index],
groupValue: selectedProcedure,
activeColor: Colors.red[800],
toggleable: true,
onChanged: (value) {
setState(() {
selectedProcedure = value;
print(selectedProcedure.procedureName);
// getPaymentInfo(context, widget.projectID.toString(), widget.selectedProcedure.procedureID);
});
},
),
Expanded(
child: Text(
// projectViewModel.isArabic ? widget.proceduresList[index].procedureNameN : widget.proceduresList[index].procedureName,
widget.viewModel.rrtProcedureList[index].procedureName,
style: TextStyle(
fontSize: 12.0,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
),
],
),
),
)
],
),
],
),
),
],
),
),
priceTable(context),
acceptPolicy(),
Container(height: 0.5, color: Theme.of(context).appBarTheme.color), // Seperator
Container(
@ -90,15 +159,15 @@ class RRTRequestPageState extends State<RRTRequestPage> {
child: Text(
TranslationBase.of(context).rrtDDetails,
textAlign: TextAlign.justify,
style: TextStyle(color: Theme.of(context).appBarTheme.color, fontSize: 15, height: 1.5, fontWeight: FontWeight.w300),
style: TextStyle(fontSize: 14.0, letterSpacing: -0.64, color: CustomColors.textColor, fontWeight: FontWeight.w300),
),
);
Widget priceTable(BuildContext context) {
var radius = Radius.circular(8);
String amount = widget.servicePrice.price.toString();
String vat = widget.servicePrice.vat.toString();
String total = widget.servicePrice.totalPrice.toString();
String amount = selectedProcedure.patientShare.toString();
String vat = selectedProcedure.patientTaxAmount.toString();
String total = selectedProcedure.patientShareWithTax.toString();
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
@ -119,21 +188,21 @@ class RRTRequestPageState extends State<RRTRequestPage> {
Widget pricingRow({@required String label, @required String value, bool labelBold = false, bool valueBold = false}) {
return Container(
height: 40,
height: 35,
margin: EdgeInsets.symmetric(horizontal: 10),
child: Row(
children: [
Text(label, style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.color, fontWeight: labelBold ? FontWeight.bold : FontWeight.normal)),
Text(label, style: TextStyle(fontSize: 12, color: CustomColors.textColor, fontWeight: labelBold ? FontWeight.bold : FontWeight.normal)),
Spacer(),
Container(
height: 40,
height: 35,
color: Theme.of(context).appBarTheme.color,
width: 0.5,
),
Container(
alignment: Alignment.center,
width: MediaQuery.of(context).size.width * 0.25,
child: Text(value, style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.color, fontWeight: valueBold ? FontWeight.bold : FontWeight.normal))),
child: Text(value, style: TextStyle(fontSize: 12, color: CustomColors.textColor, fontWeight: valueBold ? FontWeight.bold : FontWeight.normal))),
],
),
);
@ -150,7 +219,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
setState(() => acceptTerms = v);
}),
SizedBox(width: 10),
Expanded(child: Text(TranslationBase.of(context).iAcceptTermsConditions, style: TextStyle(fontSize: 13, color: Theme.of(context).appBarTheme.color), maxLines: 2)),
Expanded(child: Text(TranslationBase.of(context).iAcceptTermsConditions, style: TextStyle(fontSize: 12, color: CustomColors.textColor), maxLines: 2)),
Container(
alignment: Alignment.center,
width: MediaQuery.of(context).size.width * 0.25,
@ -187,7 +256,7 @@ class RRTRequestPageState extends State<RRTRequestPage> {
child: DefaultButton(
TranslationBase.of(context).next,
() {
if (acceptTerms)
if (acceptTerms && selectedProcedure != null)
goToPickupAddress();
else
AppToast.showErrorToast(message: TranslationBase.of(context).pleaseAcceptTerms);
@ -200,23 +269,37 @@ class RRTRequestPageState extends State<RRTRequestPage> {
);
}
getProcedureDetails() {
GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService();
service.getRRTProcedures(15).then((res) {
GifLoaderDialogUtils.hideDialog(context);
print(res['Vida_ProcedureList']);
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
AppToast.showErrorToast(message: err);
print(err);
});
}
goToPickupAddress() async {
Navigator.push(
context,
FadePage(
page: RRTRequestPickupAddressPage(
servicePrice: widget.servicePrice,
selectedProcedure: selectedProcedure,
)));
}
deleteOrder(GetCMCAllOrdersResponseModel order) async {
GifLoaderDialogUtils.showMyDialog(context);
var success = await viewModel.cancelOrderRC(order);
var success = await widget.viewModel.cancelOrderRC(order);
GifLoaderDialogUtils.hideDialog(context);
if (success)
setState(() {
widget.pendingOrders.remove(order);
});
await viewModel.getAllOrdersRC();
await widget.viewModel.getAllOrdersRC();
}
}

@ -1545,4 +1545,18 @@ class DoctorsListService extends BaseService {
return Future.value(localRes);
}
Future<Map> getRRTProcedures(int projectID) async {
Map<String, dynamic> request;
request = {"ProjectID": projectID};
dynamic localRes;
await baseAppClient.post(GET_RRT_PROCEDURE_LIST, onSuccess: (response, statusCode) async {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
}, body: request);
return Future.value(localRes);
}
}

@ -331,19 +331,19 @@ class _AppDrawerState extends State<AppDrawer> {
}
},
),
InkWell(
child: DrawerItem(TranslationBase.of(context).pharmacyLiveCare, SvgPicture.asset("assets/images/new/Live_Care.svg"),
isImageIcon: true,
bottomLine: false,
textColor: Theme.of(context).textTheme.bodyText1.color,
iconColor: Theme.of(context).textTheme.bodyText1.color,
sideArrow: true,
letterSpacing: -0.84,
projectProvider: projectProvider),
onTap: () {
readQRCode();
},
),
// InkWell(
// child: DrawerItem(TranslationBase.of(context).pharmacyLiveCare, SvgPicture.asset("assets/images/new/Live_Care.svg"),
// isImageIcon: true,
// bottomLine: false,
// textColor: Theme.of(context).textTheme.bodyText1.color,
// iconColor: Theme.of(context).textTheme.bodyText1.color,
// sideArrow: true,
// letterSpacing: -0.84,
// projectProvider: projectProvider),
// onTap: () {
// readQRCode();
// },
// ),
InkWell(
child: Stack(
children: [

@ -2,7 +2,7 @@ name: diplomaticquarterapp
description: A new Flutter application.
version: 4.4.0+1
version: 4.4.3+1
environment:
sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save