diff --git a/lib/core/service/medical/reports_service.dart b/lib/core/service/medical/reports_service.dart index def7e97a..46d2c23f 100644 --- a/lib/core/service/medical/reports_service.dart +++ b/lib/core/service/medical/reports_service.dart @@ -13,7 +13,7 @@ class ReportsService extends BaseService { List admissionsMedicalReport = []; String userAgreementContent = ""; - RequestReports _requestReports = RequestReports(isReport: true, encounterType: 1, requestType: 1, patientOutSA: 0, projectID: 0); + RequestReports _requestReports = RequestReports(isReport: true, encounterType: 1, requestType: 1, projectID: 0); Future getReports() async { hasError = false; diff --git a/lib/pages/feedback/send_feedback_page.dart b/lib/pages/feedback/send_feedback_page.dart index 19696467..595f6cd6 100644 --- a/lib/pages/feedback/send_feedback_page.dart +++ b/lib/pages/feedback/send_feedback_page.dart @@ -459,8 +459,8 @@ class _SendFeedbackPageState extends State { List list = [ RadioSelectionDialogModel(TranslationBase.of(context).notClassified, 5), RadioSelectionDialogModel(TranslationBase.of(context).complainAppo, 1), - RadioSelectionDialogModel(TranslationBase.of(context).complainWithoutAppo, 3), - RadioSelectionDialogModel(TranslationBase.of(context).question, 2), + RadioSelectionDialogModel(TranslationBase.of(context).complainWithoutAppo, 2), + RadioSelectionDialogModel(TranslationBase.of(context).question, 3), RadioSelectionDialogModel(TranslationBase.of(context).compliment, 4), RadioSelectionDialogModel(TranslationBase.of(context).suggestion, 6), ]; diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index d9f2d614..eb7d8aca 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -17,6 +17,7 @@ import 'package:diplomaticquarterapp/models/Authentication/send_activation_reque 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/landing/landing_page.dart'; +import 'package:diplomaticquarterapp/pages/login/login.dart'; import 'package:diplomaticquarterapp/pages/login/register_new.dart'; import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart'; import 'package:diplomaticquarterapp/routes.dart'; @@ -767,7 +768,18 @@ class _ConfirmLogin extends State { { result = CheckActivationCode.fromJson( result as Map), - if (this.registerd_data != null && + if(result.errorCode =='699'){ + //699 block run here + GifLoaderDialogUtils.hideDialog(context), + Future.delayed(Duration(seconds: 2), () { + AppToast.showErrorToast(message: result.errorEndUserMessage); + Navigator.popUntil( + context, + (route) => + Utils.route(route, equalsTo: Login)); + }) + } + else if (this.registerd_data != null && this.registerd_data.isRegister == true) { widget.changePageViewIndex!(1), diff --git a/lib/pages/medical/reports/report_home_page.dart b/lib/pages/medical/reports/report_home_page.dart index c4f31488..7e0e2463 100644 --- a/lib/pages/medical/reports/report_home_page.dart +++ b/lib/pages/medical/reports/report_home_page.dart @@ -95,11 +95,11 @@ class _HomeReportPageState extends State with SingleTickerProvid tabs: [ Text( TranslationBase.of(context).outpatient, - style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'), + style: TextStyle(fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins'), ), Text( TranslationBase.of(context).inPatient, - style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'), + style: TextStyle(fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins'), ), ], ), 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 0234c3e3..629f523b 100644 --- a/lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart +++ b/lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart @@ -174,7 +174,7 @@ 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, ), ), ], diff --git a/lib/widgets/otp/sms-popup.dart b/lib/widgets/otp/sms-popup.dart index 1dcf441f..c87dceeb 100644 --- a/lib/widgets/otp/sms-popup.dart +++ b/lib/widgets/otp/sms-popup.dart @@ -286,14 +286,14 @@ class SMSOTP { } checkSignature() async { - SmsVerification.startListeningSms().then((message) { - // setState(() { - final intRegex = RegExp(r'\d+', multiLine: true); - var otp = SmsVerification.getCode(message, intRegex); - _pinPutController.text = otp; - onSuccess(otp); - // }); - }); + // SmsVerification.startListeningSms().then((message) { + // // setState(() { + // final intRegex = RegExp(r'\d+', multiLine: true); + // var otp = SmsVerification.getCode(message, intRegex); + // _pinPutController.text = otp; + // onSuccess(otp); + // // }); + // }); } // startLister() {