fix for medical report & user agreement page

merge-update-with-lab-changes
haroon amjad 10 months ago
parent cb68731679
commit a0528da4cd

@ -646,7 +646,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
} else { } else {
authService authService
.checkActivationCode(request, value) .checkActivationCode(request, value)
.then((result) => { .then((result) async => {
res = result, res = result,
if (result is Map) if (result is Map)
{ {
@ -674,11 +674,11 @@ class _ConfirmLogin extends State<ConfirmLogin> {
//Remove o+ from here Added by Aamir //Remove o+ from here Added by Aamir
authenticatedUserObject.user = result.list, authenticatedUserObject.user = result.list,
projectViewModel.setPrivilege(privilegeList: res), projectViewModel.setPrivilege(privilegeList: res),
sharedPref.setObject(MAIN_USER, result.list), await sharedPref.setObject(MAIN_USER, result.list),
sharedPref.setObject(USER_PROFILE, result.list), await sharedPref.setObject(USER_PROFILE, result.list),
loginTokenID = result.logInTokenID, loginTokenID = result.logInTokenID,
sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID), await sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
sharedPref.setString(TOKEN, result.authenticationTokenID), await sharedPref.setString(TOKEN, result.authenticationTokenID),
checkIfUserAgreedBefore(result), checkIfUserAgreedBefore(result),
projectViewModel.analytics.loginRegistration.login_successful(), projectViewModel.analytics.loginRegistration.login_successful(),
} }

@ -220,15 +220,19 @@ class ReportListWidget extends StatelessWidget {
report.setupId!) report.setupId!)
.then((value) async { .then((value) async {
GifLoaderDialogUtils.hideDialog(AppGlobal.context); GifLoaderDialogUtils.hideDialog(AppGlobal.context);
String path = await _createFileFromString(value["MedicalReportBase64"], "pdf"); if (value["MedicalReportBase64"] != "" && value["MedicalReportBase64"] != null) {
if (isShare) { String path = await _createFileFromString(value["MedicalReportBase64"], "pdf");
Share.shareXFiles([XFile(path)], text: "Medical Report"); if (isShare) {
} else { Share.shareXFiles([XFile(path)], text: "Medical Report");
try { } else {
OpenFilex.open(path); try {
} catch (ex) { OpenFilex.open(path);
AppToast.showErrorToast(message: "Cannot open file."); } catch (ex) {
AppToast.showErrorToast(message: "Cannot open file.");
}
} }
} else {
AppToast.showErrorToast(message: "Cannot open file.");
} }
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(AppGlobal.context); GifLoaderDialogUtils.hideDialog(AppGlobal.context);

Loading…
Cancel
Save