From 7926738b34da28b2152ebdef8c939227654ad965 Mon Sep 17 00:00:00 2001 From: yaso Date: Wed, 5 Feb 2025 10:14:02 +0200 Subject: [PATCH 1/3] remove unused code --- Frontend/lib/main.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index 1d9ed388..74a69744 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/scheduler.dart'; import '../mih_env/env.dart'; import '../mih_router/routeGenerator.dart'; import '../mih_theme/mih_theme.dart'; @@ -53,8 +52,8 @@ class _MzanziInnovationHubState extends State { @override void initState() { theme = MihTheme(); - var systemTheme = - SchedulerBinding.instance.platformDispatcher.platformBrightness; + // var systemTheme = + // SchedulerBinding.instance.platformDispatcher.platformBrightness; // bool isDarkMode = systemTheme == Brightness.dark; // if (isDarkMode) { // theme.mode = "Dark"; From b71c996d9ae259c7b811465ac53ed6fc56289176 Mon Sep 17 00:00:00 2001 From: yaso Date: Wed, 5 Feb 2025 10:14:24 +0200 Subject: [PATCH 2/3] Stop keyboard opening on click. --- .../mih_inputs_and_buttons/mih_dropdown_input.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Frontend/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart b/Frontend/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart index 07a715c0..ef136c6e 100644 --- a/Frontend/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart +++ b/Frontend/lib/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart @@ -8,6 +8,7 @@ class MIHDropdownField extends StatefulWidget { final List dropdownOptions; // final void Function(String?)? onSelect; final bool editable; + final bool enableSearch; const MIHDropdownField({ super.key, @@ -16,6 +17,7 @@ class MIHDropdownField extends StatefulWidget { required this.dropdownOptions, required this.required, required this.editable, + required this.enableSearch, // this.onSelect, }); @@ -99,6 +101,7 @@ class _MIHDropdownFieldState extends State { void initState() { menu = buidMenueOptions(widget.dropdownOptions); _focus.addListener(_onFocusChange); + _focus.canRequestFocus = widget.enableSearch; super.initState(); } @@ -106,6 +109,9 @@ class _MIHDropdownFieldState extends State { @override Widget build(BuildContext context) { return DropdownMenu( + enableSearch: widget.enableSearch, + enableFilter: widget.enableSearch, + // requestFocusOnTap: true, initialSelection: widget.controller.text, enabled: widget.editable, trailingIcon: Icon( From 64071ce4e6e0babfaa6653eb7bbb31200810e620 Mon Sep 17 00:00:00 2001 From: yaso Date: Wed, 5 Feb 2025 10:14:43 +0200 Subject: [PATCH 3/3] add new param to mih dropdown --- .../lib/mih_packages/access_review/patient_access_review.dart | 1 + Frontend/lib/mih_packages/appointment/appointments.dart | 1 + Frontend/lib/mih_packages/calculator/tip_calc.dart | 1 + .../manage_business/builder/build_employee_list.dart | 2 ++ .../mih_packages/manage_business/builder/build_user_list.dart | 2 ++ Frontend/lib/mih_packages/manage_business/business_about.dart | 3 +++ .../lib/mih_packages/manage_business/business_details.dart | 3 +++ .../mih_packages/manage_business/profile_business_add.dart | 3 +++ Frontend/lib/mih_packages/mzansi_ai/ai_chat.dart | 1 + Frontend/lib/mih_packages/mzansi_wallet/loyalty_cards.dart | 1 + .../mih_packages/patient_profile/Claim_Statement_Window.dart | 3 +++ Frontend/lib/mih_packages/patient_profile/patient_add.dart | 2 ++ Frontend/lib/mih_packages/patient_profile/patient_edit.dart | 2 ++ Frontend/lib/mih_packages/patient_profile/prescip_input.dart | 4 ++++ 14 files changed, 29 insertions(+) diff --git a/Frontend/lib/mih_packages/access_review/patient_access_review.dart b/Frontend/lib/mih_packages/access_review/patient_access_review.dart index ec024b93..29009aae 100644 --- a/Frontend/lib/mih_packages/access_review/patient_access_review.dart +++ b/Frontend/lib/mih_packages/access_review/patient_access_review.dart @@ -149,6 +149,7 @@ class _PatientAccessRequestState extends State { ], required: true, editable: true, + enableSearch: false, ), ), IconButton( diff --git a/Frontend/lib/mih_packages/appointment/appointments.dart b/Frontend/lib/mih_packages/appointment/appointments.dart index 3509ca31..6a675cda 100644 --- a/Frontend/lib/mih_packages/appointment/appointments.dart +++ b/Frontend/lib/mih_packages/appointment/appointments.dart @@ -138,6 +138,7 @@ class _PatientAccessRequestState extends State { dropdownOptions: const ["All", "Approved", "Pending", "Declined"], required: true, editable: true, + enableSearch: false, ), ), const SizedBox(height: 10), diff --git a/Frontend/lib/mih_packages/calculator/tip_calc.dart b/Frontend/lib/mih_packages/calculator/tip_calc.dart index 23ca8f99..3e8e2e4e 100644 --- a/Frontend/lib/mih_packages/calculator/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/tip_calc.dart @@ -296,6 +296,7 @@ class _TipCalcState extends State { dropdownOptions: const ["Yes", "No"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10), ValueListenableBuilder( diff --git a/Frontend/lib/mih_packages/manage_business/builder/build_employee_list.dart b/Frontend/lib/mih_packages/manage_business/builder/build_employee_list.dart index ae80d9ca..8aff3de8 100644 --- a/Frontend/lib/mih_packages/manage_business/builder/build_employee_list.dart +++ b/Frontend/lib/mih_packages/manage_business/builder/build_employee_list.dart @@ -189,6 +189,7 @@ class _BuildEmployeeListState extends State { dropdownOptions: const ["Doctor", "Assistant"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHDropdownField( @@ -197,6 +198,7 @@ class _BuildEmployeeListState extends State { dropdownOptions: const ["Full", "Partial"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 15.0), SizedBox( diff --git a/Frontend/lib/mih_packages/manage_business/builder/build_user_list.dart b/Frontend/lib/mih_packages/manage_business/builder/build_user_list.dart index 8df82cd6..864c05b2 100644 --- a/Frontend/lib/mih_packages/manage_business/builder/build_user_list.dart +++ b/Frontend/lib/mih_packages/manage_business/builder/build_user_list.dart @@ -150,6 +150,7 @@ class _BuildUserListState extends State { dropdownOptions: const ["Doctor", "Assistant"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHDropdownField( @@ -158,6 +159,7 @@ class _BuildUserListState extends State { dropdownOptions: const ["Full", "Partial"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 15.0), SizedBox( diff --git a/Frontend/lib/mih_packages/manage_business/business_about.dart b/Frontend/lib/mih_packages/manage_business/business_about.dart index 15fb6073..7a7e294e 100644 --- a/Frontend/lib/mih_packages/manage_business/business_about.dart +++ b/Frontend/lib/mih_packages/manage_business/business_about.dart @@ -369,6 +369,7 @@ class _BusinessAboutState extends State { dropdownOptions: const ["Doctors Office", "Other"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHTextField( @@ -431,6 +432,7 @@ class _BusinessAboutState extends State { dropdownOptions: const ["Doctor", "Assistant"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHTextField( @@ -475,6 +477,7 @@ class _BusinessAboutState extends State { dropdownOptions: const ["Full", "Partial"], required: true, editable: false, + enableSearch: false, ), // const SizedBox(height: 15.0), // const Text( diff --git a/Frontend/lib/mih_packages/manage_business/business_details.dart b/Frontend/lib/mih_packages/manage_business/business_details.dart index bfacf1f5..29e73352 100644 --- a/Frontend/lib/mih_packages/manage_business/business_details.dart +++ b/Frontend/lib/mih_packages/manage_business/business_details.dart @@ -364,6 +364,7 @@ class _BusinessDetailsState extends State { dropdownOptions: const ["Doctors Office", "Other"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), ValueListenableBuilder( @@ -488,6 +489,7 @@ class _BusinessDetailsState extends State { dropdownOptions: const ["Doctor", "Assistant"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHTextField( @@ -532,6 +534,7 @@ class _BusinessDetailsState extends State { dropdownOptions: const ["Full", "Partial"], required: true, editable: false, + enableSearch: false, ), // const SizedBox(height: 15.0), // const Text( diff --git a/Frontend/lib/mih_packages/manage_business/profile_business_add.dart b/Frontend/lib/mih_packages/manage_business/profile_business_add.dart index 76052b74..31ad7dfd 100644 --- a/Frontend/lib/mih_packages/manage_business/profile_business_add.dart +++ b/Frontend/lib/mih_packages/manage_business/profile_business_add.dart @@ -293,6 +293,7 @@ class _ProfileBusinessAddState extends State { dropdownOptions: const ["Doctors Office", "Other"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), ValueListenableBuilder( @@ -416,6 +417,7 @@ class _ProfileBusinessAddState extends State { dropdownOptions: const ["Doctor", "Assistant"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHTextField( @@ -460,6 +462,7 @@ class _ProfileBusinessAddState extends State { dropdownOptions: const ["Full", "Partial"], required: true, editable: false, + enableSearch: false, ), const SizedBox(height: 30.0), SizedBox( diff --git a/Frontend/lib/mih_packages/mzansi_ai/ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/ai_chat.dart index bd5c6028..b2266087 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/ai_chat.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/ai_chat.dart @@ -336,6 +336,7 @@ class _AiChatState extends State { ], required: true, editable: true, + enableSearch: false, ), ), ), diff --git a/Frontend/lib/mih_packages/mzansi_wallet/loyalty_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/loyalty_cards.dart index 637cd66f..cd1071de 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/loyalty_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/loyalty_cards.dart @@ -132,6 +132,7 @@ class _LoyaltyCardsState extends State { ], required: true, editable: true, + enableSearch: false, ), ValueListenableBuilder( valueListenable: shopName, diff --git a/Frontend/lib/mih_packages/patient_profile/Claim_Statement_Window.dart b/Frontend/lib/mih_packages/patient_profile/Claim_Statement_Window.dart index d89a9b69..3c0b0970 100644 --- a/Frontend/lib/mih_packages/patient_profile/Claim_Statement_Window.dart +++ b/Frontend/lib/mih_packages/patient_profile/Claim_Statement_Window.dart @@ -83,6 +83,7 @@ class _ClaimStatementWindowState extends State { dropdownOptions: const ["Claim", "Statement"], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10), // Text( @@ -216,6 +217,7 @@ class _ClaimStatementWindowState extends State { ], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10), ValueListenableBuilder( @@ -237,6 +239,7 @@ class _ClaimStatementWindowState extends State { ], required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10), ], diff --git a/Frontend/lib/mih_packages/patient_profile/patient_add.dart b/Frontend/lib/mih_packages/patient_profile/patient_add.dart index d6c00628..192cea3f 100644 --- a/Frontend/lib/mih_packages/patient_profile/patient_add.dart +++ b/Frontend/lib/mih_packages/patient_profile/patient_add.dart @@ -229,6 +229,7 @@ class _AddPatientState extends State { controller: medAidController, hintText: "Medical Aid", editable: true, + enableSearch: false, // onSelect: (_) { // isRequired(); // }, @@ -248,6 +249,7 @@ class _AddPatientState extends State { hintText: "Main Member", editable: value, required: value, + enableSearch: false, dropdownOptions: const ["Yes", "No"], ), const SizedBox(height: 10.0), diff --git a/Frontend/lib/mih_packages/patient_profile/patient_edit.dart b/Frontend/lib/mih_packages/patient_profile/patient_edit.dart index 0cc58096..f913721e 100644 --- a/Frontend/lib/mih_packages/patient_profile/patient_edit.dart +++ b/Frontend/lib/mih_packages/patient_profile/patient_edit.dart @@ -468,6 +468,7 @@ class _EditPatientState extends State { // }, editable: true, required: true, + enableSearch: false, dropdownOptions: const ["Yes", "No"], ), ValueListenableBuilder( @@ -483,6 +484,7 @@ class _EditPatientState extends State { hintText: "Main Member.", editable: value, required: value, + enableSearch: false, dropdownOptions: const ["Yes", "No"], ), const SizedBox(height: 10.0), diff --git a/Frontend/lib/mih_packages/patient_profile/prescip_input.dart b/Frontend/lib/mih_packages/patient_profile/prescip_input.dart index 3b542502..4a85b090 100644 --- a/Frontend/lib/mih_packages/patient_profile/prescip_input.dart +++ b/Frontend/lib/mih_packages/patient_profile/prescip_input.dart @@ -384,6 +384,7 @@ class _PrescripInputState extends State { dropdownOptions: numberOptions, required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHDropdownField( @@ -392,6 +393,7 @@ class _PrescripInputState extends State { dropdownOptions: numberOptions, required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHDropdownField( @@ -400,6 +402,7 @@ class _PrescripInputState extends State { dropdownOptions: numberOptions, required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 10.0), MIHDropdownField( @@ -408,6 +411,7 @@ class _PrescripInputState extends State { dropdownOptions: numberOptions, required: true, editable: true, + enableSearch: false, ), const SizedBox(height: 15.0), SizedBox(