From ffabb8883c2528d817be867be25692a3a132e066 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 15 Apr 2021 14:22:37 +0300 Subject: [PATCH] fix in the verification methods and radiology page --- lib/core/service/radiology_service.dart | 2 +- lib/widgets/auth/verification_methods.dart | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/core/service/radiology_service.dart b/lib/core/service/radiology_service.dart index 9d60c4ac..c8c02fd0 100644 --- a/lib/core/service/radiology_service.dart +++ b/lib/core/service/radiology_service.dart @@ -33,7 +33,7 @@ class RadiologyService extends BaseService { patient: patient, onSuccess: (dynamic response, int statusCode) { finalRadiologyList.clear(); - response['FinalRadiologyList'].forEach((radiology) { + response['ListRAD'].forEach((radiology) { finalRadiologyList.add(FinalRadiology.fromJson(radiology)); }); }, onFailure: (String error, int statusCode) { diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index 42028dcc..b4d39894 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -15,6 +15,7 @@ import 'package:doctor_app_flutter/widgets/otp/sms-popup.dart'; import 'package:doctor_app_flutter/widgets/shared/app_button.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; +import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; @@ -24,6 +25,7 @@ import 'package:provider/provider.dart'; import '../../config/size_config.dart'; import '../../core/viewModel/auth_view_model.dart'; +import '../../landing_page.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/helpers.dart'; @@ -858,7 +860,7 @@ class _VerificationMethodsState extends State { sharedPref.setObj(DOCTOR_PROFILE, profile); projectsProvider.isLogin = true; - Navigator.of(context).popAndPushNamed(HOME); + Navigator.pushAndRemoveUntil(context, FadePage(page: LandingPage(),), (r) => false); } getDocProfiles(ClinicModel clinicInfo, authProv) {