diff --git a/Frontend/patient_manager/lib/components/MIH_Layout/MIH_Action.dart b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Action.dart similarity index 100% rename from Frontend/patient_manager/lib/components/MIH_Layout/MIH_Action.dart rename to Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Action.dart diff --git a/Frontend/patient_manager/lib/components/mihAppDrawer.dart b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_AppDrawer.dart similarity index 100% rename from Frontend/patient_manager/lib/components/mihAppDrawer.dart rename to Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_AppDrawer.dart diff --git a/Frontend/patient_manager/lib/components/MIH_Layout/MIH_Body.dart b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Body.dart similarity index 100% rename from Frontend/patient_manager/lib/components/MIH_Layout/MIH_Body.dart rename to Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Body.dart diff --git a/Frontend/patient_manager/lib/components/MIH_Layout/MIH_Header.dart b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Header.dart similarity index 100% rename from Frontend/patient_manager/lib/components/MIH_Layout/MIH_Header.dart rename to Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Header.dart diff --git a/Frontend/patient_manager/lib/components/MIH_Layout/MIH_LayoutBuilder.dart b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart similarity index 84% rename from Frontend/patient_manager/lib/components/MIH_Layout/MIH_LayoutBuilder.dart rename to Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart index 49e84ea0..1a22f963 100644 --- a/Frontend/patient_manager/lib/components/MIH_Layout/MIH_LayoutBuilder.dart +++ b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Action.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Body.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Header.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Action.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Body.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Header.dart'; class MIHLayoutBuilder extends StatefulWidget { final MIHAction actionButton; diff --git a/Frontend/patient_manager/lib/components/MIH_Layout/MIH_Tile.dart b/Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Tile.dart similarity index 100% rename from Frontend/patient_manager/lib/components/MIH_Layout/MIH_Tile.dart rename to Frontend/patient_manager/lib/MIH_Components/MIH_Layout/MIH_Tile.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihButton.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihButton.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihButton.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihButton.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihDateInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihDateInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihDateInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihDateInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihDropdownInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihDropdownInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihDropdownInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihDropdownInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihFileInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihFileInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihFileInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihFileInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihMLTextInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihMLTextInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihMLTextInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihMLTextInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihPassInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihPassInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihPassInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihPassInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihSearchInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihSearchInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihSearchInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihSearchInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihTextInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihTextInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihTextInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihTextInput.dart diff --git a/Frontend/patient_manager/lib/components/inputsAndButtons/mihTimeInput.dart b/Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihTimeInput.dart similarity index 100% rename from Frontend/patient_manager/lib/components/inputsAndButtons/mihTimeInput.dart rename to Frontend/patient_manager/lib/MIH_Components/inputsAndButtons/mihTimeInput.dart diff --git a/Frontend/patient_manager/lib/components/medCertInput.dart b/Frontend/patient_manager/lib/MIH_Components/medCertInput.dart similarity index 94% rename from Frontend/patient_manager/lib/components/medCertInput.dart rename to Frontend/patient_manager/lib/MIH_Components/medCertInput.dart index fce964c8..f9254f2b 100644 --- a/Frontend/patient_manager/lib/components/medCertInput.dart +++ b/Frontend/patient_manager/lib/MIH_Components/medCertInput.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDateInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDateInput.dart'; class Medcertinput extends StatefulWidget { final startDateController; diff --git a/Frontend/patient_manager/lib/components/medicineSearch.dart b/Frontend/patient_manager/lib/MIH_Components/medicineSearch.dart similarity index 94% rename from Frontend/patient_manager/lib/components/medicineSearch.dart rename to Frontend/patient_manager/lib/MIH_Components/medicineSearch.dart index 7169b1b8..71b44a85 100644 --- a/Frontend/patient_manager/lib/components/medicineSearch.dart +++ b/Frontend/patient_manager/lib/MIH_Components/medicineSearch.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/builders/buildMedList.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildMedList.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/medicine.dart'; diff --git a/Frontend/patient_manager/lib/components/popUpMessages/mihDeleteMessage.dart b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihDeleteMessage.dart similarity index 99% rename from Frontend/patient_manager/lib/components/popUpMessages/mihDeleteMessage.dart rename to Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihDeleteMessage.dart index b3946163..edf39cc3 100644 --- a/Frontend/patient_manager/lib/components/popUpMessages/mihDeleteMessage.dart +++ b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihDeleteMessage.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/main.dart'; class MIHDeleteMessage extends StatefulWidget { diff --git a/Frontend/patient_manager/lib/components/popUpMessages/mihErrorMessage.dart b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihErrorMessage.dart similarity index 100% rename from Frontend/patient_manager/lib/components/popUpMessages/mihErrorMessage.dart rename to Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihErrorMessage.dart diff --git a/Frontend/patient_manager/lib/components/popUpMessages/mihLoadingCircle.dart b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihLoadingCircle.dart similarity index 100% rename from Frontend/patient_manager/lib/components/popUpMessages/mihLoadingCircle.dart rename to Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihLoadingCircle.dart diff --git a/Frontend/patient_manager/lib/components/popUpMessages/mihSuccessMessage.dart b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihSuccessMessage.dart similarity index 98% rename from Frontend/patient_manager/lib/components/popUpMessages/mihSuccessMessage.dart rename to Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihSuccessMessage.dart index c215542a..da166811 100644 --- a/Frontend/patient_manager/lib/components/popUpMessages/mihSuccessMessage.dart +++ b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihSuccessMessage.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/main.dart'; class MIHSuccessMessage extends StatefulWidget { diff --git a/Frontend/patient_manager/lib/components/popUpMessages/mihWarningMessage.dart b/Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihWarningMessage.dart similarity index 100% rename from Frontend/patient_manager/lib/components/popUpMessages/mihWarningMessage.dart rename to Frontend/patient_manager/lib/MIH_Components/popUpMessages/mihWarningMessage.dart diff --git a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart index 232a9a69..97d619bb 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/home.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/MIH_Packages/MIH_Home/homeTileGrid.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart index 890afdbb..fce0162d 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/MIH_Home/homeTileGrid.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:google_nav_bar/google_nav_bar.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Tile.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihSearchInput.dart'; -import 'package:patient_manager/components/mihAppDrawer.dart'; -import 'package:patient_manager/components/popUpMessages/mihDeleteMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihWarningMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Tile.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihSearchInput.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_AppDrawer.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihWarningMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; @@ -149,10 +149,31 @@ class _HomeTileGridState extends State { } void setAppsBusiness(List tileList) { + // tileList.add(MIHTile( + // onTap: () { + // Navigator.of(context).pushNamed( + // '/business-profile', + // arguments: BusinessArguments( + // widget.signedInUser, + // widget.businessUser, + // widget.business, + // ), + // ); + // }, + // tileName: "Manage Business", + // tileIcon: Icon( + // Icons.business, + // color: getSec(), + // size: 200, + // ), + // p: getPrim(), + // s: getSec(), + // )); + //if (widget.businessUser!.access == "Full") { tileList.add(MIHTile( onTap: () { Navigator.of(context).pushNamed( - '/business-profile', + '/business-profile/manage', arguments: BusinessArguments( widget.signedInUser, widget.businessUser, @@ -160,7 +181,7 @@ class _HomeTileGridState extends State { ), ); }, - tileName: "Manage Business", + tileName: "Business Profile", tileIcon: Icon( Icons.business, color: getSec(), @@ -169,28 +190,7 @@ class _HomeTileGridState extends State { p: getPrim(), s: getSec(), )); - if (widget.businessUser!.access == "Full") { - tileList.add(MIHTile( - onTap: () { - Navigator.of(context).pushNamed( - '/business-profile/manage', - arguments: BusinessArguments( - widget.signedInUser, - widget.businessUser, - widget.business, - ), - ); - }, - tileName: "Manage Team", - tileIcon: Icon( - Icons.people_outline, - color: getSec(), - size: 200, - ), - p: getPrim(), - s: getSec(), - )); - } + //} if (widget.business!.type == "Doctors Office") { tileList.add(MIHTile( onTap: () { diff --git a/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart b/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart index dcdd35e7..f6956c9e 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/about_MIH/MIH_About.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Action.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Body.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Header.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_LayoutBuilder.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Tile.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Action.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Body.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Header.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Tile.dart'; import 'package:patient_manager/main.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart b/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart index 1bfb7abd..0bbd2db8 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/access_review/builder/buildAccessRequestList.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/accessRequest.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart b/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart index a8156090..6e6d3ae2 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/access_review/patientAccessReview.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Action.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Body.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Header.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_LayoutBuilder.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Action.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Body.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Header.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart'; import 'package:patient_manager/MIH_Packages/access_review/builder/buildAccessRequestList.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/accessRequest.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart index 70756655..957d67f5 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/forgotPassword.dart @@ -2,11 +2,11 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:supabase_auth_ui/supabase_auth_ui.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart index 00096014..23fa4fea 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/register.dart @@ -2,12 +2,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihPassInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihPassInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; //import 'package:patient_manager/objects/sessionST.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart index 3be0fc3b..1a2fff14 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/resetPassword.dart @@ -2,11 +2,11 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihPassInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihPassInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:supabase_auth_ui/supabase_auth_ui.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart b/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart index b9dcb648..7778e149 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/authentication/signin.dart @@ -2,12 +2,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Tile.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihPassInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Tile.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihPassInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:supabase_auth_ui/supabase_auth_ui.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/manageBusinessProfile.dart b/Frontend/patient_manager/lib/MIH_Packages/manageBusinessProfile.dart deleted file mode 100644 index 6ec3fdc2..00000000 --- a/Frontend/patient_manager/lib/MIH_Packages/manageBusinessProfile.dart +++ /dev/null @@ -1,484 +0,0 @@ -import 'dart:convert'; - -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:patient_manager/components/builders/buildEmployeeList.dart'; -import 'package:patient_manager/components/builders/buildUserList.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihSearchInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/env/env.dart'; -import 'package:patient_manager/main.dart'; -import 'package:patient_manager/objects/appUser.dart'; -import 'package:patient_manager/objects/arguments.dart'; -import 'package:patient_manager/objects/businessEmployee.dart'; -import 'package:supertokens_flutter/http.dart' as http; - -class ManageBusinessProfile extends StatefulWidget { - final BusinessArguments arguments; - const ManageBusinessProfile({ - super.key, - required this.arguments, - }); - - @override - State createState() => _ManageBusinessProfileState(); -} - -class _ManageBusinessProfileState extends State { - final FocusNode _focusNode = FocusNode(); - final baseAPI = AppEnviroment.baseApiUrl; - final TextEditingController searchController = TextEditingController(); - - String userSearch = ""; - String errorCode = ""; - String errorBody = ""; - int selectionIndex = 0; - - late Future> employeeList; - late Future> userSearchResults; - - Future> fetchEmployees() async { - //print("Patien manager page: $endpoint"); - final response = await http.get(Uri.parse( - "${AppEnviroment.baseApiUrl}/business-user/employees/${widget.arguments.businessUser!.business_id}")); - errorCode = response.statusCode.toString(); - errorBody = response.body; - - if (response.statusCode == 200) { - //print("Here1"); - Iterable l = jsonDecode(response.body); - //print("Here2"); - List patientQueue = List.from( - l.map((model) => BusinessEmployee.fromJson(model))); - //print("Here3"); - //print(patientQueue); - return patientQueue; - } else { - throw Exception('failed to load employees'); - } - } - - Future> fetchUsers(String search) async { - //TODO - final response = await http - .get(Uri.parse("${AppEnviroment.baseApiUrl}/users/search/$search")); - errorCode = response.statusCode.toString(); - errorBody = response.body; - - if (response.statusCode == 200) { - Iterable l = jsonDecode(response.body); - List users = - List.from(l.map((model) => AppUser.fromJson(model))); - return users; - } else { - throw Exception('failed to load patients'); - } - } - - Widget employeesview(double w, double h) { - return SizedBox( - width: w, - height: h - 157, - child: Column(mainAxisSize: MainAxisSize.max, children: [ - const Text( - "Business Team", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - const SizedBox(height: 15), - FutureBuilder( - future: employeeList, - builder: (context, snapshot) { - //print("patient Queue List ${snapshot.hasData}"); - if (snapshot.connectionState == ConnectionState.waiting) { - return Expanded( - child: Container( - height: 500, - decoration: BoxDecoration( - color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - width: 3.0), - ), - child: const Mihloadingcircle(), - ), - ); - } else if (snapshot.connectionState == ConnectionState.done) { - //List employeeListResults; - // if (searchString == "") { - // patientQueueList = []; - // } else { - - // print(patientQueueList); - // } - - return Expanded( - child: displayEmployeeList(snapshot.requireData), - ); - } else { - return Expanded( - child: Container( - //height: 500, - decoration: BoxDecoration( - color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - width: 3.0), - ), - child: Center( - child: Text( - "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody", - style: TextStyle( - fontSize: 25, - color: MzanziInnovationHub.of(context)! - .theme - .errorColor()), - textAlign: TextAlign.center, - ), - ), - ), - ); - } - }, - ), - ]), - ); - } - - Widget displayEmployeeList(List employeeList) { - if (employeeList.isNotEmpty) { - return Container( - height: 500, - decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - width: 3.0, - ), - ), - child: BuildEmployeeList( - employees: employeeList, - arguments: widget.arguments, - ), - ); - } - return Container( - //height: 500, - decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - width: 3.0), - ), - child: Center( - child: Text( - "", - style: TextStyle( - fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), - textAlign: TextAlign.center, - ), - ), - ); - } - - Widget displayUserList(List userList) { - if (userList.isNotEmpty) { - return Container( - height: 500, - decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - width: 3.0, - ), - ), - child: BuildUserList( - users: userList, - arguments: widget.arguments, - ), - ); - } - return Container( - //height: 500, - decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - width: 3.0), - ), - child: Center( - child: Text( - "Enter Username or Email to search", - style: TextStyle( - fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), - textAlign: TextAlign.center, - ), - ), - ); - } - - void submitUserForm() { - if (searchController.text != "") { - setState(() { - userSearch = searchController.text; - userSearchResults = fetchUsers(userSearch); - }); - } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); - } - } - - Widget userSearchView(double w, double h) { - return KeyboardListener( - focusNode: _focusNode, - autofocus: true, - onKeyEvent: (event) async { - if (event is KeyDownEvent && - event.logicalKey == LogicalKeyboardKey.enter) { - submitUserForm(); - } - }, - child: SizedBox( - width: w, - height: h - 157, - child: Column(mainAxisSize: MainAxisSize.max, children: [ - const SizedBox(height: 5), - const Text( - "User Search", - style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), - ), - //spacer - const SizedBox(height: 10), - MIHSearchField( - controller: searchController, - hintText: "Username or Email Search", - required: true, - editable: true, - onTap: () { - submitUserForm(); - }, - ), - //spacer - const SizedBox(height: 10), - FutureBuilder( - future: userSearchResults, - builder: (context, snapshot) { - //print("patient Liust ${snapshot.data}"); - if (snapshot.connectionState == ConnectionState.waiting) { - return Expanded( - child: Container( - //height: 500, - decoration: BoxDecoration( - color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - width: 3.0), - ), - child: const Mihloadingcircle(), - ), - ); - } else if (snapshot.connectionState == ConnectionState.done && - snapshot.hasData) { - List patientsList; - if (userSearch == "") { - patientsList = []; - } else { - patientsList = snapshot.data!; - //print(patientsList); - } - - return Expanded( - child: displayUserList(patientsList), - ); - } else { - return Expanded( - child: Container( - //height: 500, - decoration: BoxDecoration( - color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - width: 3.0), - ), - child: Center( - child: Text( - "$errorCode: Error pulling Patients Data\n/patients/search/$userSearch\n$errorBody", - style: TextStyle( - fontSize: 25, - color: MzanziInnovationHub.of(context)! - .theme - .errorColor()), - textAlign: TextAlign.center, - ), - ), - ), - ); - } - }, - ), - ]), - ), - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - - void successPopUp(String message) { - showDialog( - context: context, - builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, - ); - }, - ); - } - - void emailError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Invalid Email"); - }, - ); - } - - Widget showSelection( - int selectionIndex, double screenWidth, double screenHeight) { - if (selectionIndex == 0) { - return SizedBox( - //width: 660, - child: employeesview(screenWidth, screenHeight), - ); - } else { - return userSearchView(screenWidth, screenHeight); - } - } - - @override - void dispose() { - searchController.dispose(); - _focusNode.dispose(); - super.dispose(); - } - - @override - void initState() { - userSearchResults = fetchUsers("abc"); - employeeList = fetchEmployees(); - super.initState(); - } - - @override - Widget build(BuildContext context) { - final screenWidth = MediaQuery.of(context).size.width; - final screenHeight = MediaQuery.of(context).size.height; - return Scaffold( - // appBar: const MIHAppBar( - // barTitle: "Business Profile", - // propicFile: null, - // ), - //drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser), - body: SafeArea( - child: Stack( - children: [ - SingleChildScrollView( - padding: const EdgeInsets.all(15), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - children: [ - //const SizedBox(height: 20), - SizedBox( - width: screenWidth, - child: Row( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisAlignment: MainAxisAlignment.end, - children: [ - IconButton( - onPressed: () { - setState(() { - selectionIndex = 0; - }); - }, - icon: const Icon( - Icons.people_outline, - size: 35, - ), - ), - IconButton( - onPressed: () { - setState(() { - selectionIndex = 1; - }); - }, - icon: const Icon( - Icons.add, - size: 35, - ), - ), - ], - ), - ), - showSelection(selectionIndex, screenWidth, screenHeight), - ], - ), - ), - Positioned( - top: 10, - left: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.of(context).pop(); - }, - icon: const Icon(Icons.arrow_back), - ), - ), - ], - ), - ), - ); - } -} diff --git a/Frontend/patient_manager/lib/components/builders/buildEmployeeList.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart similarity index 94% rename from Frontend/patient_manager/lib/components/builders/buildEmployeeList.dart rename to Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart index 239388af..508e8772 100644 --- a/Frontend/patient_manager/lib/components/builders/buildEmployeeList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildEmployeeList.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihDeleteMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/arguments.dart'; @@ -284,6 +284,7 @@ class _BuildEmployeeListState extends State { @override Widget build(BuildContext context) { return ListView.separated( + shrinkWrap: true, separatorBuilder: (BuildContext context, index) { return Divider( color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), diff --git a/Frontend/patient_manager/lib/components/builders/buildUserList.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart similarity index 93% rename from Frontend/patient_manager/lib/components/builders/buildUserList.dart rename to Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart index 3a5fc141..0b70b4dd 100644 --- a/Frontend/patient_manager/lib/components/builders/buildUserList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/builder/buildUserList.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; @@ -231,6 +231,7 @@ class _BuildUserListState extends State { @override Widget build(BuildContext context) { return ListView.separated( + shrinkWrap: true, separatorBuilder: (BuildContext context, index) { return Divider( color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), diff --git a/Frontend/patient_manager/lib/MIH_Packages/profileBusinessUpdate.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart similarity index 52% rename from Frontend/patient_manager/lib/MIH_Packages/profileBusinessUpdate.dart rename to Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart index 1bc6492b..8c0b7a20 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/profileBusinessUpdate.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/businessDetails.dart @@ -3,13 +3,13 @@ import 'dart:convert'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihFileInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihFileInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/arguments.dart'; @@ -17,20 +17,20 @@ import 'package:supertokens_flutter/http.dart' as http; import 'package:supertokens_flutter/supertokens.dart'; import 'package:http/http.dart' as http2; -class ProfileBusinessUpdate extends StatefulWidget { +class BusinessDetails extends StatefulWidget { final BusinessArguments arguments; - const ProfileBusinessUpdate({ + const BusinessDetails({ super.key, required this.arguments, }); @override - State createState() => _ProfileBusinessUpdateState(); + State createState() => _BusinessDetailsState(); } class BusinessUserScreenArguments {} -class _ProfileBusinessUpdateState extends State { +class _BusinessDetailsState extends State { final FocusNode _focusNode = FocusNode(); final baseAPI = AppEnviroment.baseApiUrl; @@ -317,206 +317,185 @@ class _ProfileBusinessUpdateState extends State { @override Widget build(BuildContext context) { - return Scaffold( - // appBar: const MIHAppBar( - // barTitle: "Business Profile", - // propicFile: null, - // ), - //drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser), - body: SafeArea( - child: Stack( - children: [ - KeyboardListener( - focusNode: _focusNode, - autofocus: true, - onKeyEvent: (event) async { - if (event is KeyDownEvent && - event.logicalKey == LogicalKeyboardKey.enter) { - //print(business_id); - submitForm(business_id); - } - }, - child: SingleChildScrollView( - padding: const EdgeInsets.all(15), + return SafeArea( + child: KeyboardListener( + focusNode: _focusNode, + autofocus: true, + onKeyEvent: (event) async { + if (event is KeyDownEvent && + event.logicalKey == LogicalKeyboardKey.enter) { + //print(business_id); + submitForm(business_id); + } + }, + child: SingleChildScrollView( + child: Column( + children: [ + Visibility( + visible: isFullAccess(), child: Column( children: [ - Visibility( - visible: isFullAccess(), - child: Column( - children: [ - const Text( - "Business Profile", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - const SizedBox(height: 25.0), - MIHTextField( - controller: regController, - hintText: "Registration No.", - editable: true, - required: true, - ), - const SizedBox(height: 10.0), - MIHTextField( - controller: nameController, - hintText: "Business Name", - editable: true, - required: true, - ), - const SizedBox(height: 10.0), - MIHDropdownField( - controller: typeController, - hintText: "Business Type", - dropdownOptions: const ["Doctors Office", "Other"], - required: true, - editable: true, - ), - const SizedBox(height: 10.0), - MIHTextField( - controller: contactController, - hintText: "Contact Number", - editable: true, - required: true, - ), - const SizedBox(height: 10.0), - MIHTextField( - controller: emailController, - hintText: "Email", - editable: true, - required: true, - ), - const SizedBox(height: 10.0), - MIHFileField( - controller: logonameController, - hintText: "Logo", - editable: false, - required: true, - onPressed: () async { - FilePickerResult? result = - await FilePicker.platform.pickFiles( - type: FileType.custom, - allowedExtensions: ['jpg', 'png', 'pdf'], - ); - if (result == null) return; - final selectedFile = result.files.first; - setState(() { - selectedLogo = selectedFile; - }); - setState(() { - logonameController.text = selectedFile.name; - }); - }, - ), - const SizedBox(height: 15.0), - Divider( - color: MzanziInnovationHub.of(context) - ?.theme - .secondaryColor(), - ), - ], + const Text( + "Business Profile", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 25, ), ), - Column( - children: [ - //const SizedBox(height: 15.0), - const Text( - "My Business User", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 25, - ), - ), - const SizedBox(height: 25.0), - MIHDropdownField( - controller: titleController, - hintText: "Title", - dropdownOptions: const ["Doctor", "Assistant"], - required: true, - editable: true, - ), - const SizedBox(height: 10.0), - MIHTextField( - controller: fnameController, - hintText: "Name", - editable: false, - required: true, - ), - const SizedBox(height: 10.0), - MIHTextField( - controller: lnameController, - hintText: "Surname", - editable: false, - required: true, - ), - const SizedBox(height: 10.0), - MIHFileField( - controller: signtureController, - hintText: "Signature", - editable: false, - required: true, - onPressed: () async { - FilePickerResult? result = - await FilePicker.platform.pickFiles( - type: FileType.custom, - allowedExtensions: ['jpg', 'png', 'pdf'], - ); - if (result == null) return; - final selectedFile = result.files.first; - setState(() { - selectedSignature = selectedFile; - }); - setState(() { - signtureController.text = selectedFile.name; - }); - }, - ), - const SizedBox(height: 15.0), - MIHDropdownField( - controller: accessController, - hintText: "Access", - dropdownOptions: const ["Full", "Partial"], - required: true, - editable: false, - ), - const SizedBox(height: 30.0), - SizedBox( - width: 500.0, - height: 50.0, - child: MIHButton( - buttonText: "Update", - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - textColor: MzanziInnovationHub.of(context)! - .theme - .primaryColor(), - onTap: () { - //print(business_id); - submitForm(business_id); - }, - ), - ), - ], + Divider( + color: MzanziInnovationHub.of(context) + ?.theme + .secondaryColor(), ), + const SizedBox(height: 10.0), + MIHTextField( + controller: regController, + hintText: "Registration No.", + editable: true, + required: true, + ), + const SizedBox(height: 10.0), + MIHTextField( + controller: nameController, + hintText: "Business Name", + editable: true, + required: true, + ), + const SizedBox(height: 10.0), + MIHDropdownField( + controller: typeController, + hintText: "Business Type", + dropdownOptions: const ["Doctors Office", "Other"], + required: true, + editable: true, + ), + const SizedBox(height: 10.0), + MIHTextField( + controller: contactController, + hintText: "Contact Number", + editable: true, + required: true, + ), + const SizedBox(height: 10.0), + MIHTextField( + controller: emailController, + hintText: "Email", + editable: true, + required: true, + ), + const SizedBox(height: 10.0), + MIHFileField( + controller: logonameController, + hintText: "Logo", + editable: false, + required: true, + onPressed: () async { + FilePickerResult? result = + await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['jpg', 'png', 'pdf'], + ); + if (result == null) return; + final selectedFile = result.files.first; + setState(() { + selectedLogo = selectedFile; + }); + setState(() { + logonameController.text = selectedFile.name; + }); + }, + ), + const SizedBox(height: 15.0), ], ), ), - ), - Positioned( - top: 10, - left: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.of(context).pop(); - }, - icon: const Icon(Icons.arrow_back), + Column( + children: [ + //const SizedBox(height: 15.0), + const Text( + "My Business User", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 25, + ), + ), + Divider( + color: + MzanziInnovationHub.of(context)?.theme.secondaryColor(), + ), + const SizedBox(height: 10.0), + MIHDropdownField( + controller: titleController, + hintText: "Title", + dropdownOptions: const ["Doctor", "Assistant"], + required: true, + editable: true, + ), + const SizedBox(height: 10.0), + MIHTextField( + controller: fnameController, + hintText: "Name", + editable: false, + required: true, + ), + const SizedBox(height: 10.0), + MIHTextField( + controller: lnameController, + hintText: "Surname", + editable: false, + required: true, + ), + const SizedBox(height: 10.0), + MIHFileField( + controller: signtureController, + hintText: "Signature", + editable: false, + required: true, + onPressed: () async { + FilePickerResult? result = + await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['jpg', 'png', 'pdf'], + ); + if (result == null) return; + final selectedFile = result.files.first; + setState(() { + selectedSignature = selectedFile; + }); + setState(() { + signtureController.text = selectedFile.name; + }); + }, + ), + const SizedBox(height: 15.0), + MIHDropdownField( + controller: accessController, + hintText: "Access", + dropdownOptions: const ["Full", "Partial"], + required: true, + editable: false, + ), + const SizedBox(height: 30.0), + SizedBox( + width: 500.0, + height: 50.0, + child: MIHButton( + buttonText: "Update", + buttonColor: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + textColor: + MzanziInnovationHub.of(context)!.theme.primaryColor(), + onTap: () { + //print(business_id); + submitForm(business_id); + }, + ), + ), + ], ), - ) - ], + ], + ), ), ), ); diff --git a/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart new file mode 100644 index 00000000..3caca1e0 --- /dev/null +++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/manageBusinessProfile.dart @@ -0,0 +1,445 @@ +import 'dart:convert'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:patient_manager/MIH_Packages/manage_business/businessDetails.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Action.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Body.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Header.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart'; +import 'package:patient_manager/MIH_Packages/manage_business/builder/buildEmployeeList.dart'; +import 'package:patient_manager/MIH_Packages/manage_business/builder/buildUserList.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihSearchInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/env/env.dart'; +import 'package:patient_manager/main.dart'; +import 'package:patient_manager/objects/appUser.dart'; +import 'package:patient_manager/objects/arguments.dart'; +import 'package:patient_manager/objects/businessEmployee.dart'; +import 'package:supertokens_flutter/http.dart' as http; + +class ManageBusinessProfile extends StatefulWidget { + final BusinessArguments arguments; + const ManageBusinessProfile({ + super.key, + required this.arguments, + }); + + @override + State createState() => _ManageBusinessProfileState(); +} + +class _ManageBusinessProfileState extends State { + final FocusNode _focusNode = FocusNode(); + final baseAPI = AppEnviroment.baseApiUrl; + final TextEditingController searchController = TextEditingController(); + + String userSearch = ""; + String errorCode = ""; + String errorBody = ""; + int selectionIndex = 0; + + late Future> employeeList; + late Future> userSearchResults; + + Future> fetchEmployees() async { + //print("Patien manager page: $endpoint"); + final response = await http.get(Uri.parse( + "${AppEnviroment.baseApiUrl}/business-user/employees/${widget.arguments.businessUser!.business_id}")); + errorCode = response.statusCode.toString(); + errorBody = response.body; + + if (response.statusCode == 200) { + //print("Here1"); + Iterable l = jsonDecode(response.body); + //print("Here2"); + List patientQueue = List.from( + l.map((model) => BusinessEmployee.fromJson(model))); + //print("Here3"); + //print(patientQueue); + return patientQueue; + } else { + throw Exception('failed to load employees'); + } + } + + Future> fetchUsers(String search) async { + //TODO + final response = await http + .get(Uri.parse("${AppEnviroment.baseApiUrl}/users/search/$search")); + errorCode = response.statusCode.toString(); + errorBody = response.body; + + if (response.statusCode == 200) { + Iterable l = jsonDecode(response.body); + List users = + List.from(l.map((model) => AppUser.fromJson(model))); + return users; + } else { + throw Exception('failed to load patients'); + } + } + + Widget employeesview() { + return 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) { + //print("patient Queue List ${snapshot.hasData}"); + if (snapshot.connectionState == ConnectionState.waiting) { + return const Mihloadingcircle(); + } else if (snapshot.connectionState == ConnectionState.done) { + //List employeeListResults; + // if (searchString == "") { + // patientQueueList = []; + // } else { + + // print(patientQueueList); + // } + + return displayEmployeeList(snapshot.requireData); + } else { + return Center( + child: Text( + "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody", + style: TextStyle( + fontSize: 25, + color: MzanziInnovationHub.of(context)!.theme.errorColor()), + textAlign: TextAlign.center, + ), + ); + } + }, + ), + ]); + } + + Widget displayEmployeeList(List employeeList) { + if (employeeList.isNotEmpty) { + return BuildEmployeeList( + employees: employeeList, + arguments: widget.arguments, + ); + } + return Center( + child: Text( + "", + style: TextStyle( + fontSize: 25, + color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), + textAlign: TextAlign.center, + ), + ); + } + + Widget displayUserList(List userList) { + if (userList.isNotEmpty) { + return BuildUserList( + users: userList, + arguments: widget.arguments, + ); + } + return Center( + child: Text( + "Enter Username or Email to search", + style: TextStyle( + fontSize: 25, + color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), + textAlign: TextAlign.center, + ), + ); + } + + void submitUserForm() { + if (searchController.text != "") { + setState(() { + userSearch = searchController.text; + userSearchResults = fetchUsers(userSearch); + }); + } else { + showDialog( + context: context, + builder: (context) { + return const MIHErrorMessage(errorType: "Input Error"); + }, + ); + } + } + + Widget userSearchView() { + return KeyboardListener( + focusNode: _focusNode, + autofocus: true, + onKeyEvent: (event) async { + if (event is KeyDownEvent && + event.logicalKey == LogicalKeyboardKey.enter) { + submitUserForm(); + } + }, + 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", + required: true, + editable: true, + onTap: () { + submitUserForm(); + }, + ), + //spacer + const SizedBox(height: 10), + FutureBuilder( + future: userSearchResults, + builder: (context, snapshot) { + //print("patient Liust ${snapshot.data}"); + if (snapshot.connectionState == ConnectionState.waiting) { + return const Mihloadingcircle(); + } else if (snapshot.connectionState == ConnectionState.done && + snapshot.hasData) { + List patientsList; + if (userSearch == "") { + patientsList = []; + } else { + patientsList = snapshot.data!; + //print(patientsList); + } + + return displayUserList(patientsList); + } else { + return Center( + child: Text( + "$errorCode: Error pulling Patients Data\n/patients/search/$userSearch\n$errorBody", + style: TextStyle( + fontSize: 25, + color: + MzanziInnovationHub.of(context)!.theme.errorColor()), + textAlign: TextAlign.center, + ), + ); + } + }, + ), + ]), + ); + } + + void internetConnectionPopUp() { + showDialog( + context: context, + builder: (context) { + return const MIHErrorMessage(errorType: "Internet Connection"); + }, + ); + } + + void successPopUp(String message) { + showDialog( + context: context, + builder: (context) { + return MIHSuccessMessage( + successType: "Success", + successMessage: message, + ); + }, + ); + } + + void emailError() { + showDialog( + context: context, + builder: (context) { + return const MIHErrorMessage(errorType: "Invalid Email"); + }, + ); + } + + Widget showSelection(int selectionIndex) { + if (selectionIndex == 0) { + return BusinessDetails(arguments: widget.arguments); + } else if (selectionIndex == 1) { + return employeesview(); + } else { + return userSearchView(); + } + } + + MIHAction getActionButton() { + return MIHAction( + icon: Icons.arrow_back, + iconSize: 35, + onTap: () { + Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false); + }, + ); + } + + MIHHeader getHeader() { + bool isFullAccess = false; + if (widget.arguments.businessUser!.access == "Full") { + isFullAccess = true; + } + return MIHHeader( + headerAlignment: MainAxisAlignment.end, + headerItems: [ + IconButton( + onPressed: () { + setState(() { + selectionIndex = 0; + }); + }, + icon: const Icon( + Icons.business, + size: 35, + ), + ), + Visibility( + visible: isFullAccess, + child: IconButton( + onPressed: () { + setState(() { + selectionIndex = 1; + }); + }, + icon: const Icon( + Icons.people_outline, + size: 35, + ), + ), + ), + Visibility( + visible: isFullAccess, + child: IconButton( + onPressed: () { + setState(() { + selectionIndex = 2; + }); + }, + icon: const Icon( + Icons.add, + size: 35, + ), + ), + ), + ], + ); + } + + MIHBody getBody() { + return MIHBody( + borderOn: true, + bodyItems: [ + showSelection(selectionIndex), + ], + ); + } + + @override + void dispose() { + searchController.dispose(); + _focusNode.dispose(); + super.dispose(); + } + + @override + void initState() { + userSearchResults = fetchUsers("abc"); + employeeList = fetchEmployees(); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return MIHLayoutBuilder( + actionButton: getActionButton(), + header: getHeader(), + body: getBody(), + ); + // return Scaffold( + // // appBar: const MIHAppBar( + // // barTitle: "Business Profile", + // // propicFile: null, + // // ), + // //drawer: MIHAppDrawer(signedInUser: widget.arguments.signedInUser), + // body: SafeArea( + // child: Stack( + // children: [ + // SingleChildScrollView( + // padding: const EdgeInsets.all(15), + // child: Column( + // mainAxisAlignment: MainAxisAlignment.center, + // mainAxisSize: MainAxisSize.max, + // children: [ + // //const SizedBox(height: 20), + // SizedBox( + // width: screenWidth, + // child: Row( + // mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.end, + // mainAxisAlignment: MainAxisAlignment.end, + // children: [ + // IconButton( + // onPressed: () { + // setState(() { + // selectionIndex = 0; + // }); + // }, + // icon: const Icon( + // Icons.people_outline, + // size: 35, + // ), + // ), + // IconButton( + // onPressed: () { + // setState(() { + // selectionIndex = 1; + // }); + // }, + // icon: const Icon( + // Icons.add, + // size: 35, + // ), + // ), + // ], + // ), + // ), + // showSelection(selectionIndex, screenWidth, screenHeight), + // ], + // ), + // ), + // Positioned( + // top: 10, + // left: 5, + // width: 50, + // height: 50, + // child: IconButton( + // onPressed: () { + // Navigator.of(context).pop(); + // }, + // icon: const Icon(Icons.arrow_back), + // ), + // ), + // ], + // ), + // ), + // ); + } +} diff --git a/Frontend/patient_manager/lib/MIH_Packages/profileBusinessAdd.dart b/Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart similarity index 96% rename from Frontend/patient_manager/lib/MIH_Packages/profileBusinessAdd.dart rename to Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart index 1e8af1e4..fff6393e 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/profileBusinessAdd.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/manage_business/profileBusinessAdd.dart @@ -2,13 +2,13 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihFileInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihFileInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart b/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart index 36d78acf..80c160de 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/mzansi_profile/profileUserUpdate.dart @@ -3,16 +3,16 @@ import 'dart:convert'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Action.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Body.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Header.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_LayoutBuilder.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihFileInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.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'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Action.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Body.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Header.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihFileInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/arguments.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart index 8586d688..74b2b487 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/addOrViewPatient.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/arguments.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart index e13abb19..de27dc98 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildFilesList.dart @@ -2,11 +2,11 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/builder/BuildFileView.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihDeleteMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/components/builders/buildMedList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildMedList.dart similarity index 100% rename from Frontend/patient_manager/lib/components/builders/buildMedList.dart rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildMedList.dart diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart index 873b33e4..3547b818 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildNotesList.dart @@ -1,18 +1,18 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihDeleteMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihMLTextInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihDeleteMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihMLTextInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/arguments.dart'; import 'package:patient_manager/objects/business.dart'; import 'package:patient_manager/objects/businessUser.dart'; -//import 'package:patient_manager/components/mybutton.dart'; +//import 'package:patient_manager/MIH_Components/mybutton.dart'; import 'package:patient_manager/objects/notes.dart'; import 'package:patient_manager/objects/patients.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/patient_manager/lib/components/builders/buildPatientList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart similarity index 96% rename from Frontend/patient_manager/lib/components/builders/buildPatientList.dart rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart index e3493a7f..a334a4b9 100644 --- a/Frontend/patient_manager/lib/components/builders/buildPatientList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientList.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDateInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTimeInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDateInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTimeInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart similarity index 98% rename from Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart index e8122b77..45a22c73 100644 --- a/Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:patient_manager/components/popUpMessages/mihWarningMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihWarningMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart index 1406de4a..4fe792c8 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientAdd.dart @@ -2,12 +2,12 @@ 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'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +//import 'package:patient_manager/MIH_Components/mihAppDrawer.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart index 8a5c1619..aa468e3b 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientDetails.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/arguments.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart index 303b22bb..4c91a9ac 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientEdit.dart @@ -2,11 +2,11 @@ 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/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart index 4935b323..e50dc6a0 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientFiles.dart @@ -4,13 +4,13 @@ import 'dart:convert'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildFilesList.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihFileInput.dart'; -import 'package:patient_manager/components/medCertInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/prescipInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihFileInput.dart'; +import 'package:patient_manager/MIH_Components/medCertInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Packages/patient_profile/prescipInput.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patientManager.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart similarity index 96% rename from Frontend/patient_manager/lib/MIH_Packages/patientManager.dart rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart index a7d298c3..9a3a474b 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patientManager.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientManager.dart @@ -4,15 +4,15 @@ import 'package:intl/intl.dart'; import 'package:flutter/material.dart'; 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/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDateInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildPatientList.dart'; +import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildPatientQueueList.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDateInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; import 'package:patient_manager/objects/arguments.dart'; import 'package:patient_manager/objects/patientQueue.dart'; import 'package:supertokens_flutter/http.dart' as http; -import 'package:patient_manager/components/inputsAndButtons/mihSearchInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihSearchInput.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/patients.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart index aff77356..c9d31f38 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientNotes.dart @@ -2,12 +2,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/builder/buildNotesList.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihMLTextInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihTextInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihMLTextInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihTextInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart index 903c1e91..1f14a6a2 100644 --- a/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/patientView.dart @@ -4,10 +4,10 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/patientDetails.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/patientFiles.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/patientNotes.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Action.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Body.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_Header.dart'; -import 'package:patient_manager/components/MIH_Layout/MIH_LayoutBuilder.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Action.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Body.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_Header.dart'; +import 'package:patient_manager/MIH_Components/MIH_Layout/MIH_LayoutBuilder.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/arguments.dart'; diff --git a/Frontend/patient_manager/lib/components/prescipInput.dart b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart similarity index 96% rename from Frontend/patient_manager/lib/components/prescipInput.dart rename to Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart index bb64025e..934a9486 100644 --- a/Frontend/patient_manager/lib/components/prescipInput.dart +++ b/Frontend/patient_manager/lib/MIH_Packages/patient_profile/prescipInput.dart @@ -2,13 +2,13 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:patient_manager/components/medicineSearch.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihDropdownInput.dart'; -import 'package:patient_manager/components/popUpMessages/mihLoadingCircle.dart'; -import 'package:patient_manager/components/popUpMessages/mihErrorMessage.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihSearchInput.dart'; -import 'package:patient_manager/components/inputsAndButtons/mihButton.dart'; -import 'package:patient_manager/components/popUpMessages/mihSuccessMessage.dart'; +import 'package:patient_manager/MIH_Components/medicineSearch.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihDropdownInput.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihLoadingCircle.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihErrorMessage.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihSearchInput.dart'; +import 'package:patient_manager/MIH_Components/inputsAndButtons/mihButton.dart'; +import 'package:patient_manager/MIH_Components/popUpMessages/mihSuccessMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; diff --git a/Frontend/patient_manager/lib/components/mihAppBar.dart b/Frontend/patient_manager/lib/components/mihAppBar.dart deleted file mode 100644 index c8af1735..00000000 --- a/Frontend/patient_manager/lib/components/mihAppBar.dart +++ /dev/null @@ -1,56 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:patient_manager/main.dart'; - -class MIHAppBar extends StatefulWidget implements PreferredSizeWidget { - final String barTitle; - final ImageProvider? propicFile; - const MIHAppBar({ - super.key, - required this.barTitle, - required this.propicFile, - }); - - @override - State createState() => _MIHAppBarState(); - - @override - // TODO: implement preferredSize - Size get preferredSize => const Size.fromHeight(60); -} - -class _MIHAppBarState extends State { - @override - void dispose() { - // TODO: implement dispose - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return AppBar( - elevation: 8, - shadowColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // actions: [ - // IconButton( - // icon: const Icon( - // Icons.home, - // size: 40, - // ), - // onPressed: () { - // // Navigator.pushNamedAndRemoveUntil( - // // context, - // // '/home', - // // ); - // Navigator.of(context) - // .pushNamedAndRemoveUntil('/home', (route) => false); - // }, - // ) - // ], - title: Text( - widget.barTitle, - textAlign: TextAlign.center, - ), - centerTitle: true, - ); - } -} diff --git a/Frontend/patient_manager/lib/router/routeGenerator.dart b/Frontend/patient_manager/lib/router/routeGenerator.dart index c33adc1b..b2b33738 100644 --- a/Frontend/patient_manager/lib/router/routeGenerator.dart +++ b/Frontend/patient_manager/lib/router/routeGenerator.dart @@ -7,14 +7,14 @@ import 'package:patient_manager/MIH_Packages/about_MIH/MIH_About.dart'; import 'package:patient_manager/MIH_Packages/authentication/forgotPassword.dart'; import 'package:patient_manager/MIH_Packages/authentication/resetPassword.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/fullScreenFile.dart'; -import 'package:patient_manager/MIH_Packages/manageBusinessProfile.dart'; +import 'package:patient_manager/MIH_Packages/manage_business/manageBusinessProfile.dart'; import 'package:patient_manager/MIH_Packages/access_review/patientAccessReview.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/patientAdd.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/patientEdit.dart'; -import 'package:patient_manager/MIH_Packages/patientManager.dart'; +import 'package:patient_manager/MIH_Packages/patient_profile/patientManager.dart'; import 'package:patient_manager/MIH_Packages/patient_profile/patientView.dart'; -import 'package:patient_manager/MIH_Packages/profileBusinessAdd.dart'; -import 'package:patient_manager/MIH_Packages/profileBusinessUpdate.dart'; +import 'package:patient_manager/MIH_Packages/manage_business/profileBusinessAdd.dart'; +import 'package:patient_manager/MIH_Packages/manage_business/businessDetails.dart'; import 'package:patient_manager/MIH_Packages/mzansi_profile/profileUserUpdate.dart'; class RouteGenerator { @@ -68,7 +68,7 @@ class RouteGenerator { if (args is BusinessArguments) { return MaterialPageRoute( settings: settings, - builder: (_) => ProfileBusinessUpdate( + builder: (_) => BusinessDetails( arguments: args, ), );