user agreement service privilege added

merge-update-with-lab-changes
haroon amjad 1 year ago
parent a24582a578
commit 744e3978d3

@ -709,37 +709,41 @@ class _ConfirmLogin extends State<ConfirmLogin> {
} }
checkIfUserAgreedBefore(CheckActivationCode result) { checkIfUserAgreedBefore(CheckActivationCode result) {
// this.authService.checkIfUserAgreed().then((result) { if (projectViewModel.havePrivilege(109)) {
// if (result['IsPatientAlreadyAgreed']) { this.authService.checkIfUserAgreed().then((result) {
// goToHome(); if (result['IsPatientAlreadyAgreed']) {
// } else { goToHome();
// this.authService.getUserAgreementContent().then((result) { } else {
// GifLoaderDialogUtils.hideDialog(AppGlobal.context); this.authService.getUserAgreementContent().then((result) {
// Navigator.pushAndRemoveUntil( GifLoaderDialogUtils.hideDialog(AppGlobal.context);
// context, Navigator.pushAndRemoveUntil(
// FadePage( context,
// page: UserLoginAgreementPage( FadePage(
// userAgreementText: result['UserAgreementContent'], page: UserLoginAgreementPage(
// authenticatedUserObject: authenticatedUserObject, userAgreementText: result['UserAgreementContent'],
// appointmentRateViewModel: appointmentRateViewModel, authenticatedUserObject: authenticatedUserObject,
// selectedOption: selectedOption, appointmentRateViewModel: appointmentRateViewModel,
// ), selectedOption: selectedOption,
// ), ),
// (r) => false); ),
// }).catchError((err) { (r) => false);
// GifLoaderDialogUtils.hideDialog(context); }).catchError((err) {
// print(err); GifLoaderDialogUtils.hideDialog(context);
// }); print(err);
// } });
// }).catchError((err) { }
// GifLoaderDialogUtils.hideDialog(context); }).catchError((err) {
// print(err); GifLoaderDialogUtils.hideDialog(context);
// }); print(err);
});
} else {
goToHome();
}
// if (result.isNeedUserAgreement == true) { // if (result.isNeedUserAgreement == true) {
// // move to agreement page. // // move to agreement page.
// } else { // } else {
goToHome(); // goToHome();
// } // }
} }

@ -3,6 +3,8 @@ import 'package:diplomaticquarterapp/core/viewModels/TermsConditionsViewModel.da
import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
import 'package:diplomaticquarterapp/models/InPatientServices/get_admission_info_response_model.dart';
import 'package:diplomaticquarterapp/models/InPatientServices/get_admission_request_info_response_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart'; import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart';
@ -13,6 +15,7 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/Loader/gif_loader_container.dart';
import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/custom_text_button.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -51,6 +54,7 @@ class _UserLoginAgreementPageState extends State<UserLoginAgreementPage> {
NavigationDelegate( NavigationDelegate(
onProgress: (int progress) { onProgress: (int progress) {
// Update loading bar. // Update loading bar.
print("Progress: $progress");
}, },
onPageStarted: (String url) {}, onPageStarted: (String url) {},
onPageFinished: (String url) { onPageFinished: (String url) {
@ -82,7 +86,15 @@ class _UserLoginAgreementPageState extends State<UserLoginAgreementPage> {
showNewAppBar: true, showNewAppBar: true,
isShowDecPage: false, isShowDecPage: false,
appBarTitle: TranslationBase.of(context).userAgreement, appBarTitle: TranslationBase.of(context).userAgreement,
body: WebViewWidget(controller: _controller), body: isPageLoaded
? WebViewWidget(controller: _controller)
: Container(
child: Center(
child: GifLoaderContainer(
barrierDismissible: false,
),
),
),
// Padding( // Padding(
// padding: const EdgeInsets.all(8.0), // padding: const EdgeInsets.all(8.0),
// child: SingleChildScrollView(child: WebViewWidget(controller: _controller) // child: SingleChildScrollView(child: WebViewWidget(controller: _controller)
@ -193,6 +205,39 @@ class _UserLoginAgreementPageState extends State<UserLoginAgreementPage> {
}); });
} }
checkIfIsInPatient() {
bool isAdmitted = false;
bool hasAdmissionRequest = false;
GetAdmissionInfoResponseModel getAdmissionInfoResponseModel;
GetAdmissionRequestInfoResponseModel getAdmissionRequestInfoResponseModel;
ClinicListService service = new ClinicListService();
service.checkIfInPatientAPI(context).then((res) {
if (res['MessageStatus'] == 1) {
isAdmitted = res['isAdmitted'];
hasAdmissionRequest = res['hasAdmissionRequests'];
print("IS ADMITTED: $isAdmitted");
print("Has Admission Request: $hasAdmissionRequest");
if (isAdmitted) {
if (res['PatientAdmittedInformation'].length != 0) {
getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel.fromJson(res['PatientAdmittedInformation'][0]);
projectViewModel.setInPatientProjectID(res['PatientAdmittedInformation'][0]['ProjectID']);
projectViewModel.setInPatientAdmissionInfo(getAdmissionInfoResponseModel);
projectViewModel.setIsPatientAdmitted(true);
}
}
if (hasAdmissionRequest) {
if (res['MedicalInstruction'].length != 0) {
getAdmissionRequestInfoResponseModel = GetAdmissionRequestInfoResponseModel.fromJson(res['MedicalInstruction'][0]);
// projectViewModel.setInPatientProjectID(res['MedicalInstruction'][0]['ProjectID']);
projectViewModel.setInPatientProjectID(res['MedicalInstruction'][0]['projectId']);
projectViewModel.setInPatientAdmissionRequest(getAdmissionRequestInfoResponseModel);
projectViewModel.setPatientHasAdmissionRequest(true);
}
}
} else {}
});
}
goToHome() async { goToHome() async {
widget.authenticatedUserObject.isLogin = true; widget.authenticatedUserObject.isLogin = true;
widget.appointmentRateViewModel.isLogin = true; widget.appointmentRateViewModel.isLogin = true;
@ -202,6 +247,7 @@ class _UserLoginAgreementPageState extends State<UserLoginAgreementPage> {
// GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
getToDoCount(); getToDoCount();
checkIfIsInPatient();
widget.appointmentRateViewModel widget.appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) => { .then((value) => {

Loading…
Cancel
Save