diff --git a/Frontend/lib/mih_apis/mih_api_calls.dart b/Frontend/lib/mih_apis/mih_api_calls.dart index e8020fce..06d277f1 100644 --- a/Frontend/lib/mih_apis/mih_api_calls.dart +++ b/Frontend/lib/mih_apis/mih_api_calls.dart @@ -258,7 +258,7 @@ class MIHApiCalls { /// AppUser signedInUser, /// BuildContext context, /// - /// Returns void (on success 200 navigate to /access-review ). + /// Returns void (on success 200 navigate to /mih-access ). static Future updatePatientAccessAPICall( String business_id, String business_name, @@ -290,7 +290,7 @@ class MIHApiCalls { Navigator.of(context).pop(); Navigator.of(context).pop(); Navigator.of(context).pushNamed( - '/access-review', + '/mih-access', arguments: signedInUser, ); String message = ""; @@ -314,7 +314,7 @@ class MIHApiCalls { /// String app_id, /// BuildContext context, /// - /// Returns void (on success 200 navigate to /access-review ). + /// Returns void (on success 200 navigate to /mih-access ). static Future reapplyPatientAccessAPICall( String business_id, String app_id, diff --git a/Frontend/lib/mih_apis/mih_notification_apis.dart b/Frontend/lib/mih_apis/mih_notification_apis.dart index ab84d871..ffeafaa3 100644 --- a/Frontend/lib/mih_apis/mih_notification_apis.dart +++ b/Frontend/lib/mih_apis/mih_notification_apis.dart @@ -36,7 +36,7 @@ class MihNotificationApis { "notification_type": "Forever Access Request", "notification_message": "A new Forever Access Request has been sent by $business_name in order to access your Patient Profile. Please review request.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { @@ -83,7 +83,7 @@ class MihNotificationApis { "notification_type": "Re-applying for Access", "notification_message": "${args.business!.Name} is re-applying for access to your Patient Profile. Please review request.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index 93d66744..72e60154 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -303,7 +303,7 @@ class _MIHHomeState extends State { videoID: "", onTap: () { Navigator.of(context).pushNamed( - '/access-review', + '/mih-access', arguments: widget.signedInUser, ); }, @@ -383,7 +383,7 @@ class _MIHHomeState extends State { // tileList.add(MIHTile( // onTap: () { // Navigator.of(context).pushNamed( - // '/access-review', + // '/mih-access', // arguments: widget.signedInUser, // ); // }, diff --git a/Frontend/lib/mih_packages/patient_profile/builder/build_patient_access_list.dart b/Frontend/lib/mih_packages/patient_profile/builder/build_patient_access_list.dart index cb87a3d9..250839fd 100644 --- a/Frontend/lib/mih_packages/patient_profile/builder/build_patient_access_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/builder/build_patient_access_list.dart @@ -99,7 +99,7 @@ class _BuildPatientsListState extends State { "notification_type": "New Appointment Booked", "notification_message": "A new Appointment has been booked by ${widget.arguments.business!.Name} for the ${dateController.text} ${timeController.text}. Please approve the Access Review request.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { diff --git a/Frontend/lib/mih_packages/patient_profile/builder/build_patient_list.dart b/Frontend/lib/mih_packages/patient_profile/builder/build_patient_list.dart index 0631d825..03d3ccb6 100644 --- a/Frontend/lib/mih_packages/patient_profile/builder/build_patient_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/builder/build_patient_list.dart @@ -139,7 +139,7 @@ class _BuildPatientsListState extends State { "notification_type": "New Appointment Booked", "notification_message": "A new Appointment has been booked by ${widget.arguments.business!.Name} for the ${dateController.text} ${timeController.text}. Please approve the Access Review request.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { diff --git a/Frontend/lib/mih_packages/patient_profile/builder/build_patient_queue_list.dart b/Frontend/lib/mih_packages/patient_profile/builder/build_patient_queue_list.dart index e3ba97dc..bdd795bd 100644 --- a/Frontend/lib/mih_packages/patient_profile/builder/build_patient_queue_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/builder/build_patient_queue_list.dart @@ -325,7 +325,7 @@ class _BuildPatientsListState extends State { "notification_type": "Appointment Cancelled", "notification_message": "Your appointment with ${widget.business!.Name} for the ${widget.patientQueue[index].date_time.replaceAll("T", " ")} has been cancelled.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { @@ -361,7 +361,7 @@ class _BuildPatientsListState extends State { "notification_type": "Rescheduled Appointment", "notification_message": "Your appointment with ${widget.business!.Name} for the ${widget.patientQueue[index].date_time.replaceAll("T", " ").substring(0, widget.patientQueue[index].date_time.length - 3)} has been rescheduled to the ${dateController.text} ${timeController.text}.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { @@ -397,7 +397,7 @@ class _BuildPatientsListState extends State { // "notification_type": "Access Extension Request", // "notification_message": // "${widget.business!.Name} - access expiry date extension for appointment: ${widget.patientQueue[index].date_time.split("T")[0]}. Expiry Date: from ${widget.patientQueue[index].revoke_date.split("T")[0]} to ${revokeDate.split(" ")[0]}.", - // "action_path": "/access-review", + // "action_path": "/mih-access", // }), // ); // if (response.statusCode == 201) { diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart index 43b54599..623f14b5 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart @@ -100,7 +100,7 @@ class _BuildPatientsListState extends State { "notification_type": "New Appointment Booked", "notification_message": "A new Appointment has been booked by ${widget.business!.Name} for the ${dateController.text} ${timeController.text}. Please approve the Access Review request.", - "action_path": "/access-review", + "action_path": "/mih-access", }), ); if (response.statusCode == 201) { diff --git a/Frontend/lib/mih_router/routeGenerator.dart b/Frontend/lib/mih_router/routeGenerator.dart index 8b2c1b77..d47fc6e1 100644 --- a/Frontend/lib/mih_router/routeGenerator.dart +++ b/Frontend/lib/mih_router/routeGenerator.dart @@ -2,6 +2,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/test/package_te import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/about_mih.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/mih_privacy_polocy_external.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/mih_terms_of_service_external.dart'; +import 'package:Mzansi_Innovation_Hub/mih_packages/access_review/mih_access.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/calculator/mih_calculator.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/calendar/mzansi_calendar.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_ai/mzansi_ai.dart'; @@ -23,8 +24,6 @@ import '../mih_packages/authentication/forgot_password.dart'; import '../mih_packages/authentication/reset_password.dart'; import '../mih_packages/patient_profile/full_screen_file.dart'; import '../mih_packages/manage_business/manage_business_profile.dart'; -import '../mih_packages/access_review/patient_access_review.dart'; - import '../mih_packages/patient_profile/patient_view.dart'; import '../mih_packages/manage_business/profile_business_add.dart'; import '../mih_packages/manage_business/business_details.dart'; @@ -214,14 +213,17 @@ class RouteGenerator { //=============================================================== // Access Review Page - case '/access-review': + case '/mih-access': if (args is AppUser) { //print("route generator: $args"); return MaterialPageRoute( settings: settings, - builder: (_) => PatientAccessRequest( + builder: (_) => MihAccess( signedInUser: args, ), + // PatientAccessRequest( + // signedInUser: args, + // ), ); } return _errorRoute();