From a0528da4cd728cf69ffc5c78cdb1f369951be2d4 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 12 May 2025 16:54:10 +0300 Subject: [PATCH] fix for medical report & user agreement page --- lib/pages/login/confirm-login.dart | 10 +++++----- .../medical/reports/report_list_widget.dart | 20 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 9b76efbd..7766a443 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -646,7 +646,7 @@ class _ConfirmLogin extends State { } else { authService .checkActivationCode(request, value) - .then((result) => { + .then((result) async => { res = result, if (result is Map) { @@ -674,11 +674,11 @@ class _ConfirmLogin extends State { //Remove o+ from here Added by Aamir authenticatedUserObject.user = result.list, projectViewModel.setPrivilege(privilegeList: res), - sharedPref.setObject(MAIN_USER, result.list), - sharedPref.setObject(USER_PROFILE, result.list), + await sharedPref.setObject(MAIN_USER, result.list), + await sharedPref.setObject(USER_PROFILE, result.list), loginTokenID = result.logInTokenID, - sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), - sharedPref.setString(TOKEN, result.authenticationTokenID), + await sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), + await sharedPref.setString(TOKEN, result.authenticationTokenID), checkIfUserAgreedBefore(result), projectViewModel.analytics.loginRegistration.login_successful(), } diff --git a/lib/pages/medical/reports/report_list_widget.dart b/lib/pages/medical/reports/report_list_widget.dart index 425e39ae..5846b31f 100644 --- a/lib/pages/medical/reports/report_list_widget.dart +++ b/lib/pages/medical/reports/report_list_widget.dart @@ -220,15 +220,19 @@ class ReportListWidget extends StatelessWidget { report.setupId!) .then((value) async { GifLoaderDialogUtils.hideDialog(AppGlobal.context); - String path = await _createFileFromString(value["MedicalReportBase64"], "pdf"); - if (isShare) { - Share.shareXFiles([XFile(path)], text: "Medical Report"); - } else { - try { - OpenFilex.open(path); - } catch (ex) { - AppToast.showErrorToast(message: "Cannot open file."); + if (value["MedicalReportBase64"] != "" && value["MedicalReportBase64"] != null) { + String path = await _createFileFromString(value["MedicalReportBase64"], "pdf"); + if (isShare) { + Share.shareXFiles([XFile(path)], text: "Medical Report"); + } else { + try { + OpenFilex.open(path); + } catch (ex) { + AppToast.showErrorToast(message: "Cannot open file."); + } } + } else { + AppToast.showErrorToast(message: "Cannot open file."); } }).catchError((err) { GifLoaderDialogUtils.hideDialog(AppGlobal.context);