Updates & fixes, Update to stores VersionID 20.3

master
haroon amjad 19 hours ago
parent 3bc0d1eec2
commit a99b3e393a

@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/'; // var BASE_URL = 'http://10.50.100.198:2018/';
var BASE_URL = 'https://uat.hmgwebservices.com/'; // var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/'; var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'http://10.201.204.103/'; // var BASE_URL = 'http://10.201.204.103/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
@ -358,7 +358,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
var CHANNEL = 3; var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958'; var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20'; var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 20.1; var VERSION_ID = 20.3;
var SETUP_ID = '91877'; var SETUP_ID = '91877';
var LANGUAGE = 2; var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0; // var PATIENT_OUT_SA = 0;

@ -189,7 +189,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217; // body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232 // body['MobileNo'] = "531940021"; //0560717232
// body['PatientID'] = 4773715; //4609100 // body['PatientID'] = 4774402; //4609100
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// Patient ID: 3027574 // Patient ID: 3027574

@ -125,32 +125,50 @@ class PrescriptionsService extends BaseService {
isDentalAllowedBackend: false, isDentalAllowedBackend: false,
); );
Future sendPrescriptionEmail(String appointmentDate, int patientID, String clinicName, String doctorName, int doctorID, int projectID, bool isInOutPatient, bool isDownload) async { // Future sendPrescriptionEmail(String appointmentNo, String setupID, String appointmentDate, int episodeId, int patientID, String clinicName, String doctorName, int doctorID, int projectID, bool isInOutPatient, bool isDownload) async {
_requestSendPrescriptionEmail.listPrescriptions = prescriptionReportList; Future sendPrescriptionEmail(Prescriptions prescriptions, bool isDownload) async {
_requestSendPrescriptionEmail.listPrescriptionsINP = prescriptionReportListINP; // _requestSendPrescriptionEmail.listPrescriptions = prescriptionReportList;
_requestSendPrescriptionEmail.appointmentDate = appointmentDate; // _requestSendPrescriptionEmail.listPrescriptionsINP = prescriptionReportListINP;
_requestSendPrescriptionEmail.patientID = patientID; // _requestSendPrescriptionEmail.appointmentDate = appointmentDate;
_requestSendPrescriptionEmail.clinicName = clinicName; // _requestSendPrescriptionEmail.patientID = patientID;
_requestSendPrescriptionEmail.doctorName = doctorName; // _requestSendPrescriptionEmail.clinicName = clinicName;
_requestSendPrescriptionEmail.projectID = projectID; // _requestSendPrescriptionEmail.doctorName = doctorName;
_requestSendPrescriptionEmail.to = user.emailAddress; // _requestSendPrescriptionEmail.projectID = projectID;
_requestSendPrescriptionEmail.dateofBirth = user.dateofBirth; // _requestSendPrescriptionEmail.to = user.emailAddress;
_requestSendPrescriptionEmail.patientIditificationNum = user.patientIdentificationNo; // _requestSendPrescriptionEmail.dateofBirth = user.dateofBirth;
_requestSendPrescriptionEmail.patientMobileNumber = user.mobileNumber; // _requestSendPrescriptionEmail.patientIditificationNum = user.patientIdentificationNo;
_requestSendPrescriptionEmail.doctorID = doctorID; // _requestSendPrescriptionEmail.patientMobileNumber = user.mobileNumber;
_requestSendPrescriptionEmail.patientName = user.firstName! + " " + user.lastName!; // _requestSendPrescriptionEmail.doctorID = doctorID;
_requestSendPrescriptionEmail.setupID = user.setupID; // _requestSendPrescriptionEmail.patientName = user.firstName! + " " + user.lastName!;
_requestSendPrescriptionEmail.to = user.emailAddress; // _requestSendPrescriptionEmail.setupID = user.setupID;
_requestSendPrescriptionEmail.isDownload = isDownload; // _requestSendPrescriptionEmail.to = user.emailAddress;
// _requestSendPrescriptionEmail.isDownload = isDownload;
Map<String, dynamic> mapDevice = {
"AppointmentNo": prescriptions.appointmentNo,
"SetupID": prescriptions.setupID,
"EpisodeNo": prescriptions.episodeID,
"ClinicID": prescriptions.clinicID,
"ProjectID": prescriptions.projectID,
"DischargeNo": prescriptions.dischargeNo,
"IsDownload": true,
"To": user.emailAddress,
// "To": "amjad.haroon@cloudsolutions.com.sa",
"ClinicName": prescriptions.clinicDescription,
"DoctorName": prescriptions.doctorName,
};
hasError = false; hasError = false;
await baseAppClient.post(SEND_PRESCRIPTION_EMAIL, onSuccess: (response, statusCode) { // await baseAppClient.post(SEND_PRESCRIPTION_EMAIL, onSuccess: (response, statusCode) {
await baseAppClient.post(SEND_PRESCRIPTION_EMAIL_NEW, onSuccess: (response, statusCode) {
if (isDownload) { if (isDownload) {
prescriptionReportPDF = response["Base64Data"]; prescriptionReportPDF = response["Base64Data"];
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: _requestSendPrescriptionEmail.toJson()); // }, body: _requestSendPrescriptionEmail.toJson());
}, body: mapDevice);
} }
RequestGetListPharmacyForPrescriptions requestGetListPharmacyForPrescriptions = RequestGetListPharmacyForPrescriptions( RequestGetListPharmacyForPrescriptions requestGetListPharmacyForPrescriptions = RequestGetListPharmacyForPrescriptions(

@ -122,17 +122,19 @@ class PrescriptionsViewModel extends BaseViewModel {
} }
sendPrescriptionEmail( sendPrescriptionEmail(
{required String appointmentDate, // {required String appointmentDate,
required int patientID, // required int patientID,
required String clinicName, // required String clinicName,
required String doctorName, // required String doctorName,
required int doctorID, // required int doctorID,
required String mes, // required String mes,
required int projectID, // required int projectID,
required bool isInOutPatient, // required bool isInOutPatient,
required bool isDownload}) async { // required bool isDownload}) async
{required Prescriptions prescriptions, required bool isDownload}) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
await _prescriptionsService.sendPrescriptionEmail(appointmentDate, patientID, clinicName, doctorName, doctorID, projectID, isInOutPatient, isDownload); // await _prescriptionsService.sendPrescriptionEmail(appointmentDate, patientID, clinicName, doctorName, doctorID, projectID, isInOutPatient, isDownload);
await _prescriptionsService.sendPrescriptionEmail(prescriptions, isDownload);
if (_prescriptionsService.hasError) { if (_prescriptionsService.hasError) {
error = _prescriptionsService.error!; error = _prescriptionsService.error!;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
@ -148,7 +150,7 @@ class PrescriptionsViewModel extends BaseViewModel {
} }
} }
} else { } else {
AppToast.showSuccessToast(message: mes); AppToast.showSuccessToast(message: "");
} }
// AppToast.showSuccessToast(message: mes); // AppToast.showSuccessToast(message: mes);
setState(ViewState.Idle); setState(ViewState.Idle);

@ -94,14 +94,15 @@ class PrescriptionItemsPage extends StatelessWidget {
// showConfirmMessage(context, model); // showConfirmMessage(context, model);
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await model.sendPrescriptionEmail( await model.sendPrescriptionEmail(
appointmentDate: prescriptions.appointmentDate!, prescriptions: prescriptions,
patientID: prescriptions.patientID!, // appointmentDate: prescriptions.appointmentDate!,
clinicName: prescriptions.companyName!, // patientID: prescriptions.patientID!,
doctorName: prescriptions.doctorName!, // clinicName: prescriptions.companyName!,
doctorID: prescriptions.doctorID!, // doctorName: prescriptions.doctorName!,
mes: TranslationBase.of(context).sendSuc, // doctorID: prescriptions.doctorID!,
projectID: prescriptions.projectID!, // mes: TranslationBase.of(context).sendSuc,
isInOutPatient: prescriptions.isInOutPatient!, // projectID: prescriptions.projectID!,
// isInOutPatient: prescriptions.isInOutPatient!,
isDownload: true); isDownload: true);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
}, },
@ -491,14 +492,15 @@ class PrescriptionItemsPage extends StatelessWidget {
email: projectViewModel.user!.emailAddress!, email: projectViewModel.user!.emailAddress!,
onTapSendEmail: () { onTapSendEmail: () {
model.sendPrescriptionEmail( model.sendPrescriptionEmail(
appointmentDate: prescriptions.appointmentDate!, prescriptions: prescriptions,
patientID: prescriptions.patientID!, // appointmentDate: prescriptions.appointmentDate!,
clinicName: prescriptions.companyName!, // patientID: prescriptions.patientID!,
doctorName: prescriptions.doctorName!, // clinicName: prescriptions.companyName!,
doctorID: prescriptions.doctorID!, // doctorName: prescriptions.doctorName!,
mes: TranslationBase.of(context).sendSuc, // doctorID: prescriptions.doctorID!,
projectID: prescriptions.projectID!, // mes: TranslationBase.of(context).sendSuc,
isInOutPatient: prescriptions.isInOutPatient!, // projectID: prescriptions.projectID!,
// isInOutPatient: prescriptions.isInOutPatient!,
isDownload: true); isDownload: true);
}, },
), ),

Loading…
Cancel
Save