From b3080792555f6d895b809f2f9c0be80e54c7ca3e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 27 Apr 2025 11:53:52 +0300 Subject: [PATCH] updates & fixes --- .../BookAppointment/search_result/ResultByRegion.dart | 5 +---- lib/pages/login/confirm-login.dart | 9 +++++---- lib/pages/login/user-login-agreement-page.dart | 5 +++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/pages/BookAppointment/search_result/ResultByRegion.dart b/lib/pages/BookAppointment/search_result/ResultByRegion.dart index a56656f1..6eaa83d2 100644 --- a/lib/pages/BookAppointment/search_result/ResultByRegion.dart +++ b/lib/pages/BookAppointment/search_result/ResultByRegion.dart @@ -119,15 +119,12 @@ class RegionTitle extends StatelessWidget { color: Color(0xFFD02127), fontWeight: FontWeight.w600), ), - SizedBox( - width: 8, - ), ], ), ), Visibility( visible: hmcCount != "0" && hmgCount != "0", - child: Text(" ,")), + child: Text(", ")), Visibility( visible: hmcCount != "0", child: Row( diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ee4208f4..5dfa3c49 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -711,9 +711,9 @@ class _ConfirmLogin extends State { checkIfUserAgreedBefore(CheckActivationCode result) { if (projectViewModel.havePrivilege(109)) { this.authService.checkIfUserAgreed().then((result) { - if (result['IsPatientAlreadyAgreed']) { - goToHome(); - } else { + // if (result['IsPatientAlreadyAgreed']) { + // goToHome(); + // } else { this.authService.getUserAgreementContent().then((result) { GifLoaderDialogUtils.hideDialog(AppGlobal.context); Navigator.pushAndRemoveUntil( @@ -724,6 +724,7 @@ class _ConfirmLogin extends State { authenticatedUserObject: authenticatedUserObject, appointmentRateViewModel: appointmentRateViewModel, selectedOption: selectedOption, + isArabic: projectViewModel.isArabic, ), ), (r) => false); @@ -731,7 +732,7 @@ class _ConfirmLogin extends State { GifLoaderDialogUtils.hideDialog(context); print(err); }); - } + // } }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); diff --git a/lib/pages/login/user-login-agreement-page.dart b/lib/pages/login/user-login-agreement-page.dart index c21fa273..cdf72035 100644 --- a/lib/pages/login/user-login-agreement-page.dart +++ b/lib/pages/login/user-login-agreement-page.dart @@ -30,8 +30,9 @@ class UserLoginAgreementPage extends StatefulWidget { final AuthenticatedUserObject authenticatedUserObject; final AppointmentRateViewModel appointmentRateViewModel; final int selectedOption; + final isArabic; - UserLoginAgreementPage({required this.userAgreementText, required this.authenticatedUserObject, required this.appointmentRateViewModel, required this.selectedOption}); + UserLoginAgreementPage({required this.userAgreementText, required this.authenticatedUserObject, required this.appointmentRateViewModel, required this.selectedOption, required this.isArabic}); @override State createState() => _UserLoginAgreementPageState(); @@ -72,7 +73,7 @@ class _UserLoginAgreementPageState extends State { }, ), ) - ..loadRequest(Uri.parse("https://hmg.com/en/Pages/Privacy.aspx")); + ..loadRequest(Uri.parse(widget.isArabic ? "https://hmg.com/ar/Pages/Privacy.aspx" : "https://hmg.com/en/Pages/Privacy.aspx")); } @override