diff --git a/Frontend/patient_manager/lib/pages/patientAccessReview.dart b/Frontend/patient_manager/lib/pages/patientAccessReview.dart index cd511e43..72c5f392 100644 --- a/Frontend/patient_manager/lib/pages/patientAccessReview.dart +++ b/Frontend/patient_manager/lib/pages/patientAccessReview.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/components/builders/buildAccessRequestList.dart'; import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; import 'package:patient_manager/components/mihAppBar.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/mihLoadingCircle.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; @@ -267,6 +268,7 @@ class _PatientAccessRequestState extends State { final screenHeight = MediaQuery.of(context).size.height; return Scaffold( appBar: const MIHAppBar(barTitle: "Access Reviews"), + drawer: MIHAppDrawer(signedInUser: widget.signedInUser), body: viewAccessRequest(screenWidth, screenHeight), ); } diff --git a/Frontend/patient_manager/lib/pages/patientAdd.dart b/Frontend/patient_manager/lib/pages/patientAdd.dart index b789ed3a..e54610fb 100644 --- a/Frontend/patient_manager/lib/pages/patientAdd.dart +++ b/Frontend/patient_manager/lib/pages/patientAdd.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; @@ -343,6 +344,7 @@ class _AddPatientState extends State { Widget build(BuildContext context) { return Scaffold( appBar: const MIHAppBar(barTitle: "Add Patient"), + drawer: MIHAppDrawer(signedInUser: widget.signedInUser), body: KeyboardListener( focusNode: _focusNode, autofocus: true, diff --git a/Frontend/patient_manager/lib/pages/patientManager.dart b/Frontend/patient_manager/lib/pages/patientManager.dart index 8edf9c75..d69dc569 100644 --- a/Frontend/patient_manager/lib/pages/patientManager.dart +++ b/Frontend/patient_manager/lib/pages/patientManager.dart @@ -7,6 +7,7 @@ import 'package:flutter/services.dart'; import 'package:patient_manager/components/builders/buildPatientList.dart'; import 'package:patient_manager/components/builders/buildPatientQueueList.dart'; import 'package:patient_manager/components/mihAppBar.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/mihLoadingCircle.dart'; import 'package:patient_manager/components/inputsAndButtons/mihDateInput.dart'; import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; @@ -453,10 +454,7 @@ class _PatientManagerState extends State { final screenHeight = MediaQuery.of(context).size.height; return Scaffold( appBar: const MIHAppBar(barTitle: "Patient Manager"), - // drawer: PatManAppDrawer( - // userEmail: widget.userEmail, - // logo: MzanziInnovationHub.of(context)!.theme.logoImage(), - // ), + drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser), //floatingActionButtonLocation: FloatingActionButtonLocation., // floatingActionButton: FloatingActionButton.extended( // label: Text( diff --git a/Frontend/patient_manager/lib/pages/patientView.dart b/Frontend/patient_manager/lib/pages/patientView.dart index 419fb5f0..147b5247 100644 --- a/Frontend/patient_manager/lib/pages/patientView.dart +++ b/Frontend/patient_manager/lib/pages/patientView.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/mihLoadingCircle.dart'; import 'package:patient_manager/components/patientDetails.dart'; import 'package:patient_manager/components/mihAppBar.dart'; @@ -48,6 +49,14 @@ class _PatientViewState extends State { return null; } + Widget? showDrawer() { + if (widget.arguments.business == null) { + return MIHAppDrawer(signedInUser: widget.arguments.signedInUser); + } else { + return null; + } + } + @override void dispose() { // TODO: implement dispose @@ -69,10 +78,7 @@ class _PatientViewState extends State { if (snapshot.hasData) { return Scaffold( appBar: const MIHAppBar(barTitle: "Patient View"), - // drawer: MIHAppDrawer( - // signedInUser: widget.arguments.signedInUser, - // logo: MzanziInnovationHub.of(context)!.theme.logoImage(), - // ), + drawer: showDrawer(), body: SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric( diff --git a/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart b/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart index 7ac7e98a..2facd21d 100644 --- a/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart +++ b/Frontend/patient_manager/lib/pages/profileBusinessAdd.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:patient_manager/components/mihAppBar.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/mihLoadingCircle.dart'; import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; @@ -228,6 +229,7 @@ class _ProfileBusinessAddState extends State { Widget build(BuildContext context) { return Scaffold( appBar: const MIHAppBar(barTitle: "Add Business"), + drawer: MIHAppDrawer(signedInUser: widget.signedInUser), body: KeyboardListener( focusNode: _focusNode, autofocus: true, diff --git a/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart b/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart index 6a9c8e5d..3f0c39f3 100644 --- a/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart +++ b/Frontend/patient_manager/lib/pages/profileBusinessUpdate.dart @@ -4,6 +4,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:patient_manager/components/mihAppBar.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/mihLoadingCircle.dart'; import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; @@ -20,7 +21,6 @@ import 'package:http/http.dart' as http2; class ProfileBusinessUpdate extends StatefulWidget { final BusinessArguments arguments; - //final AppUser signedInUser; const ProfileBusinessUpdate({ super.key, required this.arguments, @@ -313,6 +313,7 @@ class _ProfileBusinessUpdateState extends State { Widget build(BuildContext context) { return Scaffold( appBar: const MIHAppBar(barTitle: "Business Profile"), + drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser), body: KeyboardListener( focusNode: _focusNode, autofocus: true, diff --git a/Frontend/patient_manager/lib/pages/profileUserUpdate.dart b/Frontend/patient_manager/lib/pages/profileUserUpdate.dart index 8bff00fa..6a63439d 100644 --- a/Frontend/patient_manager/lib/pages/profileUserUpdate.dart +++ b/Frontend/patient_manager/lib/pages/profileUserUpdate.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:patient_manager/components/mihAppBar.dart'; +import 'package:patient_manager/components/mihAppDrawer.dart'; import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; @@ -167,6 +168,7 @@ class _ProfileUserUpdateState extends State { Widget build(BuildContext context) { return Scaffold( appBar: const MIHAppBar(barTitle: "Update Profile"), + drawer: MIHAppDrawer(signedInUser: widget.signedInUser), body: Padding( padding: const EdgeInsets.all(15.0), child: Center(