Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab special result fix

Browse Source
dev_v3.13.6_BLE_Faiz
haroon amjad 1 year ago
parent 02878b7df9
commit 2b560840aa
4 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File

5
lib/pages/medical/balance/advance_payment_page.dart
Unescape Escape View File

@ -158,9 +158,9 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
if (beneficiaryType == BeneficiaryType.MyFamilyFiles) if (beneficiaryType == BeneficiaryType.MyFamilyFiles)
InkWell( InkWell(
onTap: () { onTap: () {
GifLoaderDialogUtils.showMyDialog(context); // GifLoaderDialogUtils.showMyDialog(context);
model.getFamilyFiles().then((value) { model.getFamilyFiles().then((value) {
GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
confirmSelectFamilyDialog(model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList!); confirmSelectFamilyDialog(model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList!);
}); });
}, },
@ -412,6 +412,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
for (int i = 0; i < getAllSharedRecordsByStatusList.length; i++) for (int i = 0; i < getAllSharedRecordsByStatusList.length; i++)
if (getAllSharedRecordsByStatusList[i].status == 3) RadioSelectionDialogModel(getAllSharedRecordsByStatusList[i].patientName!, i), if (getAllSharedRecordsByStatusList[i].status == 3) RadioSelectionDialogModel(getAllSharedRecordsByStatusList[i].patientName!, i),
]; ];
// GifLoaderDialogUtils.hideDialog(context);
showDialog( showDialog(
context: context, context: context,
builder: (cxt) => RadioSelectionDialog( builder: (cxt) => RadioSelectionDialog(

40
lib/pages/paymentService/payment_service.dart
Unescape Escape View File

@ -154,26 +154,26 @@ class PaymentService extends StatelessWidget {
), ),
); );
medical.add( // medical.add(
InkWell( // InkWell(
onTap: () { // onTap: () {
if(projectViewModel.isPatientAdmitted) { // if(projectViewModel.isPatientAdmitted) {
getInPatientAdvancePaymentRequests(context); // getInPatientAdvancePaymentRequests(context);
projectViewModel.analytics.advancePayments.payment_services(service_type: 'inpatient advance payment'); // projectViewModel.analytics.advancePayments.payment_services(service_type: 'inpatient advance payment');
} else { // } else {
AppToast.showErrorToast(message: TranslationBase.of(context).onlyAdmitted); // AppToast.showErrorToast(message: TranslationBase.of(context).onlyAdmitted);
} // }
}, // },
child: MedicalProfileItem( // child: MedicalProfileItem(
title: "InPatient", // title: "InPatient",
imagePath: 'assets/images/inpatient_advance.png', // imagePath: 'assets/images/inpatient_advance.png',
subTitle: "Advance Payment", // subTitle: "Advance Payment",
isPngImage: true, // isPngImage: true,
width: 45.0, // width: 45.0,
height: 45.0, // height: 45.0,
), // ),
), // ),
); // );
return medical; return medical;
} }

10
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
Unescape Escape View File

@ -31,6 +31,13 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
bool _isShowMore = true; bool _isShowMore = true;
bool _isShowMoreGeneral = true; bool _isShowMoreGeneral = true;
late ProjectViewModel projectViewModel; late ProjectViewModel projectViewModel;
late String labSpecialResult;
@override
void initState() {
super.initState();
labSpecialResult = widget.details ?? TranslationBase.of(context).noDataAvailable;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -174,7 +181,8 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
width: double.infinity, width: double.infinity,
// height: 450.0, // height: 450.0,
child: Html( child: Html(
data: widget.details ?? TranslationBase.of(context).noDataAvailable, // data: widget.details ?? TranslationBase.of(context).noDataAvailable,
data: labSpecialResult,
), ),
), ),
], ],

8
lib/widgets/in_app_browser/InAppBrowser.dart
Unescape Escape View File

@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser {
static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE
// static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT
static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
// static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
// static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS
@ -230,7 +230,7 @@ class MyInAppBrowser extends InAppBrowser {
service.tamaraInsertRequest(tamaraRequestModel, context).then((res) { service.tamaraInsertRequest(tamaraRequestModel, context).then((res) {
if (context != null) GifLoaderDialogUtils.hideDialog(context); if (context != null) GifLoaderDialogUtils.hideDialog(context);
generateTamaraURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate, generateTamaraURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate,
appoNo, clinicID, doctorID, "", installments) appoNo, clinicID, doctorID, "", installments)
.then((value) { .then((value) {
paymentType = _PAYMENT_TYPE.PATIENT; paymentType = _PAYMENT_TYPE.PATIENT;
this.browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(value)), options: _InAppBrowserOptions); this.browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(value)), options: _InAppBrowserOptions);
@ -242,7 +242,7 @@ class MyInAppBrowser extends InAppBrowser {
}); });
} else { } else {
generateURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate, appoNo, generateURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate, appoNo,
clinicID, doctorID) clinicID, doctorID)
.then((value) { .then((value) {
paymentType = _PAYMENT_TYPE.PATIENT; paymentType = _PAYMENT_TYPE.PATIENT;
this.browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(value)), options: _InAppBrowserOptions); this.browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(value)), options: _InAppBrowserOptions);

Write Preview
Loading…
Cancel
Save