From 4c4f2f5e289bcc5b4f898826a3613edbdfdb6dbf Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 14:47:57 +0200 Subject: [PATCH 01/18] add tool titles and and examples --- .../Example/package_test.dart | 9 +++++++ .../mih_package_components/mih_package.dart | 24 +++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart index 1f791879..41d74858 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart +++ b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart @@ -117,12 +117,21 @@ class _PackageTestState extends State { return toolBodies; } + List getToolTitle() { + List toolTitles = [ + "Tool One", + "Tool Two", + ]; + return toolTitles; + } + @override Widget build(BuildContext context) { return MihPackage( appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package.dart b/Frontend/lib/mih_components/mih_package_components/mih_package.dart index 31a0d973..963a9173 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package.dart @@ -9,6 +9,7 @@ class MihPackage extends StatefulWidget { final Widget appActionButton; final MihPackageTools appTools; final List appBody; + final List? appToolTitles; final MIHAppDrawer? actionDrawer; int selectedbodyIndex; final Function(int) onIndexChange; @@ -17,6 +18,7 @@ class MihPackage extends StatefulWidget { required this.appActionButton, required this.appTools, required this.appBody, + this.appToolTitles, this.actionDrawer, required this.selectedbodyIndex, required this.onIndexChange, @@ -112,10 +114,28 @@ class _MihPackageState extends State children: [ Row( mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, children: [ widget.appActionButton, - Flexible(child: widget.appTools), + Expanded( + child: Container( + alignment: Alignment.centerRight, + // color: Colors.black, + child: Text( + widget.appToolTitles != null + ? widget.appToolTitles![widget.selectedbodyIndex] + : "", + style: const TextStyle( + fontSize: 23, + fontWeight: FontWeight.w600, + ), + ), + ), + ), + const SizedBox( + width: 10, + ), + widget.appTools, ], ), const SizedBox(height: 5), From 17e24782ac146f7eb3cbe3ff12b2807e642b5d81 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 14:51:59 +0200 Subject: [PATCH 02/18] add tool title to MIH Home --- .../lib/mih_packages/mih_home/mih_home.dart | 9 ++++ .../package_tools/mih_business_home.dart | 48 ------------------- .../package_tools/mih_personal_home.dart | 48 ------------------- 3 files changed, 9 insertions(+), 96 deletions(-) diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index 7749b992..d27acc3b 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -72,12 +72,21 @@ class _MihHomeState extends State { } } + List getToolTitle() { + List toolTitles = [ + "Personal", + "Business", + ]; + return toolTitles; + } + @override Widget build(BuildContext context) { return MihPackage( appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), actionDrawer: getActionDrawer(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart index c0c3ab04..879b42e1 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart @@ -199,54 +199,6 @@ class _MihBusinessHomeState extends State return MihSingleChildScroll( child: Column( children: [ - // Container( - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(10), - // color: MzanziInnovationHub.of(context)!.theme.errorColor(), - // ), - // height: 40, - // child: Row( - // children: [ - // Icon( - // Icons.warning_amber_rounded, - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - // size: 40, - // ), - // const SizedBox( - // width: 5, - // ), - // Expanded( - // child: SingleChildScrollView( - // controller: _scrollController, - // scrollDirection: Axis.horizontal, - // child: Text( - // maintenanceMsg, - // style: TextStyle( - // color: MzanziInnovationHub.of(context)! - // .theme - // .primaryColor(), - // fontSize: 20, - // fontWeight: FontWeight.bold, - // ), - // ), - // ), - // ), - // ], - // ), - // ), - const SizedBox( - height: 5, - ), - const Text( - "Business Home", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - const SizedBox( - height: 10, - ), Row( mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.max, diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart index b7319716..beaa6271 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart @@ -244,54 +244,6 @@ class _MihPersonalHomeState extends State return MihSingleChildScroll( child: Column( children: [ - // Container( - // decoration: BoxDecoration( - // borderRadius: BorderRadius.circular(10), - // color: MzanziInnovationHub.of(context)!.theme.errorColor(), - // ), - // height: 40, - // child: Row( - // children: [ - // Icon( - // Icons.warning_amber_rounded, - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - // size: 40, - // ), - // const SizedBox( - // width: 5, - // ), - // Expanded( - // child: SingleChildScrollView( - // controller: _scrollController, - // scrollDirection: Axis.horizontal, - // child: Text( - // maintenanceMsg, - // style: TextStyle( - // color: MzanziInnovationHub.of(context)! - // .theme - // .primaryColor(), - // fontSize: 20, - // fontWeight: FontWeight.bold, - // ), - // ), - // ), - // ), - // ], - // ), - // ), - const SizedBox( - height: 5, - ), - const Text( - "Personal Home", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - const SizedBox( - height: 10, - ), Row( mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.max, From 607cb3560351c1bb4c6daa2f359a32a2ef319e5c Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 14:53:12 +0200 Subject: [PATCH 03/18] update spacing --- .../lib/mih_components/mih_package_components/mih_package.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package.dart b/Frontend/lib/mih_components/mih_package_components/mih_package.dart index 963a9173..ccec1656 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package.dart @@ -133,7 +133,7 @@ class _MihPackageState extends State ), ), const SizedBox( - width: 10, + width: 5, ), widget.appTools, ], From bb81d29cf727589c2b7c6fb0bb13a585b00c3ad8 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 14:57:30 +0200 Subject: [PATCH 04/18] add fitted box around title --- .../mih_package_components/mih_package.dart | 46 ++++--------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package.dart b/Frontend/lib/mih_components/mih_package_components/mih_package.dart index ccec1656..780f2599 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package.dart @@ -121,13 +121,16 @@ class _MihPackageState extends State child: Container( alignment: Alignment.centerRight, // color: Colors.black, - child: Text( - widget.appToolTitles != null - ? widget.appToolTitles![widget.selectedbodyIndex] - : "", - style: const TextStyle( - fontSize: 23, - fontWeight: FontWeight.w600, + child: FittedBox( + child: Text( + widget.appToolTitles != null + ? widget + .appToolTitles![widget.selectedbodyIndex] + : "", + style: const TextStyle( + fontSize: 23, + fontWeight: FontWeight.w600, + ), ), ), ), @@ -154,35 +157,6 @@ class _MihPackageState extends State }, ), ), - // Expanded( - // child: SwipeDetector( - // onSwipeLeft: (offset) { - // if (widget.selectedbodyIndex < - // widget.appTools.tools.length - 1) { - // setState(() { - // widget.selectedbodyIndex += 1; - // widget.onIndexChange(widget.selectedbodyIndex); - // }); - // } - // // print("swipe left"); - // }, - // onSwipeRight: (offset) { - // if (widget.selectedbodyIndex > 0) { - // setState(() { - // widget.selectedbodyIndex -= 1; - // widget.onIndexChange(widget.selectedbodyIndex); - // }); - // } - // // print("swipe right"); - // }, - // child: Row( - // children: [ - // Expanded( - // child: widget.appBody[widget.selectedbodyIndex], - // ) - // ], - // ), - // )), ], ), ), From 5b9c2529838a8b85721f0db2827fb5461926c7ca Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 14:57:41 +0200 Subject: [PATCH 05/18] add title to Mzansi Profile --- .../mzansi_profile/personal_profile/mzansi_profile.dart | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart index 40e9cc64..f721df6e 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart @@ -26,6 +26,7 @@ class _MzansiProfileState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -74,4 +75,12 @@ class _MzansiProfileState extends State { )); return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Profile", + "Settings", + ]; + return toolTitles; + } } From ec4739b2299c4cfbbd163e7d7b50c9efc15c3a40 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:00:16 +0200 Subject: [PATCH 06/18] remove title in settigns body --- .../package_tools/mih_personal_settings.dart | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart index 9b6d2ce7..0ff59135 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart @@ -106,19 +106,6 @@ class _MihPersonalSettingsState extends State { return MihSingleChildScroll( child: Column( children: [ - Text( - "Account Settings", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - const SizedBox(height: 10.0), Center( child: FaIcon( FontAwesomeIcons.trashCan, From 80d7ae1cbafeff3c2323151d59ad1d40e0a2319b Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:03:41 +0200 Subject: [PATCH 07/18] add title to Mzansi Wallet --- .../mzansi_wallet/mih_wallet.dart | 9 ++++++++ .../package_tools/mih_card_favourites.dart | 22 +------------------ .../package_tools/mih_cards.dart | 19 +--------------- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart b/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart index 36cd5398..6ff726c9 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart @@ -36,6 +36,7 @@ class _MihWalletState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -87,4 +88,12 @@ class _MihWalletState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Cards", + "Favourites", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart index 83d87a9c..fc11317a 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_wallet_apis.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; @@ -34,7 +33,7 @@ class _MihCardFavouritesState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -45,25 +44,6 @@ class _MihCardFavouritesState extends State { MihSingleChildScroll( child: Column( children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Favourites", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - ], - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), FutureBuilder( future: cardList, builder: (context, snapshot) { diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart index d48cf20d..ea03c76f 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart @@ -268,7 +268,7 @@ class _MihCardsState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -279,23 +279,6 @@ class _MihCardsState extends State { MihSingleChildScroll( child: Column( children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Loyalty Cards", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - ], - ), - const SizedBox(height: 10), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ From c9a99e619173b4db597d2fbb61af97347e3e435a Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:05:53 +0200 Subject: [PATCH 08/18] remove body border --- .../personal_profile/package_tools/mih_personal_profile.dart | 2 +- .../package_tools/mih_personal_settings.dart | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index 4e3fc410..66e7592d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -253,7 +253,7 @@ class _MihPersonalProfileState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart index 0ff59135..0fd83bf8 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart @@ -22,7 +22,10 @@ class MihPersonalSettings extends StatefulWidget { class _MihPersonalSettingsState extends State { @override Widget build(BuildContext context) { - return MihPackageToolBody(borderOn: true, bodyItem: getBody()); + return MihPackageToolBody( + borderOn: false, + bodyItem: getBody(), + ); } void deleteAccountPopUp(BuildContext ctxtd) { From 67021efd8f9db0a8e04cc74093d9f2eedbe52d17 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:15:42 +0200 Subject: [PATCH 09/18] add title to Patient Profile --- .../patient_claim_or_statement.dart | 2 +- .../package_tools/patient_consultation.dart | 22 +----------------- .../package_tools/patient_documents.dart | 23 +------------------ .../package_tools/patient_info.dart | 5 +--- .../pat_profile/patient_profile.dart | 11 +++++++++ 5 files changed, 15 insertions(+), 48 deletions(-) diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart index edd7fcb1..069562d3 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart @@ -114,7 +114,7 @@ class _PatientClaimOrStatementState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart index 8f6f9ef2..39c5cc8f 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart @@ -321,7 +321,7 @@ class _PatientConsultationState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -340,26 +340,6 @@ class _PatientConsultationState extends State { } else if (snapshot.hasData) { final notesList = snapshot.data!; return Column(children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Consultation Notes", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor()), - ), - ], - ), - Divider( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor()), - const SizedBox(height: 10), BuildNotesList( notes: notesList, signedInUser: widget.signedInUser, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart index b9a99765..200876ac 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart @@ -604,7 +604,7 @@ class _PatientDocumentsState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -623,27 +623,6 @@ class _PatientDocumentsState extends State { } else if (snapshot.hasData) { final filesList = snapshot.data!; return Column(children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - "Documents", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - ], - ), - Divider( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor()), - const SizedBox(height: 10), BuildFilesList( files: filesList, signedInUser: widget.signedInUser, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart index e53c7223..e3313d56 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart @@ -233,7 +233,7 @@ class _PatientInfoState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -260,9 +260,6 @@ class _PatientInfoState extends State { ), ), ]), - Divider( - color: - MzanziInnovationHub.of(context)!.theme.secondaryColor()), const SizedBox(height: 10), getPatientDetailsField(), const SizedBox(height: 10), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_profile.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_profile.dart index 4674ba9e..dac1a32c 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_profile.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_profile.dart @@ -27,6 +27,7 @@ class _PatientProfileState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -109,4 +110,14 @@ class _PatientProfileState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Details", + "Notes", + "Documents", + "Claims", + ]; + return toolTitles; + } } From ddeb84c9eee3bc4e57f05b5e55740d9f07a71d8d Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:18:53 +0200 Subject: [PATCH 10/18] add title to Mzansi Ai --- .../lib/mih_packages/mzansi_ai/mzansi_ai.dart | 8 +++ .../mzansi_ai/package_tools/ai_chat.dart | 49 ------------------- 2 files changed, 8 insertions(+), 49 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart b/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart index 921ab4da..a3b080cf 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart @@ -51,6 +51,13 @@ class _MzansiAiState extends State { return toolBodies; } + List getToolTitle() { + List toolTitles = [ + "Ask Mzansi", + ]; + return toolTitles; + } + @override void initState() { super.initState(); @@ -62,6 +69,7 @@ class _MzansiAiState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart index 229160eb..89b0eabf 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart @@ -610,55 +610,6 @@ class _AiChatState extends State { mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisSize: MainAxisSize.max, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - // Visibility( - // visible: _showModelOptions.value == true, - // child: IconButton.filled( - // iconSize: 20, - // onPressed: () { - // if (_showModelOptions.value == true) { - // setState(() { - // _showModelOptions.value = false; - // }); - // } else { - // setState(() { - // _showModelOptions.value = true; - // }); - // } - // }, - // icon: const Icon( - // Icons.settings, - // ), - // ), - // ), - Expanded( - child: Text( - "Mzansi AI", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - ), - // Expanded( - // child: Container( - // alignment: Alignment.centerRight, - // child: IconButton( - // onPressed: () { - // _resetChat(); - // }, - // icon: const Icon(Icons.refresh), - // ), - // ), - // ), - ], - ), _getSettings(), Expanded( child: GestureDetector( From 417007c1d69eaaff39c98524fcad4357bab2b6c5 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:23:56 +0200 Subject: [PATCH 11/18] add title to Calendar --- Frontend/lib/mih_packages/calendar/mzansi_calendar.dart | 8 ++++++++ .../calendar/package_tools/appointments.dart | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart b/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart index 02623f8b..ba4d964f 100644 --- a/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart +++ b/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart @@ -25,6 +25,7 @@ class _MzansiCalendarState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -72,4 +73,11 @@ class _MzansiCalendarState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + widget.arguments.personalSelected == true ? "Personal" : "Business", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index fd71df61..64247cdc 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -253,13 +253,6 @@ class _PatientAccessRequestState extends State { MihSingleChildScroll( child: Column( children: [ - Text( - getTitle(), - style: const TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), MIHCalendar( calendarWidth: 500, rowHeight: 35, @@ -370,7 +363,7 @@ class _PatientAccessRequestState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } From e79179e28d5ca91aaaedb2cc8e000088e85a774c Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:28:06 +0200 Subject: [PATCH 12/18] add title to Calculator --- .../mih_packages/calculator/mih_calculator.dart | 9 +++++++++ .../calculator/package_tools/simple_calc.dart | 14 +------------- .../calculator/package_tools/tip_calc.dart | 14 +------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/Frontend/lib/mih_packages/calculator/mih_calculator.dart b/Frontend/lib/mih_packages/calculator/mih_calculator.dart index 35211842..e64d05f5 100644 --- a/Frontend/lib/mih_packages/calculator/mih_calculator.dart +++ b/Frontend/lib/mih_packages/calculator/mih_calculator.dart @@ -25,6 +25,7 @@ class _MIHCalculatorState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selectedIndex, onIndexChange: (newValue) { setState(() { @@ -71,4 +72,12 @@ class _MIHCalculatorState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Simple Calculator", + "Tip Calculator", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart index cbf667c2..2872f61d 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart @@ -72,7 +72,7 @@ class _SimpleCalcState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -96,18 +96,6 @@ class _SimpleCalcState extends State { mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - Text( - "Simple Calculator", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - const SizedBox(height: 10), Container( padding: const EdgeInsets.all(20), alignment: Alignment.centerRight, diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index a15aacf5..8f32e1d8 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -263,7 +263,7 @@ class _TipCalcState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -273,18 +273,6 @@ class _TipCalcState extends State { child: Column( mainAxisSize: MainAxisSize.max, children: [ - Text( - "Tip Calculator", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - const SizedBox(height: 10), MIHNumberField( controller: billAmountController, hintText: "Bill Amount", From 87777d54355cfe23c32ff969cc8a173ecefbff89 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:31:23 +0200 Subject: [PATCH 13/18] add title to Access Controlls --- .../lib/mih_packages/access_review/mih_access.dart | 8 ++++++++ .../package_tools/mih_access_requests.dart | 10 +--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Frontend/lib/mih_packages/access_review/mih_access.dart b/Frontend/lib/mih_packages/access_review/mih_access.dart index 894c7c17..df6f5a82 100644 --- a/Frontend/lib/mih_packages/access_review/mih_access.dart +++ b/Frontend/lib/mih_packages/access_review/mih_access.dart @@ -24,6 +24,7 @@ class _MihAccessState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -66,4 +67,11 @@ class _MihAccessState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Access", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart index 6df24575..17684f14 100644 --- a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart +++ b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart @@ -131,14 +131,6 @@ class _MihAccessRequestState extends State { return MihSingleChildScroll( child: Column( children: [ - const Text( - "Access List", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - const SizedBox(height: 10), Row( mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.max, @@ -245,7 +237,7 @@ class _MihAccessRequestState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } From 7c6d0d065082ecfbea3ea54398ceab75fc07654a Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:37:25 +0200 Subject: [PATCH 14/18] add title to About MIH --- .../lib/mih_packages/about_mih/about_mih.dart | 11 ++++++++++ .../policy_and_terms_text.dart | 22 ------------------- .../package_tools/mih_ attributes.dart | 15 ++----------- .../about_mih/package_tools/mih_info.dart | 2 +- .../package_tools/mih_privacy_policy.dart | 2 +- .../package_tools/mih_terms_of_service.dart | 2 +- 6 files changed, 16 insertions(+), 38 deletions(-) diff --git a/Frontend/lib/mih_packages/about_mih/about_mih.dart b/Frontend/lib/mih_packages/about_mih/about_mih.dart index 3309cd6f..e71da5d1 100644 --- a/Frontend/lib/mih_packages/about_mih/about_mih.dart +++ b/Frontend/lib/mih_packages/about_mih/about_mih.dart @@ -35,6 +35,7 @@ class _AboutMihState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -93,4 +94,14 @@ class _AboutMihState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "About", + "Privacy Policy", + "Terms of Service", + "Attributes", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart index 2d2d4f10..304bb957 100644 --- a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart +++ b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart @@ -35,17 +35,6 @@ class PolicyAndTermsText { ), ), const SizedBox(height: 10), - const Text( - "Privacy Policy", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 30, - ), - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 10.0), - child: Divider(), - ), //=============== Effective Date =============== SizedBox( width: 1250, @@ -445,17 +434,6 @@ class PolicyAndTermsText { const SizedBox( height: 10, ), - const Text( - "Terms of Service", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 30, - ), - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 10.0), - child: Divider(), - ), //=============== Effective Date =============== SizedBox( width: 1250, diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart index 040f178b..4d0d5a18 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart @@ -91,7 +91,7 @@ class _MihAttributesState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -110,22 +110,11 @@ class _MihAttributesState extends State { Icon( MihIcons.mihLogo, color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - size: 125, + size: 165, ), const SizedBox( height: 10, ), - const Text( - 'Attributions', - style: TextStyle( - fontSize: 30, - fontWeight: FontWeight.bold, - ), - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 10.0), - child: Divider(), - ), SelectableText( message, style: const TextStyle( diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index f1291956..16aae34b 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -486,7 +486,7 @@ class _MihInfoState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart index 9fa2dee6..85a3f590 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart @@ -9,7 +9,7 @@ class MihPrivacyPolicy extends StatelessWidget { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(context), ); } diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart index ad1654ad..c4bbc12b 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart @@ -9,7 +9,7 @@ class MIHTermsOfService extends StatelessWidget { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(context), ); } From e538af256507e2d7154eed5fda7fee8905d9eba4 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:46:27 +0200 Subject: [PATCH 15/18] add title to Business Profile --- .../business_profile/mzansi_business_profile.dart | 11 +++++++++++ .../package_tools/mih_business_details.dart | 11 +---------- .../package_tools/mih_business_user_search.dart | 10 +--------- .../package_tools/mih_my_business_team.dart | 11 +---------- .../package_tools/mih_my_business_user.dart | 12 +----------- 5 files changed, 15 insertions(+), 40 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile.dart index 0344cc3e..8d3d2aaa 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile.dart @@ -50,6 +50,7 @@ class _MzansiBusinessProfileState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -145,4 +146,14 @@ class _MzansiBusinessProfileState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Profile", + "User", + "Team", + "Add Member", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart index 998b021c..3a409e1f 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart @@ -234,7 +234,7 @@ class _MihBusinessDetailsState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(context), ); } @@ -243,15 +243,6 @@ class _MihBusinessDetailsState extends State { return MihSingleChildScroll( child: Column( children: [ - const Text( - "Business Details", - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - ), - ), - Divider(color: MzanziInnovationHub.of(context)?.theme.secondaryColor()), - const SizedBox(height: 10), MihCircleAvatar( imageFile: widget.logoImage, width: 150, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart index 294567b2..5a14c208 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart @@ -92,7 +92,7 @@ class _MihBusinessUserSearchState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -109,14 +109,6 @@ class _MihBusinessUserSearchState extends State { } }, child: Column(mainAxisSize: MainAxisSize.max, children: [ - const Text( - "User Search", - style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - ), - //spacer - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - const SizedBox(height: 10), MIHSearchField( controller: searchController, hintText: "Username or Email Search", diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart index bf673538..f21a4b84 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart @@ -75,7 +75,7 @@ class _MihMyBusinessTeamState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -83,15 +83,6 @@ class _MihMyBusinessTeamState extends State { Widget getBody() { return MihSingleChildScroll( child: Column(mainAxisSize: MainAxisSize.max, children: [ - const Text( - "Business Team", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - const SizedBox(height: 10), FutureBuilder( future: employeeList, builder: (context, snapshot) { diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart index 76afd97d..95ef8c7d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart @@ -206,7 +206,7 @@ class _MihMyBusinessUserState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -215,16 +215,6 @@ class _MihMyBusinessUserState extends State { return MihSingleChildScroll( child: Column( children: [ - const Text( - "My Business User", - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - ), - ), - Divider( - color: MzanziInnovationHub.of(context)?.theme.secondaryColor()), - const SizedBox(height: 10), MihCircleAvatar( imageFile: widget.userProPicImage, width: 150, From fa95946634e5d97d031284b19f66c1aeb72548b5 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:52:19 +0200 Subject: [PATCH 16/18] add title to Pat Man --- .../package_tools/mih_patient_search.dart | 10 +--- .../package_tools/my_patient_list.dart | 46 +++++++++---------- .../package_tools/waiting_room.dart | 9 +--- .../pat_manager/pat_manager.dart | 10 ++++ 4 files changed, 35 insertions(+), 40 deletions(-) diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart index f7a66015..b3be02cb 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart @@ -54,14 +54,6 @@ class _MihPatientSearchState extends State { } }, child: Column(mainAxisSize: MainAxisSize.max, children: [ - const Text( - "MIH Patient Lookup", - style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - //spacer - const SizedBox(height: 10), Row( mainAxisSize: MainAxisSize.min, children: [ @@ -222,7 +214,7 @@ class _MihPatientSearchState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getPatientSearch(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart index a37ef53a..a532bb93 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart @@ -55,28 +55,28 @@ class _MyPatientListState extends State { } }, child: Column(mainAxisSize: MainAxisSize.max, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - "My Patient List", - style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - ), - IconButton( - iconSize: 20, - icon: const Icon( - Icons.refresh, - ), - onPressed: () { - getMyPatientList(); - }, - ), - ], - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - //spacer - const SizedBox(height: 10), + // Row( + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // const Text( + // "My Patient List", + // style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), + // ), + // IconButton( + // iconSize: 20, + // icon: const Icon( + // Icons.refresh, + // ), + // onPressed: () { + // getMyPatientList(); + // }, + // ), + // ], + // ), + // Divider( + // color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), + // //spacer + // const SizedBox(height: 10), Row( mainAxisSize: MainAxisSize.min, children: [ @@ -202,7 +202,7 @@ class _MyPatientListState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: myPatientListTool(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart index 7b7d5dc0..453ea6ce 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart @@ -67,13 +67,6 @@ class _WaitingRoomState extends State { MihSingleChildScroll( child: Column( children: [ - const Text( - "Waiting Room", - style: const TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), MIHCalendar( calendarWidth: 500, rowHeight: 35, @@ -466,7 +459,7 @@ class _WaitingRoomState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBusinessAppointmentsTool(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/pat_manager.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/pat_manager.dart index 2b9d68f9..5a436c92 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/pat_manager.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/pat_manager.dart @@ -33,6 +33,7 @@ class _PatManagerState extends State { appActionButton: getActionButton(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { setState(() { @@ -108,4 +109,13 @@ class _PatManagerState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Waiting Room", + "Patients", + "Search Patients", + ]; + return toolTitles; + } } From bf2082c6a83617072ff41d42d8f1650875b6f2ee Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 16:20:26 +0200 Subject: [PATCH 17/18] add padding param to body and update packages --- .../mih_package_components/mih_package_tool_body.dart | 10 ++++++---- .../about_mih/package_tools/mih_ attributes.dart | 1 + .../mih_packages/about_mih/package_tools/mih_info.dart | 1 + .../about_mih/package_tools/mih_privacy_policy.dart | 1 + .../about_mih/package_tools/mih_terms_of_service.dart | 1 + .../package_tools/mih_access_requests.dart | 1 + .../calculator/package_tools/simple_calc.dart | 1 + .../calculator/package_tools/tip_calc.dart | 1 + .../package_tools/mih_business_details.dart | 1 + .../package_tools/mih_business_user_search.dart | 1 + .../package_tools/mih_my_business_user.dart | 1 + .../package_tools/mih_personal_profile.dart | 1 + .../package_tools/mih_personal_settings.dart | 1 + .../pat_manager/package_tools/mih_patient_search.dart | 1 + .../pat_manager/package_tools/my_patient_list.dart | 1 + .../pat_profile/package_tools/patient_info.dart | 1 + 16 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart index 75b1a9d6..ca82404d 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart @@ -4,10 +4,12 @@ import 'package:flutter/material.dart'; class MihPackageToolBody extends StatefulWidget { final bool borderOn; final Widget bodyItem; + final double? innerHorizontalPadding; const MihPackageToolBody({ super.key, required this.borderOn, required this.bodyItem, + this.innerHorizontalPadding, }); @override @@ -19,16 +21,16 @@ class _MihPackageToolBodyState extends State { double getHorizontalPaddingSize(Size screenSize) { if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { if (widget.borderOn) { - return 10; + return widget.innerHorizontalPadding ?? 10; } else { - return 0; + return widget.innerHorizontalPadding ?? 0; } } else { // mobile if (widget.borderOn) { - return 10; + return widget.innerHorizontalPadding ?? 10; } else { - return 0; + return widget.innerHorizontalPadding ?? 0; } } } diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart index 4d0d5a18..685e9654 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart @@ -92,6 +92,7 @@ class _MihAttributesState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index 16aae34b..f4b817e2 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -487,6 +487,7 @@ class _MihInfoState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart index 85a3f590..bb3037d7 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart @@ -10,6 +10,7 @@ class MihPrivacyPolicy extends StatelessWidget { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(context), ); } diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart index c4bbc12b..b4bf202f 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart @@ -10,6 +10,7 @@ class MIHTermsOfService extends StatelessWidget { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(context), ); } diff --git a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart index 17684f14..67c0ffd9 100644 --- a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart +++ b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart @@ -238,6 +238,7 @@ class _MihAccessRequestState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart index 2872f61d..da597f55 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart @@ -73,6 +73,7 @@ class _SimpleCalcState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index 8f32e1d8..2f136aac 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -264,6 +264,7 @@ class _TipCalcState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart index 3a409e1f..3e764e39 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart @@ -235,6 +235,7 @@ class _MihBusinessDetailsState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(context), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart index 5a14c208..b13d21d5 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart @@ -93,6 +93,7 @@ class _MihBusinessUserSearchState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart index 95ef8c7d..a847e052 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart @@ -207,6 +207,7 @@ class _MihMyBusinessUserState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index 66e7592d..f6811854 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -254,6 +254,7 @@ class _MihPersonalProfileState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart index 0fd83bf8..f9a7739a 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart @@ -24,6 +24,7 @@ class _MihPersonalSettingsState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart index b3be02cb..cc762980 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart @@ -215,6 +215,7 @@ class _MihPatientSearchState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getPatientSearch(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart index a532bb93..0b649b4f 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart @@ -203,6 +203,7 @@ class _MyPatientListState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: myPatientListTool(), ); } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart index e3313d56..a683b636 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart @@ -234,6 +234,7 @@ class _PatientInfoState extends State { Widget build(BuildContext context) { return MihPackageToolBody( borderOn: false, + innerHorizontalPadding: 10, bodyItem: getBody(), ); } From 6f7ee782897ba60109a140be819fb858494b0493 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 16:26:29 +0200 Subject: [PATCH 18/18] move body menu --- .../lib/mih_packages/about_mih/package_tools/mih_info.dart | 4 ++-- .../lib/mih_packages/calendar/package_tools/appointments.dart | 4 ++-- .../lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart | 4 ++-- .../mih_packages/mzansi_wallet/package_tools/mih_cards.dart | 4 ++-- .../pat_manager/package_tools/waiting_room.dart | 4 ++-- .../pat_profile/package_tools/patient_claim_or_statement.dart | 4 ++-- .../pat_profile/package_tools/patient_consultation.dart | 4 ++-- .../pat_profile/package_tools/patient_documents.dart | 4 ++-- .../pat_profile/package_tools/patient_info.dart | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index f4b817e2..f5aa2597 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -621,8 +621,8 @@ class _MihInfoState extends State { ), ), Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.share, children: [ diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index 64247cdc..abf7f20b 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -299,8 +299,8 @@ class _PatientAccessRequestState extends State { ), ), Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.add, animatedIcon: AnimatedIcons.menu_close, diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart index 89b0eabf..bb4b0cfc 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart @@ -660,8 +660,8 @@ class _AiChatState extends State { ), ), Positioned( - right: 0, - bottom: 70, + right: 10, + bottom: 80, child: MihFloatingMenu( animatedIcon: AnimatedIcons.menu_close, children: [ diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart index ea03c76f..16b0a4a1 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart @@ -341,8 +341,8 @@ class _MihCardsState extends State { ), ), Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( animatedIcon: AnimatedIcons.menu_close, children: [ diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart index 453ea6ce..6d378e83 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart @@ -115,8 +115,8 @@ class _WaitingRoomState extends State { ), ), Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.add, animatedIcon: AnimatedIcons.menu_close, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart index 069562d3..ba1b7d16 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart @@ -176,8 +176,8 @@ class _PatientClaimOrStatementState extends State { Visibility( visible: widget.type != "personal", child: Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.file_copy, animatedIcon: AnimatedIcons.menu_close, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart index 39c5cc8f..f07237e6 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart @@ -360,8 +360,8 @@ class _PatientConsultationState extends State { Visibility( visible: widget.type != "personal", child: Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.add, animatedIcon: AnimatedIcons.menu_close, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart index 200876ac..c0719953 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart @@ -394,8 +394,8 @@ class _PatientDocumentsState extends State { Widget getMenu() { if (widget.type == "personal") { return Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.add, animatedIcon: AnimatedIcons.menu_close, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart index a683b636..310c4769 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart @@ -285,8 +285,8 @@ class _PatientInfoState extends State { Visibility( visible: widget.type == "personal", child: Positioned( - right: 0, - bottom: 0, + right: 10, + bottom: 10, child: MihFloatingMenu( icon: Icons.add, animatedIcon: AnimatedIcons.menu_close,