From b8c962e75d84c0946db302ce5e8d8721a32db6c8 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 27 Mar 2025 15:27:30 +0200 Subject: [PATCH 1/8] Search wording --- .../mih_packages/mih_home/package_tools/mih_personal_home.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bdd4b92e..f010a642 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 @@ -193,7 +193,7 @@ class _MihPersonalHomeState extends State { child: SizedBox( child: MIHSearchField( controller: searchController, - hintText: "Search Mzansi Packages", + hintText: "Search MIH Packages", required: false, editable: true, onTap: () {}, From 4fd2c139d5e2a5796e6ed79c42d0b762ea48e63f Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 27 Mar 2025 15:27:42 +0200 Subject: [PATCH 2/8] add patient title change --- .../mih_packages/patient_profile/pat_profile/patient_add.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart index b01d0d16..73f5ad58 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart @@ -330,7 +330,7 @@ class _AddPatientState extends State { headerAlignment: MainAxisAlignment.center, headerItems: [ Text( - "Add Patient Details", + "Set Up Patient Profile", style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25, From 4f5ed39a73409107323dad16accb5371b1d03c38 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 28 Mar 2025 09:18:01 +0200 Subject: [PATCH 3/8] update mzansi profile path --- .../lib/mih_packages/mih_home/components/mih_app_drawer.dart | 2 +- Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart index da5d5416..5201457b 100644 --- a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart +++ b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart @@ -47,7 +47,7 @@ class _MIHAppDrawerState extends State { onTap: () { Navigator.of(context).pop(); Navigator.of(context).pushNamed( - '/user-profile', + '/mzansi-profile', arguments: AppProfileUpdateArguments( widget.signedInUser, widget.propicFile), ); diff --git a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart index b945be40..cb44717a 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -93,7 +93,7 @@ class _MIHHomeLegacyState extends State { tileList.add(MIHTile( videoID: "jFV3NN65DtQ", onTap: () { - Navigator.of(context).pushNamed('/user-profile', + Navigator.of(context).pushNamed('/mzansi-profile', arguments: AppProfileUpdateArguments( widget.signedInUser, widget.propicFile)); }, From 38974a82b6cdf29fdbbe3ebd596ed1388f7aea40 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 28 Mar 2025 09:20:09 +0200 Subject: [PATCH 4/8] update nav podst update --- .../package_tools/mih_business_profile.dart | 10 +++++----- .../package_tools/mih_personal_profile.dart | 14 +++++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_profile.dart index 9b2b1f07..c60c319d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_profile.dart @@ -122,12 +122,12 @@ class _MihBusinessProfileState extends State { } Navigator.of(context).pop(); Navigator.of(context).pop(); + Navigator.of(context).pop(); Navigator.of(context).pushNamed( - '/business-profile/manage', - arguments: BusinessArguments( - widget.arguments.signedInUser, - widget.arguments.businessUser, - widget.arguments.business, + '/', + arguments: AuthArguments( + false, + false, ), ); String message = 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 2e9d9b83..a45b0a5b 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 @@ -144,12 +144,20 @@ class _MihPersonalProfileState extends State { //print("Here4"); //print(response.statusCode); if (response.statusCode == 200) { + Navigator.of(context).pop(); Navigator.of(context).pop(); Navigator.of(context).pushNamed( - '/user-profile', - arguments: AppProfileUpdateArguments( - widget.arguments.signedInUser, widget.arguments.propicFile), + '/', + arguments: AuthArguments( + true, + false, + ), ); + // Navigator.of(context).pushNamed( + // '/mzansi-profile', + // arguments: AppProfileUpdateArguments( + // widget.arguments.signedInUser, widget.arguments.propicFile), + // ); String message = "${widget.arguments.signedInUser.email}'s information has been updated successfully!"; successPopUp(message); From 2814965fa6c380a950146fe431b0eaaae2853dff Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 28 Mar 2025 09:37:57 +0200 Subject: [PATCH 5/8] new set up user tile --- .../mzansi_setup_profile_tile.dart | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart new file mode 100644 index 00000000..7f6f8a8d --- /dev/null +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart @@ -0,0 +1,47 @@ +import 'package:Mzansi_Innovation_Hub/main.dart'; +import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_tile.dart'; +import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart'; +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; +import 'package:flutter/material.dart'; + +class MzansiSetupProfileTile extends StatefulWidget { + final AppUser signedInUser; + final ImageProvider? propicFile; + final double packageSize; + + const MzansiSetupProfileTile({ + super.key, + required this.signedInUser, + required this.propicFile, + required this.packageSize, + }); + + @override + State createState() => _MzansiSetupProfileTileState(); +} + +class _MzansiSetupProfileTileState extends State { + @override + Widget build(BuildContext context) { + ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); + return MihAppTile( + onTap: () { + Navigator.of(context).pushNamed( + '/mzansi-profile', + arguments: AppProfileUpdateArguments( + widget.signedInUser, + widget.propicFile, + ), + ); + }, + appName: "Setup Profile", + appIcon: Container( + padding: const EdgeInsets.all(25), + child: Image(image: logo), + ), + iconSize: widget.packageSize, + primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ); + } +} From 8a37a43dce960fed3230944312cf9ef041d974fa Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 28 Mar 2025 09:38:14 +0200 Subject: [PATCH 6/8] change tile if new or existing users --- .../lib/mih_packages/mih_home/mih_home.dart | 25 ++++++++++++++----- .../package_tools/mih_personal_home.dart | 21 +++++++++++++++- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index 93e5952e..c1ecc9eb 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -46,7 +46,7 @@ class MihHome extends StatefulWidget { class _MihHomeState extends State { final proPicController = TextEditingController(); - int _selcetedIndex = 0; + late int _selcetedIndex; late bool _personalSelected; @override @@ -57,7 +57,18 @@ class _MihHomeState extends State { @override void initState() { super.initState(); - _personalSelected = widget.personalSelected; + + if (widget.personalSelected == true) { + setState(() { + _selcetedIndex = 0; + _personalSelected = true; + }); + } else { + setState(() { + _selcetedIndex = 1; + _personalSelected = false; + }); + } } @override @@ -69,15 +80,14 @@ class _MihHomeState extends State { actionDrawer: getActionDrawer(), selectedbodyIndex: _selcetedIndex, onIndexChange: (newValue) { - setState(() { - _selcetedIndex = newValue; - }); - if (newValue == 0) { + if (_selcetedIndex == 0) { setState(() { + _selcetedIndex = newValue; _personalSelected = true; }); } else { setState(() { + _selcetedIndex = newValue; _personalSelected = false; }); } @@ -121,12 +131,14 @@ class _MihHomeState extends State { temp[const Icon(Icons.person)] = () { setState(() { _selcetedIndex = 0; + _personalSelected = true; }); }; if (widget.isBusinessUser) { temp[const Icon(Icons.business_center)] = () { setState(() { _selcetedIndex = 1; + _personalSelected = false; }); }; } @@ -145,6 +157,7 @@ class _MihHomeState extends State { business: widget.business, businessUser: widget.businessUser, propicFile: widget.propicFile, + isUserNew: widget.isUserNew, ), ); if (widget.isBusinessUser) { 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 f010a642..58b10ce8 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 @@ -12,6 +12,7 @@ import 'package:Mzansi_Innovation_Hub/mih_packages/calculator/package_tiles/mih_ import 'package:Mzansi_Innovation_Hub/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart'; +import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/patient_profile/pat_profile/package_tiles/patient_profile_tile.dart'; import 'package:flutter/material.dart'; @@ -23,6 +24,7 @@ class MihPersonalHome extends StatefulWidget { final Business? business; final BusinessUser? businessUser; final ImageProvider? propicFile; + final bool isUserNew; const MihPersonalHome({ super.key, @@ -31,6 +33,7 @@ class MihPersonalHome extends StatefulWidget { required this.business, required this.businessUser, required this.propicFile, + required this.isUserNew, }); @override @@ -44,6 +47,18 @@ class _MihPersonalHomeState extends State { ValueNotifier([]); double packageSize = 200; + List> setNerUserPersonalPackage() { + List> temp = []; + temp.add({ + "Setup Profile": MzansiSetupProfileTile( + signedInUser: widget.signedInUser, + propicFile: widget.propicFile, + packageSize: packageSize, + ) + }); + return temp; + } + List> setPersonalPackagesMap() { List> temp = []; //=============== Mzansi Profile =============== @@ -154,7 +169,11 @@ class _MihPersonalHomeState extends State { void initState() { super.initState(); searchController.addListener(searchPackage); - personalPackagesMap = setPersonalPackagesMap(); + if (widget.isUserNew) { + personalPackagesMap = setNerUserPersonalPackage(); + } else { + personalPackagesMap = setPersonalPackagesMap(); + } searchPackage(); } From 01868187f2e958709d6b95ccdcefb2c12de26c31 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 28 Mar 2025 09:53:29 +0200 Subject: [PATCH 7/8] chane tile if new business user --- .../lib/mih_packages/mih_home/mih_home.dart | 1 + .../package_tools/mih_business_home.dart | 20 ++++++++- .../mzansi_setup_business_profile_tile.dart | 44 +++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index c1ecc9eb..0eb27ca3 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -167,6 +167,7 @@ class _MihHomeState extends State { personalSelected: _personalSelected, businessUser: widget.businessUser, business: widget.business, + isBusinessUserNew: widget.isBusinessUserNew, ), ); } 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 f37a6a83..416dc049 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 @@ -11,6 +11,7 @@ import 'package:Mzansi_Innovation_Hub/mih_packages/calculator/package_tiles/mih_ import 'package:Mzansi_Innovation_Hub/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart'; +import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -20,12 +21,14 @@ class MihBusinessHome extends StatefulWidget { final bool personalSelected; final Business? business; final BusinessUser? businessUser; + final bool isBusinessUserNew; const MihBusinessHome({ super.key, required this.signedInUser, required this.personalSelected, required this.business, required this.businessUser, + required this.isBusinessUserNew, }); @override @@ -39,6 +42,17 @@ class _MihBusinessHomeState extends State { ValueNotifier([]); double packageSize = 200; + List> setNewBusinessUserPackages() { + List> temp = []; + temp.add({ + "Setup Business": MzansiSetupBusinessProfileTile( + signedInUser: widget.signedInUser, + packageSize: packageSize, + ) + }); + return temp; + } + List> setBusinessPackages() { List> temp = []; //=============== Biz Profile =============== @@ -137,7 +151,11 @@ class _MihBusinessHomeState extends State { void initState() { super.initState(); searchController.addListener(searchPackage); - businessPackagesMap = setBusinessPackages(); + if (widget.isBusinessUserNew) { + businessPackagesMap = setNewBusinessUserPackages(); + } else { + businessPackagesMap = setBusinessPackages(); + } searchPackage(); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart new file mode 100644 index 00000000..cb0461a4 --- /dev/null +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart @@ -0,0 +1,44 @@ +import 'package:Mzansi_Innovation_Hub/main.dart'; +import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_tile.dart'; +import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart'; +import 'package:flutter/material.dart'; + +class MzansiSetupBusinessProfileTile extends StatefulWidget { + final AppUser signedInUser; + final double packageSize; + const MzansiSetupBusinessProfileTile({ + super.key, + required this.signedInUser, + required this.packageSize, + }); + + @override + State createState() => + _MzansiSetupBusinessProfileTileState(); +} + +class _MzansiSetupBusinessProfileTileState + extends State { + @override + Widget build(BuildContext context) { + return MihAppTile( + onTap: () { + Navigator.of(context).pushNamed( + '/business-profile/set-up', + arguments: widget.signedInUser, + ); + }, + appName: "Setup Business", + appIcon: Container( + padding: const EdgeInsets.all(0.5), + child: Icon( + Icons.business_center, + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ), + ), + iconSize: widget.packageSize, + primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ); + } +} From f099b7249339d6675e6d8dd29e06b939f3dfb042 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 28 Mar 2025 10:06:02 +0200 Subject: [PATCH 8/8] back button nav post business set up --- .../mzansi_profile/manage_business/profile_business_add.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/manage_business/profile_business_add.dart b/Frontend/lib/mih_packages/mzansi_profile/manage_business/profile_business_add.dart index bc5c9647..ca113019 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/manage_business/profile_business_add.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/manage_business/profile_business_add.dart @@ -98,7 +98,7 @@ class _ProfileBusinessAddState extends State { ); if (response.statusCode == 201) { uploadSelectedFile(selectedSignature, signtureController); - // Navigator.of(context).pushNamed('/'); + Navigator.of(context).pop(); Navigator.of(context).popAndPushNamed( '/', arguments: AuthArguments(false, false),