From e7523377ff8977fe2c083cc8555bd8c05115821a Mon Sep 17 00:00:00 2001 From: yaso-meth Date: Thu, 8 Aug 2024 15:28:00 +0200 Subject: [PATCH] change arges to cater for selected patient --- .../patient_manager/lib/components/addOrViewPatient.dart | 7 ++++++- Frontend/patient_manager/lib/components/homeTileGrid.dart | 8 +++++--- Frontend/patient_manager/lib/objects/arguments.dart | 3 +++ Frontend/patient_manager/lib/router/routeGenerator.dart | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Frontend/patient_manager/lib/components/addOrViewPatient.dart b/Frontend/patient_manager/lib/components/addOrViewPatient.dart index b23e5c7c..24cbbe3c 100644 --- a/Frontend/patient_manager/lib/components/addOrViewPatient.dart +++ b/Frontend/patient_manager/lib/components/addOrViewPatient.dart @@ -56,7 +56,12 @@ class _AddOrViewPatientState extends State { if (snapshot.hasData) { // Extracting data from snapshot object //final data = snapshot.data as String; - return PatientView(arguments: widget.arguments); + return PatientView( + arguments: PatientViewArguments( + widget.arguments.signedInUser, + snapshot.requireData, + widget.arguments.type, + )); } } return AddPatient(signedInUser: widget.arguments.signedInUser); diff --git a/Frontend/patient_manager/lib/components/homeTileGrid.dart b/Frontend/patient_manager/lib/components/homeTileGrid.dart index 26d759a1..f65f8dbf 100644 --- a/Frontend/patient_manager/lib/components/homeTileGrid.dart +++ b/Frontend/patient_manager/lib/components/homeTileGrid.dart @@ -104,8 +104,10 @@ class _HomeTileGridState extends State { Icons.medication, "Patient Profile", () { + //comeback here Navigator.of(context).pushNamed('/patient-profile', - arguments: PatientViewArguments(widget.signedInUser, "personal")); + arguments: + PatientViewArguments(widget.signedInUser, null, "personal")); // Navigator.popAndPushNamed(context, '/patient-manager', // arguments: widget.userEmail); } @@ -140,8 +142,8 @@ class _HomeTileGridState extends State { Icons.medication, "Manage Patient", () { - Navigator.of(context).pushNamed('/patient-manager', - arguments: widget.signedInUser.email); + Navigator.of(context) + .pushNamed('/patient-manager', arguments: widget.signedInUser); // Navigator.popAndPushNamed(context, '/patient-manager', // arguments: widget.userEmail); } diff --git a/Frontend/patient_manager/lib/objects/arguments.dart b/Frontend/patient_manager/lib/objects/arguments.dart index 39bd1dde..44f56f72 100644 --- a/Frontend/patient_manager/lib/objects/arguments.dart +++ b/Frontend/patient_manager/lib/objects/arguments.dart @@ -1,6 +1,7 @@ import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/business.dart'; import 'package:patient_manager/objects/businessUser.dart'; +import 'package:patient_manager/objects/patients.dart'; class BusinessUpdateArguments { final AppUser signedInUser; @@ -16,10 +17,12 @@ class BusinessUpdateArguments { class PatientViewArguments { final AppUser signedInUser; + final Patient? selectedPatient; final String type; PatientViewArguments( this.signedInUser, + this.selectedPatient, this.type, ); } diff --git a/Frontend/patient_manager/lib/router/routeGenerator.dart b/Frontend/patient_manager/lib/router/routeGenerator.dart index 8f3da148..0d701c2d 100644 --- a/Frontend/patient_manager/lib/router/routeGenerator.dart +++ b/Frontend/patient_manager/lib/router/routeGenerator.dart @@ -38,11 +38,11 @@ class RouteGenerator { return _errorRoute(); case '/patient-manager': - if (args is String) { + if (args is AppUser) { //print("route generator: $args"); return MaterialPageRoute( builder: (_) => PatientManager( - userEmail: args, + signedInUser: args, ), ); }