From 2b560840aaada4b38ef7d5c642077c3d3bd50763 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 30 Jun 2024 17:34:16 +0300 Subject: [PATCH] lab special result fix --- .../medical/balance/advance_payment_page.dart | 5 ++- lib/pages/paymentService/payment_service.dart | 40 +++++++++---------- .../LabResult/laboratory_result_widget.dart | 10 ++++- lib/widgets/in_app_browser/InAppBrowser.dart | 8 ++-- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/lib/pages/medical/balance/advance_payment_page.dart b/lib/pages/medical/balance/advance_payment_page.dart index 48eb7447..19e4551c 100644 --- a/lib/pages/medical/balance/advance_payment_page.dart +++ b/lib/pages/medical/balance/advance_payment_page.dart @@ -158,9 +158,9 @@ class _AdvancePaymentPageState extends State { if (beneficiaryType == BeneficiaryType.MyFamilyFiles) InkWell( onTap: () { - GifLoaderDialogUtils.showMyDialog(context); + // GifLoaderDialogUtils.showMyDialog(context); model.getFamilyFiles().then((value) { - GifLoaderDialogUtils.hideDialog(context); + // GifLoaderDialogUtils.hideDialog(context); confirmSelectFamilyDialog(model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList!); }); }, @@ -412,6 +412,7 @@ class _AdvancePaymentPageState extends State { for (int i = 0; i < getAllSharedRecordsByStatusList.length; i++) if (getAllSharedRecordsByStatusList[i].status == 3) RadioSelectionDialogModel(getAllSharedRecordsByStatusList[i].patientName!, i), ]; + // GifLoaderDialogUtils.hideDialog(context); showDialog( context: context, builder: (cxt) => RadioSelectionDialog( diff --git a/lib/pages/paymentService/payment_service.dart b/lib/pages/paymentService/payment_service.dart index 3b27afed..1878a658 100644 --- a/lib/pages/paymentService/payment_service.dart +++ b/lib/pages/paymentService/payment_service.dart @@ -154,26 +154,26 @@ class PaymentService extends StatelessWidget { ), ); - medical.add( - InkWell( - onTap: () { - if(projectViewModel.isPatientAdmitted) { - getInPatientAdvancePaymentRequests(context); - projectViewModel.analytics.advancePayments.payment_services(service_type: 'inpatient advance payment'); - } else { - AppToast.showErrorToast(message: TranslationBase.of(context).onlyAdmitted); - } - }, - child: MedicalProfileItem( - title: "InPatient", - imagePath: 'assets/images/inpatient_advance.png', - subTitle: "Advance Payment", - isPngImage: true, - width: 45.0, - height: 45.0, - ), - ), - ); + // medical.add( + // InkWell( + // onTap: () { + // if(projectViewModel.isPatientAdmitted) { + // getInPatientAdvancePaymentRequests(context); + // projectViewModel.analytics.advancePayments.payment_services(service_type: 'inpatient advance payment'); + // } else { + // AppToast.showErrorToast(message: TranslationBase.of(context).onlyAdmitted); + // } + // }, + // child: MedicalProfileItem( + // title: "InPatient", + // imagePath: 'assets/images/inpatient_advance.png', + // subTitle: "Advance Payment", + // isPngImage: true, + // width: 45.0, + // height: 45.0, + // ), + // ), + // ); return medical; } diff --git a/lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart b/lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart index 629f523b..148cf935 100644 --- a/lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart +++ b/lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart @@ -31,6 +31,13 @@ class _LaboratoryResultWidgetState extends State { bool _isShowMore = true; bool _isShowMoreGeneral = true; late ProjectViewModel projectViewModel; + late String labSpecialResult; + + @override + void initState() { + super.initState(); + labSpecialResult = widget.details ?? TranslationBase.of(context).noDataAvailable; + } @override Widget build(BuildContext context) { @@ -174,7 +181,8 @@ class _LaboratoryResultWidgetState extends State { width: double.infinity, // height: 450.0, child: Html( - data: widget.details ?? TranslationBase.of(context).noDataAvailable, + // data: widget.details ?? TranslationBase.of(context).noDataAvailable, + data: labSpecialResult, ), ), ], diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 50b2ce20..f353eec2 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -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 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 @@ -230,7 +230,7 @@ class MyInAppBrowser extends InAppBrowser { service.tamaraInsertRequest(tamaraRequestModel, context).then((res) { if (context != null) GifLoaderDialogUtils.hideDialog(context); 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) { paymentType = _PAYMENT_TYPE.PATIENT; this.browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(value)), options: _InAppBrowserOptions); @@ -242,7 +242,7 @@ class MyInAppBrowser extends InAppBrowser { }); } else { generateURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate, appoNo, - clinicID, doctorID) + clinicID, doctorID) .then((value) { paymentType = _PAYMENT_TYPE.PATIENT; this.browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(value)), options: _InAppBrowserOptions);