diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index fe0b4d5..7c808e5 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -661,7 +661,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/core/dependencies.dart b/lib/core/dependencies.dart index e8d3071..237f798 100644 --- a/lib/core/dependencies.dart +++ b/lib/core/dependencies.dart @@ -35,6 +35,7 @@ import 'package:hmg_patient_app_new/features/medical_file/medical_file_repo.dart import 'package:hmg_patient_app_new/features/medical_file/medical_file_view_model.dart'; import 'package:hmg_patient_app_new/features/monthly_report/monthly_report_repo.dart'; import 'package:hmg_patient_app_new/features/monthly_report/monthly_report_view_model.dart'; +import 'package:hmg_patient_app_new/features/monthly_reports/monthly_reports_repo.dart'; import 'package:hmg_patient_app_new/features/my_appointments/appointment_rating_view_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/appointment_via_region_viewmodel.dart'; import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_repo.dart'; @@ -290,11 +291,11 @@ class AppDependencies { getIt.registerLazySingleton(() => MyInvoicesViewModel(myInvoicesRepo: getIt(), errorHandlerService: getIt(), navServices: getIt())); getIt.registerLazySingleton(() => MonthlyReportViewModel(errorHandlerService: getIt(), monthlyReportRepo: getIt())); - getIt.registerLazySingleton(() => MyInvoicesViewModel( - myInvoicesRepo: getIt(), - errorHandlerService: getIt(), - navServices: getIt(), - )); + // getIt.registerLazySingleton(() => MyInvoicesViewModel( + // myInvoicesRepo: getIt(), + // errorHandlerService: getIt(), + // navServices: getIt(), + // )); getIt.registerLazySingleton(() => HealthTrackersViewModel(healthTrackersRepo: getIt(), errorHandlerService: getIt())); getIt.registerLazySingleton( () => ActivePrescriptionsViewModel( @@ -302,13 +303,13 @@ class AppDependencies { activePrescriptionsRepo: getIt() ), ); - getIt.registerFactory( - () => QrParkingViewModel( - qrParkingRepo: getIt(), - errorHandlerService: getIt(), - cacheService: getIt(), - ), - ); + // getIt.registerFactory( + // () => QrParkingViewModel( + // qrParkingRepo: getIt(), + // errorHandlerService: getIt(), + // cacheService: getIt(), + // ), + // ); } } diff --git a/lib/features/blood_donation/blood_donation_view_model.dart b/lib/features/blood_donation/blood_donation_view_model.dart index 8325cf7..94fa6e6 100644 --- a/lib/features/blood_donation/blood_donation_view_model.dart +++ b/lib/features/blood_donation/blood_donation_view_model.dart @@ -233,7 +233,7 @@ class BloodDonationViewModel extends ChangeNotifier { return false; } - if (selectedBloodGroup == null) { + if (selectedGender == null) { await dialogService.showErrorBottomSheet( message: "Please choose Gender", ); @@ -258,7 +258,7 @@ class BloodDonationViewModel extends ChangeNotifier { Future updateBloodGroup() async { LoaderBottomSheet.showLoader(); - // body['City'] = detailsModel.city; + // body['City'] = detailsModel.city; // body['cityCode'] = detailsModel.cityCode; // body['Gender'] = detailsModel.gender; // body['BloodGroup'] = detailsModel.bloodGroup; @@ -283,4 +283,11 @@ class BloodDonationViewModel extends ChangeNotifier { Map payload = {"IsAgreed": true}; await bloodDonationRepo.addUserAgreementForBloodDonation(request: payload); } + + Future fetchAllData() async { + LoaderBottomSheet.showLoader(loadingText: "Fetching Data..."); + await getRegionSelectedClinics(); + // await getPatientBloodGroupDetails(); + LoaderBottomSheet.hideLoader(); + } } diff --git a/lib/presentation/blood_donation/blood_donation_page.dart b/lib/presentation/blood_donation/blood_donation_page.dart index a987220..9432c67 100644 --- a/lib/presentation/blood_donation/blood_donation_page.dart +++ b/lib/presentation/blood_donation/blood_donation_page.dart @@ -28,11 +28,22 @@ import 'package:lottie/lottie.dart'; import 'package:provider/provider.dart'; import 'package:hmg_patient_app_new/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart'; -class BloodDonationPage extends StatelessWidget { +class BloodDonationPage extends StatefulWidget { BloodDonationPage({super.key}); + @override + State createState() => _BloodDonationPageState(); +} + +class _BloodDonationPageState extends State { late AppState appState; + @override + void initState() { + super.initState(); + Future.microtask(() => getIt.get().fetchAllData()); + } + @override Widget build(BuildContext context) { appState = getIt(); @@ -52,8 +63,6 @@ class BloodDonationPage extends StatelessWidget { showCommonBottomSheetWithoutHeight(context, title: "Select Hospital", isDismissible: false, child: Consumer(builder: (_, data, __) { return HospitalBottomSheetBodySelection( onUserHospitalSelection: (BdGetProjectsHaveBdClinic userChoice) { - print("============User Choice==============="); - bloodDonationVM.getFreeBloodDonationSlots(request: {"ClinicID": 134, "ProjectID": userChoice.projectId}); }, ); diff --git a/lib/presentation/hmg_services/services_page.dart b/lib/presentation/hmg_services/services_page.dart index e49a621..175d4d3 100644 --- a/lib/presentation/hmg_services/services_page.dart +++ b/lib/presentation/hmg_services/services_page.dart @@ -46,18 +46,9 @@ class ServicesPage extends StatelessWidget { late MedicalFileViewModel medicalFileViewModel; late final List hmgServices = [ - HmgServicesComponentModel( - 11, - "Emergency Services".needTranslation, - "".needTranslation, - AppAssets.emergency_services_icon, - bgColor: AppColors.primaryRedColor, - true, - route: null, onTap: () { + HmgServicesComponentModel(11, "Emergency Services".needTranslation, "".needTranslation, AppAssets.emergency_services_icon, bgColor: AppColors.primaryRedColor, true, route: null, onTap: () { getIt.get().flushData(); - getIt.get().getTransportationOrders( - showLoader: false, - ); + getIt.get().getTransportationOrders(showLoader: false); getIt.get().getRRTOrders( showLoader: false, ); @@ -106,72 +97,57 @@ class ServicesPage extends StatelessWidget { route: AppRoutes.eReferralPage, ), HmgServicesComponentModel( - 3, - "Blood Donation".needTranslation, - "".needTranslation, - AppAssets.blood_donation_icon, - bgColor: AppColors.bloodDonationCardColor, - true, - route: null, onTap: () async { - LoaderBottomSheet.showLoader(loadingText: "Fetching Data..."); - await bloodDonationViewModel.getRegionSelectedClinics(onSuccess: (val) async { - // await bloodDonationViewModel.getPatientBloodGroupDetails(onSuccess: (val) { - LoaderBottomSheet.hideLoader(); - Navigator.of(GetIt.instance().navigatorKey.currentContext!).push( - CustomPageRoute( - page: BloodDonationPage(), - ), - ); - // }, onError: (err) { - // LoaderBottomSheet.hideLoader(); - // }); - }, onError: (err) { - LoaderBottomSheet.hideLoader(); - }); - }), - // HmgServicesComponentModel( - // 11, - // "Covid 19 Test".needTranslation, - // "".needTranslation, - // AppAssets.covid19icon, - // bgColor: AppColors.covid29Color, - // true, - // route: AppRoutes.covid19Test, - // ), + 3, + "Blood Donation".needTranslation, + "".needTranslation, + AppAssets.blood_donation_icon, + bgColor: AppColors.bloodDonationCardColor, + true, + route: AppRoutes.bloodDonationPage, + ), +// HmgServicesComponentModel( +// 11, +// "Covid 19 Test".needTranslation, +// "".needTranslation, +// AppAssets.covid19icon, +// bgColor: AppColors.covid29Color, +// true, +// route: AppRoutes.covid19Test, +// ), - // HmgServicesComponentModel( - // 11, - // "Vital Sign".needTranslation, - // "".needTranslation, - // AppAssets.covid19icon, - // bgColor: AppColors.covid29Color, - // true, - // route: AppRoutes.vitalSign, - // ) +// HmgServicesComponentModel( +// 11, +// "Vital Sign".needTranslation, +// "".needTranslation, +// AppAssets.covid19icon, +// bgColor: AppColors.covid29Color, +// true, +// route: AppRoutes.vitalSign, +// ) - // HmgServicesComponentModel( - // 3, - // "Home Health Care".needTranslation, - // "".needTranslation, - // AppAssets.homeBottom, - // bgColor: AppColors.primaryRedColor, - // true, - // route: AppRoutes.homeHealthCarePage, - // ), - // HmgServicesComponentModel( - // 11, - // "Virtual Tour".needTranslation, - // "".needTranslation, - // AppAssets.my_address, - // bgColor: AppColors.quickLoginColor, - // true, - // route: null, - // onTap:(){ - // Utils.openWebView( - // url: 'https://hmgwebservices.com/vt_mobile/html/index.html', - // ); - // }, - // ) +// HmgServicesComponentModel( +// 3, +// "Home Health Care".needTranslation, +// "".needTranslation, +// AppAssets.homeBottom, +// bgColor: AppColors.primaryRedColor, +// true, +// route: AppRoutes.homeHealthCarePage, +// ), +// HmgServicesComponentModel( +// 11, +// "Virtual Tour".needTranslation, +// "".needTranslation, +// AppAssets.my_address, +// bgColor: AppColors.quickLoginColor, +// true, +// route: null, +// onTap:(){ +// Utils.openWebView( +// url: 'https://hmgwebservices.com/vt_mobile/html/index.html', +// ); +// }, +// ) ]; late final List hmgHealthToolServices = [ @@ -539,7 +515,6 @@ class ServicesPage extends StatelessWidget { ), ), ); - }), ), ),