pull/166/head
aamir-csol 3 months ago
parent bf210e664d
commit d76ff5828f

@ -661,7 +661,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb
class ApiConsts { class ApiConsts {
static const maxSmallScreen = 660; 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 // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT

@ -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/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_repo.dart';
import 'package:hmg_patient_app_new/features/monthly_report/monthly_report_view_model.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_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/appointment_via_region_viewmodel.dart';
import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_repo.dart'; import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_repo.dart';
@ -290,11 +291,11 @@ class AppDependencies {
getIt.registerLazySingleton<MyInvoicesViewModel>(() => MyInvoicesViewModel(myInvoicesRepo: getIt(), errorHandlerService: getIt(), navServices: getIt())); getIt.registerLazySingleton<MyInvoicesViewModel>(() => MyInvoicesViewModel(myInvoicesRepo: getIt(), errorHandlerService: getIt(), navServices: getIt()));
getIt.registerLazySingleton<MonthlyReportViewModel>(() => MonthlyReportViewModel(errorHandlerService: getIt(), monthlyReportRepo: getIt())); getIt.registerLazySingleton<MonthlyReportViewModel>(() => MonthlyReportViewModel(errorHandlerService: getIt(), monthlyReportRepo: getIt()));
getIt.registerLazySingleton<MyInvoicesViewModel>(() => MyInvoicesViewModel( // getIt.registerLazySingleton<MyInvoicesViewModel>(() => MyInvoicesViewModel(
myInvoicesRepo: getIt(), // myInvoicesRepo: getIt(),
errorHandlerService: getIt(), // errorHandlerService: getIt(),
navServices: getIt(), // navServices: getIt(),
)); // ));
getIt.registerLazySingleton<HealthTrackersViewModel>(() => HealthTrackersViewModel(healthTrackersRepo: getIt(), errorHandlerService: getIt())); getIt.registerLazySingleton<HealthTrackersViewModel>(() => HealthTrackersViewModel(healthTrackersRepo: getIt(), errorHandlerService: getIt()));
getIt.registerLazySingleton<ActivePrescriptionsViewModel>( getIt.registerLazySingleton<ActivePrescriptionsViewModel>(
() => ActivePrescriptionsViewModel( () => ActivePrescriptionsViewModel(
@ -302,13 +303,13 @@ class AppDependencies {
activePrescriptionsRepo: getIt() activePrescriptionsRepo: getIt()
), ),
); );
getIt.registerFactory<QrParkingViewModel>( // getIt.registerFactory<QrParkingViewModel>(
() => QrParkingViewModel( // () => QrParkingViewModel(
qrParkingRepo: getIt<QrParkingRepo>(), // qrParkingRepo: getIt<QrParkingRepo>(),
errorHandlerService: getIt<ErrorHandlerService>(), // errorHandlerService: getIt<ErrorHandlerService>(),
cacheService: getIt<CacheService>(), // cacheService: getIt<CacheService>(),
), // ),
); // );
} }
} }

@ -233,7 +233,7 @@ class BloodDonationViewModel extends ChangeNotifier {
return false; return false;
} }
if (selectedBloodGroup == null) { if (selectedGender == null) {
await dialogService.showErrorBottomSheet( await dialogService.showErrorBottomSheet(
message: "Please choose Gender", message: "Please choose Gender",
); );
@ -283,4 +283,11 @@ class BloodDonationViewModel extends ChangeNotifier {
Map<String, dynamic> payload = {"IsAgreed": true}; Map<String, dynamic> payload = {"IsAgreed": true};
await bloodDonationRepo.addUserAgreementForBloodDonation(request: payload); await bloodDonationRepo.addUserAgreementForBloodDonation(request: payload);
} }
Future<void> fetchAllData() async {
LoaderBottomSheet.showLoader(loadingText: "Fetching Data...");
await getRegionSelectedClinics();
// await getPatientBloodGroupDetails();
LoaderBottomSheet.hideLoader();
}
} }

@ -28,11 +28,22 @@ import 'package:lottie/lottie.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:hmg_patient_app_new/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.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}); BloodDonationPage({super.key});
@override
State<BloodDonationPage> createState() => _BloodDonationPageState();
}
class _BloodDonationPageState extends State<BloodDonationPage> {
late AppState appState; late AppState appState;
@override
void initState() {
super.initState();
Future.microtask(() => getIt.get<BloodDonationViewModel>().fetchAllData());
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
appState = getIt<AppState>(); appState = getIt<AppState>();
@ -52,8 +63,6 @@ class BloodDonationPage extends StatelessWidget {
showCommonBottomSheetWithoutHeight(context, title: "Select Hospital", isDismissible: false, child: Consumer<BloodDonationViewModel>(builder: (_, data, __) { showCommonBottomSheetWithoutHeight(context, title: "Select Hospital", isDismissible: false, child: Consumer<BloodDonationViewModel>(builder: (_, data, __) {
return HospitalBottomSheetBodySelection( return HospitalBottomSheetBodySelection(
onUserHospitalSelection: (BdGetProjectsHaveBdClinic userChoice) { onUserHospitalSelection: (BdGetProjectsHaveBdClinic userChoice) {
print("============User Choice===============");
bloodDonationVM.getFreeBloodDonationSlots(request: {"ClinicID": 134, "ProjectID": userChoice.projectId}); bloodDonationVM.getFreeBloodDonationSlots(request: {"ClinicID": 134, "ProjectID": userChoice.projectId});
}, },
); );

@ -46,18 +46,9 @@ class ServicesPage extends StatelessWidget {
late MedicalFileViewModel medicalFileViewModel; late MedicalFileViewModel medicalFileViewModel;
late final List<HmgServicesComponentModel> hmgServices = [ late final List<HmgServicesComponentModel> hmgServices = [
HmgServicesComponentModel( HmgServicesComponentModel(11, "Emergency Services".needTranslation, "".needTranslation, AppAssets.emergency_services_icon, bgColor: AppColors.primaryRedColor, true, route: null, onTap: () {
11,
"Emergency Services".needTranslation,
"".needTranslation,
AppAssets.emergency_services_icon,
bgColor: AppColors.primaryRedColor,
true,
route: null, onTap: () {
getIt.get<EmergencyServicesViewModel>().flushData(); getIt.get<EmergencyServicesViewModel>().flushData();
getIt.get<EmergencyServicesViewModel>().getTransportationOrders( getIt.get<EmergencyServicesViewModel>().getTransportationOrders(showLoader: false);
showLoader: false,
);
getIt.get<EmergencyServicesViewModel>().getRRTOrders( getIt.get<EmergencyServicesViewModel>().getRRTOrders(
showLoader: false, showLoader: false,
); );
@ -112,66 +103,51 @@ class ServicesPage extends StatelessWidget {
AppAssets.blood_donation_icon, AppAssets.blood_donation_icon,
bgColor: AppColors.bloodDonationCardColor, bgColor: AppColors.bloodDonationCardColor,
true, true,
route: null, onTap: () async { route: AppRoutes.bloodDonationPage,
LoaderBottomSheet.showLoader(loadingText: "Fetching Data..."); ),
await bloodDonationViewModel.getRegionSelectedClinics(onSuccess: (val) async { // HmgServicesComponentModel(
// await bloodDonationViewModel.getPatientBloodGroupDetails(onSuccess: (val) { // 11,
LoaderBottomSheet.hideLoader(); // "Covid 19 Test".needTranslation,
Navigator.of(GetIt.instance<NavigationService>().navigatorKey.currentContext!).push( // "".needTranslation,
CustomPageRoute( // AppAssets.covid19icon,
page: BloodDonationPage(), // bgColor: AppColors.covid29Color,
), // true,
); // route: AppRoutes.covid19Test,
// }, onError: (err) { // ),
// LoaderBottomSheet.hideLoader();
// });
}, onError: (err) {
LoaderBottomSheet.hideLoader();
});
}),
// HmgServicesComponentModel(
// 11,
// "Covid 19 Test".needTranslation,
// "".needTranslation,
// AppAssets.covid19icon,
// bgColor: AppColors.covid29Color,
// true,
// route: AppRoutes.covid19Test,
// ),
// HmgServicesComponentModel( // HmgServicesComponentModel(
// 11, // 11,
// "Vital Sign".needTranslation, // "Vital Sign".needTranslation,
// "".needTranslation, // "".needTranslation,
// AppAssets.covid19icon, // AppAssets.covid19icon,
// bgColor: AppColors.covid29Color, // bgColor: AppColors.covid29Color,
// true, // true,
// route: AppRoutes.vitalSign, // route: AppRoutes.vitalSign,
// ) // )
// HmgServicesComponentModel( // HmgServicesComponentModel(
// 3, // 3,
// "Home Health Care".needTranslation, // "Home Health Care".needTranslation,
// "".needTranslation, // "".needTranslation,
// AppAssets.homeBottom, // AppAssets.homeBottom,
// bgColor: AppColors.primaryRedColor, // bgColor: AppColors.primaryRedColor,
// true, // true,
// route: AppRoutes.homeHealthCarePage, // route: AppRoutes.homeHealthCarePage,
// ), // ),
// HmgServicesComponentModel( // HmgServicesComponentModel(
// 11, // 11,
// "Virtual Tour".needTranslation, // "Virtual Tour".needTranslation,
// "".needTranslation, // "".needTranslation,
// AppAssets.my_address, // AppAssets.my_address,
// bgColor: AppColors.quickLoginColor, // bgColor: AppColors.quickLoginColor,
// true, // true,
// route: null, // route: null,
// onTap:(){ // onTap:(){
// Utils.openWebView( // Utils.openWebView(
// url: 'https://hmgwebservices.com/vt_mobile/html/index.html', // url: 'https://hmgwebservices.com/vt_mobile/html/index.html',
// ); // );
// }, // },
// ) // )
]; ];
late final List<HmgServicesComponentModel> hmgHealthToolServices = [ late final List<HmgServicesComponentModel> hmgHealthToolServices = [
@ -539,7 +515,6 @@ class ServicesPage extends StatelessWidget {
), ),
), ),
); );
}), }),
), ),
), ),

Loading…
Cancel
Save