updates & fixes

merge-update-with-lab-changes
haroon amjad 10 months ago
parent 7a821a4604
commit b308079255

@ -119,15 +119,12 @@ class RegionTitle extends StatelessWidget {
color: Color(0xFFD02127), color: Color(0xFFD02127),
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
), ),
SizedBox(
width: 8,
),
], ],
), ),
), ),
Visibility( Visibility(
visible: hmcCount != "0" && hmgCount != "0", visible: hmcCount != "0" && hmgCount != "0",
child: Text(" ,")), child: Text(", ")),
Visibility( Visibility(
visible: hmcCount != "0", visible: hmcCount != "0",
child: Row( child: Row(

@ -711,9 +711,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkIfUserAgreedBefore(CheckActivationCode result) { checkIfUserAgreedBefore(CheckActivationCode result) {
if (projectViewModel.havePrivilege(109)) { if (projectViewModel.havePrivilege(109)) {
this.authService.checkIfUserAgreed().then((result) { this.authService.checkIfUserAgreed().then((result) {
if (result['IsPatientAlreadyAgreed']) { // if (result['IsPatientAlreadyAgreed']) {
goToHome(); // goToHome();
} else { // } else {
this.authService.getUserAgreementContent().then((result) { this.authService.getUserAgreementContent().then((result) {
GifLoaderDialogUtils.hideDialog(AppGlobal.context); GifLoaderDialogUtils.hideDialog(AppGlobal.context);
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
@ -724,6 +724,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
authenticatedUserObject: authenticatedUserObject, authenticatedUserObject: authenticatedUserObject,
appointmentRateViewModel: appointmentRateViewModel, appointmentRateViewModel: appointmentRateViewModel,
selectedOption: selectedOption, selectedOption: selectedOption,
isArabic: projectViewModel.isArabic,
), ),
), ),
(r) => false); (r) => false);
@ -731,7 +732,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(err); print(err);
}); });
} // }
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(err); print(err);

@ -30,8 +30,9 @@ class UserLoginAgreementPage extends StatefulWidget {
final AuthenticatedUserObject authenticatedUserObject; final AuthenticatedUserObject authenticatedUserObject;
final AppointmentRateViewModel appointmentRateViewModel; final AppointmentRateViewModel appointmentRateViewModel;
final int selectedOption; 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 @override
State<UserLoginAgreementPage> createState() => _UserLoginAgreementPageState(); State<UserLoginAgreementPage> createState() => _UserLoginAgreementPageState();
@ -72,7 +73,7 @@ class _UserLoginAgreementPageState extends State<UserLoginAgreementPage> {
}, },
), ),
) )
..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 @override

Loading…
Cancel
Save