Merge branch 'development' into development_new_design_2.0
# Conflicts: # lib/config/localized_values.dart # lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart # lib/uitl/translations_delegate_base.dartmerge-requests/390/head
commit
a61fea551c
@ -0,0 +1,319 @@
|
||||
class AmbulanceRequestOrdersModel {
|
||||
String statusText;
|
||||
int paymentStatus;
|
||||
dynamic clientRequestid;
|
||||
dynamic paymentStatusText;
|
||||
dynamic projectName;
|
||||
String nearestProjectName;
|
||||
double paymentAmount;
|
||||
WFOrder wFOrder;
|
||||
String serviceText;
|
||||
bool isSentForApproval;
|
||||
int exaCartOrderId;
|
||||
bool isTimer;
|
||||
int timeSeconds;
|
||||
int totalPendingSeconds;
|
||||
int timeMinute;
|
||||
int timeHour;
|
||||
int timeTotalSeconds;
|
||||
int timeTotalMinute;
|
||||
int timeTotalHour;
|
||||
dynamic approvalStatus;
|
||||
bool isActive;
|
||||
int clickButton;
|
||||
dynamic orderHistory;
|
||||
String pickupLocation;
|
||||
String dropOffLocation;
|
||||
String clinicName;
|
||||
String doctorName;
|
||||
String branch;
|
||||
String time;
|
||||
dynamic notes;
|
||||
int id;
|
||||
String patientId;
|
||||
int patientOutSa;
|
||||
bool isOutPatient;
|
||||
int projectId;
|
||||
int nearestProjectId;
|
||||
dynamic longitude;
|
||||
dynamic latitude;
|
||||
dynamic appointmentNo;
|
||||
dynamic dischargeId;
|
||||
int statusId;
|
||||
int serviceId;
|
||||
int channel;
|
||||
Orderpayment orderpayment;
|
||||
dynamic orderselectedservice;
|
||||
dynamic wforder;
|
||||
dynamic orderapprovalobj;
|
||||
String created;
|
||||
dynamic createdBy;
|
||||
dynamic modified;
|
||||
dynamic modifiedBy;
|
||||
bool isDeleted;
|
||||
|
||||
AmbulanceRequestOrdersModel(
|
||||
{this.statusText,
|
||||
this.paymentStatus,
|
||||
this.clientRequestid,
|
||||
this.paymentStatusText,
|
||||
this.projectName,
|
||||
this.nearestProjectName,
|
||||
this.paymentAmount,
|
||||
this.wFOrder,
|
||||
this.serviceText,
|
||||
this.isSentForApproval,
|
||||
this.exaCartOrderId,
|
||||
this.isTimer,
|
||||
this.timeSeconds,
|
||||
this.totalPendingSeconds,
|
||||
this.timeMinute,
|
||||
this.timeHour,
|
||||
this.timeTotalSeconds,
|
||||
this.timeTotalMinute,
|
||||
this.timeTotalHour,
|
||||
this.approvalStatus,
|
||||
this.isActive,
|
||||
this.clickButton,
|
||||
this.orderHistory,
|
||||
this.pickupLocation,
|
||||
this.dropOffLocation,
|
||||
this.clinicName,
|
||||
this.doctorName,
|
||||
this.branch,
|
||||
this.time,
|
||||
this.notes,
|
||||
this.id,
|
||||
this.patientId,
|
||||
this.patientOutSa,
|
||||
this.isOutPatient,
|
||||
this.projectId,
|
||||
this.nearestProjectId,
|
||||
this.longitude,
|
||||
this.latitude,
|
||||
this.appointmentNo,
|
||||
this.dischargeId,
|
||||
this.statusId,
|
||||
this.serviceId,
|
||||
this.channel,
|
||||
this.orderpayment,
|
||||
this.orderselectedservice,
|
||||
this.wforder,
|
||||
this.orderapprovalobj,
|
||||
this.created,
|
||||
this.createdBy,
|
||||
this.modified,
|
||||
this.modifiedBy,
|
||||
this.isDeleted});
|
||||
|
||||
AmbulanceRequestOrdersModel.fromJson(Map<String, dynamic> json) {
|
||||
statusText = json['statusText'];
|
||||
paymentStatus = json['paymentStatus'];
|
||||
clientRequestid = json['clientRequestid'];
|
||||
paymentStatusText = json['paymentStatusText'];
|
||||
projectName = json['projectName'];
|
||||
nearestProjectName = json['nearestProjectName'];
|
||||
paymentAmount = json['paymentAmount'];
|
||||
wFOrder = json['wF_order'] != null ? new WFOrder.fromJson(json['wF_order']) : null;
|
||||
serviceText = json['serviceText'];
|
||||
isSentForApproval = json['isSentForApproval'];
|
||||
exaCartOrderId = json['exaCart_OrderId'];
|
||||
isTimer = json['isTimer'];
|
||||
timeSeconds = json['timeSeconds'];
|
||||
totalPendingSeconds = json['totalPendingSeconds'];
|
||||
timeMinute = json['timeMinute'];
|
||||
timeHour = json['timeHour'];
|
||||
timeTotalSeconds = json['timeTotalSeconds'];
|
||||
timeTotalMinute = json['timeTotalMinute'];
|
||||
timeTotalHour = json['timeTotalHour'];
|
||||
approvalStatus = json['approvalStatus'];
|
||||
isActive = json['isActive'];
|
||||
clickButton = json['clickButton'];
|
||||
orderHistory = json['orderHistory'];
|
||||
pickupLocation = json['pickupLocation'];
|
||||
dropOffLocation = json['dropOffLocation'];
|
||||
clinicName = json['clinicName'];
|
||||
doctorName = json['doctorName'];
|
||||
branch = json['branch'];
|
||||
time = json['time'];
|
||||
notes = json['notes'];
|
||||
id = json['id'];
|
||||
patientId = json['patientId'];
|
||||
patientOutSa = json['patientOutSa'];
|
||||
isOutPatient = json['isOutPatient'];
|
||||
projectId = json['projectId'];
|
||||
nearestProjectId = json['nearestProjectId'];
|
||||
longitude = json['longitude'];
|
||||
latitude = json['latitude'];
|
||||
appointmentNo = json['appointmentNo'];
|
||||
dischargeId = json['dischargeId'];
|
||||
statusId = json['statusId'];
|
||||
serviceId = json['serviceId'];
|
||||
channel = json['channel'];
|
||||
orderpayment = json['orderpayment'] != null ? new Orderpayment.fromJson(json['orderpayment']) : null;
|
||||
orderselectedservice = json['orderselectedservice'];
|
||||
wforder = json['wforder'];
|
||||
orderapprovalobj = json['orderapprovalobj'];
|
||||
created = json['created'];
|
||||
createdBy = json['createdBy'];
|
||||
modified = json['modified'];
|
||||
modifiedBy = json['modifiedBy'];
|
||||
isDeleted = json['isDeleted'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['statusText'] = this.statusText;
|
||||
data['paymentStatus'] = this.paymentStatus;
|
||||
data['clientRequestid'] = this.clientRequestid;
|
||||
data['paymentStatusText'] = this.paymentStatusText;
|
||||
data['projectName'] = this.projectName;
|
||||
data['nearestProjectName'] = this.nearestProjectName;
|
||||
data['paymentAmount'] = this.paymentAmount;
|
||||
if (this.wFOrder != null) {
|
||||
data['wF_order'] = this.wFOrder.toJson();
|
||||
}
|
||||
data['serviceText'] = this.serviceText;
|
||||
data['isSentForApproval'] = this.isSentForApproval;
|
||||
data['exaCart_OrderId'] = this.exaCartOrderId;
|
||||
data['isTimer'] = this.isTimer;
|
||||
data['timeSeconds'] = this.timeSeconds;
|
||||
data['totalPendingSeconds'] = this.totalPendingSeconds;
|
||||
data['timeMinute'] = this.timeMinute;
|
||||
data['timeHour'] = this.timeHour;
|
||||
data['timeTotalSeconds'] = this.timeTotalSeconds;
|
||||
data['timeTotalMinute'] = this.timeTotalMinute;
|
||||
data['timeTotalHour'] = this.timeTotalHour;
|
||||
data['approvalStatus'] = this.approvalStatus;
|
||||
data['isActive'] = this.isActive;
|
||||
data['clickButton'] = this.clickButton;
|
||||
data['orderHistory'] = this.orderHistory;
|
||||
data['pickupLocation'] = this.pickupLocation;
|
||||
data['dropOffLocation'] = this.dropOffLocation;
|
||||
data['clinicName'] = this.clinicName;
|
||||
data['doctorName'] = this.doctorName;
|
||||
data['branch'] = this.branch;
|
||||
data['time'] = this.time;
|
||||
data['notes'] = this.notes;
|
||||
data['id'] = this.id;
|
||||
data['patientId'] = this.patientId;
|
||||
data['patientOutSa'] = this.patientOutSa;
|
||||
data['isOutPatient'] = this.isOutPatient;
|
||||
data['projectId'] = this.projectId;
|
||||
data['nearestProjectId'] = this.nearestProjectId;
|
||||
data['longitude'] = this.longitude;
|
||||
data['latitude'] = this.latitude;
|
||||
data['appointmentNo'] = this.appointmentNo;
|
||||
data['dischargeId'] = this.dischargeId;
|
||||
data['statusId'] = this.statusId;
|
||||
data['serviceId'] = this.serviceId;
|
||||
data['channel'] = this.channel;
|
||||
if (this.orderpayment != null) {
|
||||
data['orderpayment'] = this.orderpayment.toJson();
|
||||
}
|
||||
data['orderselectedservice'] = this.orderselectedservice;
|
||||
data['wforder'] = this.wforder;
|
||||
data['orderapprovalobj'] = this.orderapprovalobj;
|
||||
data['created'] = this.created;
|
||||
data['createdBy'] = this.createdBy;
|
||||
data['modified'] = this.modified;
|
||||
data['modifiedBy'] = this.modifiedBy;
|
||||
data['isDeleted'] = this.isDeleted;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class WFOrder {
|
||||
dynamic wfButtonsDTO;
|
||||
int id;
|
||||
int orderId;
|
||||
int previousStep;
|
||||
int nextStep;
|
||||
int serviceId;
|
||||
dynamic order;
|
||||
String created;
|
||||
dynamic createdBy;
|
||||
dynamic modified;
|
||||
dynamic modifiedBy;
|
||||
bool isDeleted;
|
||||
|
||||
WFOrder({this.wfButtonsDTO, this.id, this.orderId, this.previousStep, this.nextStep, this.serviceId, this.order, this.created, this.createdBy, this.modified, this.modifiedBy, this.isDeleted});
|
||||
|
||||
WFOrder.fromJson(Map<String, dynamic> json) {
|
||||
wfButtonsDTO = json['wf_ButtonsDTO'];
|
||||
id = json['id'];
|
||||
orderId = json['orderId'];
|
||||
previousStep = json['previousStep'];
|
||||
nextStep = json['nextStep'];
|
||||
serviceId = json['serviceId'];
|
||||
order = json['order'];
|
||||
created = json['created'];
|
||||
createdBy = json['createdBy'];
|
||||
modified = json['modified'];
|
||||
modifiedBy = json['modifiedBy'];
|
||||
isDeleted = json['isDeleted'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['wf_ButtonsDTO'] = this.wfButtonsDTO;
|
||||
data['id'] = this.id;
|
||||
data['orderId'] = this.orderId;
|
||||
data['previousStep'] = this.previousStep;
|
||||
data['nextStep'] = this.nextStep;
|
||||
data['serviceId'] = this.serviceId;
|
||||
data['order'] = this.order;
|
||||
data['created'] = this.created;
|
||||
data['createdBy'] = this.createdBy;
|
||||
data['modified'] = this.modified;
|
||||
data['modifiedBy'] = this.modifiedBy;
|
||||
data['isDeleted'] = this.isDeleted;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class Orderpayment {
|
||||
int id;
|
||||
int orderId;
|
||||
dynamic clientRequestId;
|
||||
double totalAmount;
|
||||
int paymentStatus;
|
||||
dynamic order;
|
||||
String created;
|
||||
dynamic createdBy;
|
||||
dynamic modified;
|
||||
dynamic modifiedBy;
|
||||
bool isDeleted;
|
||||
|
||||
Orderpayment({this.id, this.orderId, this.clientRequestId, this.totalAmount, this.paymentStatus, this.order, this.created, this.createdBy, this.modified, this.modifiedBy, this.isDeleted});
|
||||
|
||||
Orderpayment.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
orderId = json['orderId'];
|
||||
clientRequestId = json['clientRequestId'];
|
||||
totalAmount = json['totalAmount'];
|
||||
paymentStatus = json['paymentStatus'];
|
||||
order = json['order'];
|
||||
created = json['created'];
|
||||
createdBy = json['createdBy'];
|
||||
modified = json['modified'];
|
||||
modifiedBy = json['modifiedBy'];
|
||||
isDeleted = json['isDeleted'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['id'] = this.id;
|
||||
data['orderId'] = this.orderId;
|
||||
data['clientRequestId'] = this.clientRequestId;
|
||||
data['totalAmount'] = this.totalAmount;
|
||||
data['paymentStatus'] = this.paymentStatus;
|
||||
data['order'] = this.order;
|
||||
data['created'] = this.created;
|
||||
data['createdBy'] = this.createdBy;
|
||||
data['modified'] = this.modified;
|
||||
data['modifiedBy'] = this.modifiedBy;
|
||||
data['isDeleted'] = this.isDeleted;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,200 @@
|
||||
import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart';
|
||||
|
||||
class PatientER_RC {
|
||||
double versionID;
|
||||
int channel;
|
||||
int languageID;
|
||||
String iPAdress;
|
||||
String generalid;
|
||||
bool patientOutSA;
|
||||
String sessionID;
|
||||
bool isDentalAllowedBackend;
|
||||
int deviceTypeID;
|
||||
String patientID;
|
||||
String tokenID;
|
||||
int patientTypeID;
|
||||
int patientType;
|
||||
int orderServiceID;
|
||||
String patientIdentificationID;
|
||||
dynamic patientOutSa;
|
||||
int projectID;
|
||||
int lineItemNo;
|
||||
TransportationDetails transportationDetails;
|
||||
PatientERTransportationMethod patientERTransportationMethod;
|
||||
|
||||
PatientER_RC(
|
||||
{this.versionID,
|
||||
this.channel,
|
||||
this.languageID,
|
||||
this.iPAdress,
|
||||
this.generalid,
|
||||
this.patientOutSA,
|
||||
this.sessionID,
|
||||
this.isDentalAllowedBackend,
|
||||
this.deviceTypeID,
|
||||
this.patientID,
|
||||
this.tokenID,
|
||||
this.patientTypeID,
|
||||
this.patientType,
|
||||
this.orderServiceID,
|
||||
this.patientIdentificationID,
|
||||
this.patientOutSa,
|
||||
this.projectID,
|
||||
this.lineItemNo,
|
||||
this.transportationDetails});
|
||||
|
||||
PatientER_RC.fromJson(Map<String, dynamic> json) {
|
||||
versionID = json['VersionID'];
|
||||
channel = json['Channel'];
|
||||
languageID = json['LanguageID'];
|
||||
iPAdress = json['IPAdress'];
|
||||
generalid = json['generalid'];
|
||||
patientOutSA = json['PatientOutSA'];
|
||||
sessionID = json['SessionID'];
|
||||
isDentalAllowedBackend = json['isDentalAllowedBackend'];
|
||||
deviceTypeID = json['DeviceTypeID'];
|
||||
patientID = json['PatientID'];
|
||||
tokenID = json['TokenID'];
|
||||
patientTypeID = json['PatientTypeID'];
|
||||
patientType = json['PatientType'];
|
||||
orderServiceID = json['OrderServiceID'];
|
||||
patientIdentificationID = json['PatientIdentificationID'];
|
||||
patientOutSa = json['patientOutSa'];
|
||||
projectID = json['projectID'];
|
||||
lineItemNo = json['lineItemNo'];
|
||||
transportationDetails = json['transportationDetails'] != null
|
||||
? new TransportationDetails.fromJson(json['transportationDetails'])
|
||||
: null;
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['VersionID'] = this.versionID;
|
||||
data['Channel'] = this.channel;
|
||||
data['LanguageID'] = this.languageID;
|
||||
data['IPAdress'] = this.iPAdress;
|
||||
data['generalid'] = this.generalid;
|
||||
data['PatientOutSA'] = this.patientOutSA;
|
||||
data['SessionID'] = this.sessionID;
|
||||
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
|
||||
data['DeviceTypeID'] = this.deviceTypeID;
|
||||
data['PatientID'] = this.patientID;
|
||||
data['TokenID'] = this.tokenID;
|
||||
data['PatientTypeID'] = this.patientTypeID;
|
||||
data['PatientType'] = this.patientType;
|
||||
data['OrderServiceID'] = this.orderServiceID;
|
||||
data['PatientIdentificationID'] = this.patientIdentificationID;
|
||||
data['patientOutSa'] = this.patientOutSa;
|
||||
data['projectID'] = this.projectID;
|
||||
data['lineItemNo'] = this.lineItemNo;
|
||||
if (this.transportationDetails != null) {
|
||||
data['transportationDetails'] = this.transportationDetails.toJson();
|
||||
}
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class TransportationDetails {
|
||||
int direction;
|
||||
int haveAppointment;
|
||||
int tripType;
|
||||
int pickupUrgency;
|
||||
int pickupSpot;
|
||||
String pickupDateTime;
|
||||
String transportationType;
|
||||
int ambulate;
|
||||
String notes;
|
||||
int requesterFileNo;
|
||||
String requesterMobileNo;
|
||||
bool requesterIsOutSA;
|
||||
String pickupLocationName;
|
||||
String dropoffLocationName;
|
||||
String pickupLatitude;
|
||||
String pickupLongitude;
|
||||
String dropoffLatitude;
|
||||
String dropoffLongitude;
|
||||
String appointmentNo;
|
||||
String appointmentClinicName;
|
||||
String appointmentDoctorName;
|
||||
String appointmentBranch;
|
||||
String appointmentTime;
|
||||
|
||||
TransportationDetails(
|
||||
{this.direction,
|
||||
this.haveAppointment,
|
||||
this.tripType,
|
||||
this.pickupUrgency,
|
||||
this.pickupSpot,
|
||||
this.pickupDateTime,
|
||||
this.transportationType,
|
||||
this.ambulate,
|
||||
this.notes,
|
||||
this.requesterFileNo,
|
||||
this.requesterMobileNo,
|
||||
this.requesterIsOutSA,
|
||||
this.pickupLocationName,
|
||||
this.dropoffLocationName,
|
||||
this.pickupLatitude,
|
||||
this.pickupLongitude,
|
||||
this.dropoffLatitude,
|
||||
this.dropoffLongitude,
|
||||
this.appointmentNo,
|
||||
this.appointmentClinicName,
|
||||
this.appointmentDoctorName,
|
||||
this.appointmentBranch,
|
||||
this.appointmentTime});
|
||||
|
||||
TransportationDetails.fromJson(Map<String, dynamic> json) {
|
||||
direction = json['direction'];
|
||||
haveAppointment = json['haveAppointment'];
|
||||
tripType = json['tripType'];
|
||||
pickupUrgency = json['pickupUrgency'];
|
||||
pickupSpot = json['pickupSpot'];
|
||||
pickupDateTime = json['pickupDateTime'];
|
||||
transportationType = json['transportationType'];
|
||||
ambulate = json['ambulate'];
|
||||
notes = json['notes'];
|
||||
requesterFileNo = json['requesterFileNo'];
|
||||
requesterMobileNo = json['requesterMobileNo'];
|
||||
requesterIsOutSA = json['requesterIsOutSA'];
|
||||
pickupLocationName = json['pickupLocationName'];
|
||||
dropoffLocationName = json['dropoffLocationName'];
|
||||
pickupLatitude = json['pickup_Latitude'];
|
||||
pickupLongitude = json['pickup_Longitude'];
|
||||
dropoffLatitude = json['dropoff_Latitude'];
|
||||
dropoffLongitude = json['dropoff_Longitude'];
|
||||
appointmentNo = json['appointmentNo'];
|
||||
appointmentClinicName = json['appointmentClinicName'];
|
||||
appointmentDoctorName = json['appointmentDoctorName'];
|
||||
appointmentBranch = json['appointmentBranch'];
|
||||
appointmentTime = json['appointmentTime'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['direction'] = this.direction;
|
||||
data['haveAppointment'] = this.haveAppointment;
|
||||
data['tripType'] = this.tripType;
|
||||
data['pickupUrgency'] = this.pickupUrgency;
|
||||
data['pickupSpot'] = this.pickupSpot;
|
||||
data['pickupDateTime'] = this.pickupDateTime;
|
||||
data['transportationType'] = this.transportationType;
|
||||
data['ambulate'] = this.ambulate;
|
||||
data['notes'] = this.notes;
|
||||
data['requesterFileNo'] = this.requesterFileNo;
|
||||
data['requesterMobileNo'] = this.requesterMobileNo;
|
||||
data['requesterIsOutSA'] = this.requesterIsOutSA;
|
||||
data['pickupLocationName'] = this.pickupLocationName;
|
||||
data['dropoffLocationName'] = this.dropoffLocationName;
|
||||
data['pickup_Latitude'] = this.pickupLatitude;
|
||||
data['pickup_Longitude'] = this.pickupLongitude;
|
||||
data['dropoff_Latitude'] = this.dropoffLatitude;
|
||||
data['dropoff_Longitude'] = this.dropoffLongitude;
|
||||
data['appointmentNo'] = this.appointmentNo;
|
||||
data['appointmentClinicName'] = this.appointmentClinicName;
|
||||
data['appointmentDoctorName'] = this.appointmentDoctorName;
|
||||
data['appointmentBranch'] = this.appointmentBranch;
|
||||
data['appointmentTime'] = this.appointmentTime;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue