yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #108 from yaso-meth/BUG--Content-Overflow-on-MIH-App-Packages

Browse Source 
BUG--Content-Overflow-on-MIH-App-Packages
This commit is contained in:
yaso-meth
2025-03-17 10:58:56 +02:00
committed by GitHub
parent 98d3e00c53 85d3262438
commit acc00cbed5
17 changed files with 821 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Frontend/lib/mih_components/mih_layout/mih_single_child_scroll.dart Normal file
View File

@@ -0,0 +1,26 @@
import 'package:flutter/material.dart';
class MihSingleChildScroll extends StatefulWidget {
final Widget child;
const MihSingleChildScroll({
super.key,
required this.child,
});
@override
State<MihSingleChildScroll> createState() => _MihSingleChildScrollState();
}
class _MihSingleChildScrollState extends State<MihSingleChildScroll> {
@override
Widget build(BuildContext context) {
return SafeArea(
child: ScrollConfiguration(
behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
child: SingleChildScrollView(
child: widget.child,
),
),
);
}
}

3
Frontend/lib/mih_packages/about_mih/app_tools/mih_info.dart
View File

@@ -1,5 +1,6 @@
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_tile.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_tile.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_window.dart';
@@ -577,7 +578,7 @@ class _MihInfoState extends State<MihInfo> {
} }
Widget getBody() { Widget getBody() {
return SingleChildScrollView( return MihSingleChildScroll(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0), padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: Column( child: Column(

3
Frontend/lib/mih_packages/about_mih/app_tools/mih_privacy_policy.dart
View File

@@ -1,3 +1,4 @@
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -14,7 +15,7 @@ class MihPrivacyPolicy extends StatelessWidget {
} }
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return SingleChildScrollView( return MihSingleChildScroll(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0), padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: Column( child: Column(

3
Frontend/lib/mih_packages/about_mih/app_tools/mih_terms_of_service.dart
View File

@@ -1,3 +1,4 @@
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -14,7 +15,7 @@ class MIHTermsOfService extends StatelessWidget {
} }
Widget getBody(BuildContext context) { Widget getBody(BuildContext context) {
return SingleChildScrollView( return MihSingleChildScroll(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0), padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: Column( child: Column(

23
Frontend/lib/mih_packages/access_review/mih_access_requests.dart → Frontend/lib/mih_packages/access_review/app_tools/mih_access_requests.dart
View File

@@ -1,16 +1,17 @@
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../main.dart'; import '../../../main.dart';
import '../../mih_apis/mih_api_calls.dart'; import '../../../mih_apis/mih_api_calls.dart';
import '../../mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import '../../../mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
import '../../mih_components/mih_layout/mih_action.dart'; import '../../../mih_components/mih_layout/mih_action.dart';
import '../../mih_components/mih_layout/mih_header.dart'; import '../../../mih_components/mih_layout/mih_header.dart';
import '../../mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import '../../../mih_components/mih_pop_up_messages/mih_loading_circle.dart';
import '../../mih_env/env.dart'; import '../../../mih_env/env.dart';
import '../../mih_objects/app_user.dart'; import '../../../mih_objects/app_user.dart';
import '../../mih_objects/patient_access.dart'; import '../../../mih_objects/patient_access.dart';
import 'builder/build_business_access_list.dart'; import '../builder/build_business_access_list.dart';
class MihAccessRequest extends StatefulWidget { class MihAccessRequest extends StatefulWidget {
final AppUser signedInUser; final AppUser signedInUser;
@@ -127,7 +128,7 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
} }
Widget getBody() { Widget getBody() {
return SingleChildScrollView( return MihSingleChildScroll(
child: Column( child: Column(
children: [ children: [
const Text( const Text(

2
Frontend/lib/mih_packages/access_review/mih_access.dart
View File

@@ -2,7 +2,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_action.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_action.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_tools.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_tools.dart';
import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart'; import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart';
import 'package:Mzansi_Innovation_Hub/mih_packages/access_review/mih_access_requests.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/access_review/app_tools/mih_access_requests.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class MihAccess extends StatefulWidget { class MihAccess extends StatefulWidget {

423
Frontend/lib/mih_packages/calculator/app_tools/simple_calc.dart
View File

@@ -1,5 +1,6 @@
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:math_expressions/math_expressions.dart'; import 'package:math_expressions/math_expressions.dart';
@@ -73,219 +74,231 @@ class _SimpleCalcState extends State<SimpleCalc> {
calcWidth = 300; calcWidth = 300;
} }
} }
return Column( return MihSingleChildScroll(
mainAxisAlignment: MainAxisAlignment.start, child: Column(
mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ mainAxisSize: MainAxisSize.min,
Text( children: <Widget>[
"Simple Calculator", Text(
textAlign: TextAlign.center, "Simple Calculator",
style: TextStyle( textAlign: TextAlign.center,
fontSize: 25,
fontWeight: FontWeight.bold,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
),
),
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
const SizedBox(height: 10),
Container(
//color: Colors.white,
padding: const EdgeInsets.all(20),
alignment: Alignment.centerRight,
child: Text(
userInput,
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 25,
fontWeight: FontWeight.bold,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
), Divider(
Container( color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
width: double.infinity, const SizedBox(height: 10),
//color: Colors.white, Container(
padding: const EdgeInsets.all(15), //color: Colors.white,
alignment: Alignment.centerRight, padding: const EdgeInsets.all(20),
child: Text( alignment: Alignment.centerRight,
answer, child: Text(
style: TextStyle( userInput,
fontSize: 30, style: TextStyle(
fontSize: 18,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontWeight: FontWeight.bold),
),
),
Container(
alignment: Alignment.centerRight,
child: SizedBox(
width: calcWidth,
child: GridView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
// padding: EdgeInsets.only(
// left: width / 10,
// right: width / 10,
// bottom: height / 15,
// //top: 20,
// ),
// shrinkWrap: true,
itemCount: buttons.length,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
//mainAxisExtent: 150,
), ),
itemBuilder: (context, index) {
// Clear Button
if (index == 0) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput = '';
answer = '0';
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// +/- button
else if (index == 1) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// % Button
else if (index == 2) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// Delete Button
else if (index == 3) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput =
userInput.substring(0, userInput.length - 1);
});
},
buttonText: buttons[index],
buttonColor:
MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// Equal_to Button
else if (index == 18) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
equalPressed();
});
},
buttonText: buttons[index],
buttonColor:
MzanziInnovationHub.of(context)!.theme.successColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// +, -, / x buttons
else if (index == 7 ||
index == 11 ||
index == 15 ||
index == 19) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
if (answer == "0") {
setState(() {
userInput += buttons[index];
});
} else {
setState(() {
userInput = answer;
answer = "0";
userInput += buttons[index];
});
}
// setState(() {
// userInput += buttons[index];
// });
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// other buttons
else {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
},
), ),
), ),
), Container(
], width: double.infinity,
//color: Colors.white,
padding: const EdgeInsets.all(15),
alignment: Alignment.centerRight,
child: Text(
answer,
style: TextStyle(
fontSize: 30,
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontWeight: FontWeight.bold),
),
),
Container(
alignment: Alignment.centerRight,
child: SizedBox(
width: calcWidth,
child: GridView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
// padding: EdgeInsets.only(
// left: width / 10,
// right: width / 10,
// bottom: height / 15,
// //top: 20,
// ),
// shrinkWrap: true,
itemCount: buttons.length,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
//mainAxisExtent: 150,
),
itemBuilder: (context, index) {
// Clear Button
if (index == 0) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput = '';
answer = '0';
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// +/- button
else if (index == 1) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// % Button
else if (index == 2) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// Delete Button
else if (index == 3) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput =
userInput.substring(0, userInput.length - 1);
});
},
buttonText: buttons[index],
buttonColor:
MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// Equal_to Button
else if (index == 18) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
equalPressed();
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.successColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// +, -, / x buttons
else if (index == 7 ||
index == 11 ||
index == 15 ||
index == 19) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
if (answer == "0") {
setState(() {
userInput += buttons[index];
});
} else {
setState(() {
userInput = answer;
answer = "0";
userInput += buttons[index];
});
}
// setState(() {
// userInput += buttons[index];
// });
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// other buttons
else {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
},
),
),
),
],
),
); );
} }
} }

167
Frontend/lib/mih_packages/calculator/app_tools/tip_calc.dart
View File

@@ -2,6 +2,7 @@ import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -268,91 +269,95 @@ class _TipCalcState extends State<TipCalc> {
} }
Widget getBody() { Widget getBody() {
return Column( return MihSingleChildScroll(
mainAxisSize: MainAxisSize.max, child: Column(
children: <Widget>[ mainAxisSize: MainAxisSize.max,
Text( children: <Widget>[
"Tip Calculator", Text(
textAlign: TextAlign.center, "Tip Calculator",
style: TextStyle( textAlign: TextAlign.center,
fontSize: 25, style: TextStyle(
fontWeight: FontWeight.bold, fontSize: 25,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.bold,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
),
), ),
), Divider(
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
const SizedBox(height: 10), const SizedBox(height: 10),
MIHNumberField( MIHNumberField(
controller: billAmountController, controller: billAmountController,
hintText: "Bill Amount", hintText: "Bill Amount",
editable: true, editable: true,
required: true, required: true,
enableDecimal: true, enableDecimal: true,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
MIHNumberField( MIHNumberField(
controller: tipPercentageController, controller: tipPercentageController,
hintText: "Tip %", hintText: "Tip %",
editable: true, editable: true,
required: true, required: true,
enableDecimal: false, enableDecimal: false,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
MIHDropdownField( MIHDropdownField(
controller: splitBillController, controller: splitBillController,
hintText: "Split Bill", hintText: "Split Bill",
dropdownOptions: const ["Yes", "No"], dropdownOptions: const ["Yes", "No"],
required: true, required: true,
editable: true, editable: true,
enableSearch: false, enableSearch: false,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
ValueListenableBuilder( ValueListenableBuilder(
valueListenable: splitValue, valueListenable: splitValue,
builder: (BuildContext context, String value, Widget? child) { builder: (BuildContext context, String value, Widget? child) {
return Visibility( return Visibility(
visible: value == "Yes", visible: value == "Yes",
child: Column( child: Column(
children: [ children: [
MIHNumberField( MIHNumberField(
controller: noPeopleController, controller: noPeopleController,
hintText: "No. of People", hintText: "No. of People",
editable: true, editable: true,
required: true, required: true,
enableDecimal: false, enableDecimal: false,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
), ),
); );
},
),
SizedBox(
width: double.infinity,
height: 50,
child: MIHButton(
onTap: () {
validateInput();
}, },
buttonText: "Calculate",
buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), SizedBox(
const SizedBox(height: 10), width: double.infinity,
SizedBox( height: 50,
width: double.infinity, child: MIHButton(
height: 50, onTap: () {
child: MIHButton( validateInput();
onTap: () { },
clearInput(); buttonText: "Calculate",
}, buttonColor:
buttonText: "Clear", MzanziInnovationHub.of(context)!.theme.successColor(),
buttonColor: MzanziInnovationHub.of(context)!.theme.errorColor(), textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), ),
), ),
), const SizedBox(height: 10),
], SizedBox(
width: double.infinity,
height: 50,
child: MIHButton(
onTap: () {
clearInput();
},
buttonText: "Clear",
buttonColor: MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
),
],
),
); );
} }
} }

3
Frontend/lib/mih_packages/calendar/app_tools/appointments.dart
View File

@@ -4,6 +4,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_time_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_time_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -243,7 +244,7 @@ class _PatientAccessRequestState extends State<Appointments> {
Widget getBody() { Widget getBody() {
return Stack( return Stack(
children: [ children: [
SingleChildScrollView( MihSingleChildScroll(
child: Column( child: Column(
children: [ children: [
Text( Text(

468
Frontend/lib/mih_packages/mzansi_profile/business_profile/app_tools/mih_business_profile.dart
View File

@@ -6,6 +6,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -317,255 +318,246 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
} }
Widget getBody() { Widget getBody() {
return ScrollConfiguration( return MihSingleChildScroll(
behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false), child: KeyboardListener(
child: SingleChildScrollView( focusNode: _focusNode,
child: SafeArea( autofocus: true,
child: KeyboardListener( onKeyEvent: (event) async {
focusNode: _focusNode, if (event is KeyDownEvent &&
autofocus: true, event.logicalKey == LogicalKeyboardKey.enter) {
onKeyEvent: (event) async { //print(business_id);
if (event is KeyDownEvent && submitForm(business_id);
event.logicalKey == LogicalKeyboardKey.enter) { }
//print(business_id); },
submitForm(business_id); child: Column(
} children: [
}, Visibility(
child: Column( visible: isFullAccess(),
children: [ child: Column(
Visibility( children: [
visible: isFullAccess(), const Text(
child: Column( "Business Profile",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 25,
),
),
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,
enableSearch: false,
),
const SizedBox(height: 10.0),
ValueListenableBuilder(
valueListenable: busType,
builder:
(BuildContext context, String value, Widget? child) {
return Visibility(
visible: value == "Doctors Office",
child: MIHTextField(
controller: practiceNoController,
hintText: "Practice Number",
editable: true,
required: true,
),
);
},
),
const SizedBox(height: 10.0),
MIHTextField(
controller: vatNoController,
hintText: "VAT Number",
editable: true,
required: 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: 10.0),
Row(
children: [ children: [
const Text( Flexible(
"Business Profile", child: MIHTextField(
style: TextStyle( controller: locationController,
fontWeight: FontWeight.bold, hintText: "Location",
fontSize: 25, editable: false,
required: false,
), ),
), ),
Divider( const SizedBox(width: 10.0),
color: MzanziInnovationHub.of(context) SizedBox(
?.theme width: 80.0,
.secondaryColor(), height: 50.0,
), child: MIHButton(
const SizedBox(height: 10.0), buttonText: "Set",
MIHTextField( buttonColor: MzanziInnovationHub.of(context)!
controller: regController, .theme
hintText: "Registration No.", .secondaryColor(),
editable: true, textColor: MzanziInnovationHub.of(context)!
required: true, .theme
), .primaryColor(),
const SizedBox(height: 10.0), onTap: () {
MIHTextField( MIHLocationAPI()
controller: nameController, .getGPSPosition(context)
hintText: "Business Name", .then((position) {
editable: true, if (position != null) {
required: true, setState(() {
), locationController.text =
const SizedBox(height: 10.0), "${position.latitude}, ${position.longitude}";
MIHDropdownField(
controller: typeController,
hintText: "Business Type",
dropdownOptions: const ["Doctors Office", "Other"],
required: true,
editable: true,
enableSearch: false,
),
const SizedBox(height: 10.0),
ValueListenableBuilder(
valueListenable: busType,
builder: (BuildContext context, String value,
Widget? child) {
return Visibility(
visible: value == "Doctors Office",
child: MIHTextField(
controller: practiceNoController,
hintText: "Practice Number",
editable: true,
required: true,
),
);
},
),
const SizedBox(height: 10.0),
MIHTextField(
controller: vatNoController,
hintText: "VAT Number",
editable: true,
required: 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: 10.0),
Row(
children: [
Flexible(
child: MIHTextField(
controller: locationController,
hintText: "Location",
editable: false,
required: false,
),
),
const SizedBox(width: 10.0),
SizedBox(
width: 80.0,
height: 50.0,
child: MIHButton(
buttonText: "Set",
buttonColor: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
onTap: () {
MIHLocationAPI()
.getGPSPosition(context)
.then((position) {
if (position != null) {
setState(() {
locationController.text =
"${position.latitude}, ${position.longitude}";
});
}
}); });
}, }
), });
), },
], ),
), ),
const SizedBox(height: 15.0),
], ],
), ),
const SizedBox(height: 15.0),
],
),
),
Column(
children: [
//const SizedBox(height: 15.0),
const Text(
"My Business User",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 25,
),
), ),
Column( Divider(
children: [ color:
//const SizedBox(height: 15.0), MzanziInnovationHub.of(context)?.theme.secondaryColor(),
const Text( ),
"My Business User", const SizedBox(height: 10.0),
style: TextStyle( MIHDropdownField(
fontWeight: FontWeight.bold, controller: titleController,
fontSize: 25, hintText: "Title",
), dropdownOptions: const ["Doctor", "Assistant"],
), required: true,
Divider( editable: true,
color: MzanziInnovationHub.of(context) enableSearch: false,
?.theme ),
.secondaryColor(), const SizedBox(height: 10.0),
), MIHTextField(
const SizedBox(height: 10.0), controller: fnameController,
MIHDropdownField( hintText: "Name",
controller: titleController, editable: false,
hintText: "Title", required: true,
dropdownOptions: const ["Doctor", "Assistant"], ),
required: true, const SizedBox(height: 10.0),
editable: true, MIHTextField(
enableSearch: false, controller: lnameController,
), hintText: "Surname",
const SizedBox(height: 10.0), editable: false,
MIHTextField( required: true,
controller: fnameController, ),
hintText: "Name", const SizedBox(height: 10.0),
editable: false, MIHFileField(
required: true, controller: signtureController,
), hintText: "Signature",
const SizedBox(height: 10.0), editable: false,
MIHTextField( required: true,
controller: lnameController, onPressed: () async {
hintText: "Surname", FilePickerResult? result =
editable: false, await FilePicker.platform.pickFiles(
required: true, type: FileType.custom,
), allowedExtensions: ['jpg', 'png', 'pdf'],
const SizedBox(height: 10.0), );
MIHFileField( if (result == null) return;
controller: signtureController, final selectedFile = result.files.first;
hintText: "Signature", setState(() {
editable: false, selectedSignature = selectedFile;
required: true, });
onPressed: () async { setState(() {
FilePickerResult? result = signtureController.text = selectedFile.name;
await FilePicker.platform.pickFiles( });
type: FileType.custom, },
allowedExtensions: ['jpg', 'png', 'pdf'], ),
); const SizedBox(height: 15.0),
if (result == null) return; MIHDropdownField(
final selectedFile = result.files.first; controller: accessController,
setState(() { hintText: "Access",
selectedSignature = selectedFile; dropdownOptions: const ["Full", "Partial"],
}); required: true,
setState(() { editable: false,
signtureController.text = selectedFile.name; enableSearch: false,
}); ),
}, const SizedBox(height: 30.0),
), SizedBox(
const SizedBox(height: 15.0), width: 500.0,
MIHDropdownField( height: 50.0,
controller: accessController, child: MIHButton(
hintText: "Access", buttonText: "Update",
dropdownOptions: const ["Full", "Partial"], buttonColor:
required: true, MzanziInnovationHub.of(context)!.theme.secondaryColor(),
editable: false, textColor:
enableSearch: false, MzanziInnovationHub.of(context)!.theme.primaryColor(),
), onTap: () {
const SizedBox(height: 30.0), //print(business_id);
SizedBox( submitForm(business_id);
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);
},
),
),
],
), ),
], ],
), ),
), ],
), ),
), ),
); );

117
Frontend/lib/mih_packages/mzansi_profile/business_profile/app_tools/mih_business_user_search.dart
View File

@@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -97,65 +98,69 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
} }
Widget getBody() { Widget getBody() {
return KeyboardListener( return MihSingleChildScroll(
focusNode: _focusNode, child: KeyboardListener(
autofocus: true, focusNode: _focusNode,
onKeyEvent: (event) async { autofocus: true,
if (event is KeyDownEvent && onKeyEvent: (event) async {
event.logicalKey == LogicalKeyboardKey.enter) { if (event is KeyDownEvent &&
submitUserForm(); event.logicalKey == LogicalKeyboardKey.enter) {
}
},
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(); submitUserForm();
}, }
), },
//spacer child: Column(mainAxisSize: MainAxisSize.max, children: [
const SizedBox(height: 10), const Text(
FutureBuilder( "User Search",
future: userSearchResults, style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
builder: (context, snapshot) { ),
//print("patient Liust ${snapshot.data}"); //spacer
if (snapshot.connectionState == ConnectionState.waiting) { Divider(
return const Mihloadingcircle(); color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
} else if (snapshot.connectionState == ConnectionState.done && const SizedBox(height: 10),
snapshot.hasData) { MIHSearchField(
List<AppUser> patientsList; controller: searchController,
if (userSearch == "") { hintText: "Username or Email Search",
patientsList = []; 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<AppUser> patientsList;
if (userSearch == "") {
patientsList = [];
} else {
patientsList = snapshot.data!;
//print(patientsList);
}
return displayUserList(patientsList);
} else { } else {
patientsList = snapshot.data!; return Center(
//print(patientsList); 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,
),
);
} }
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,
),
);
}
},
),
]),
); );
} }
} }

78
Frontend/lib/mih_packages/mzansi_profile/business_profile/app_tools/mih_my_business_team.dart
View File

@@ -1,6 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
import 'package:Mzansi_Innovation_Hub/mih_env/env.dart'; import 'package:Mzansi_Innovation_Hub/mih_env/env.dart';
@@ -80,45 +81,48 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
} }
Widget getBody() { Widget getBody() {
return Column(mainAxisSize: MainAxisSize.max, children: [ return MihSingleChildScroll(
const Text( child: Column(mainAxisSize: MainAxisSize.max, children: [
"Business Team", const Text(
style: TextStyle( "Business Team",
fontWeight: FontWeight.bold, style: TextStyle(
fontSize: 25, fontWeight: FontWeight.bold,
fontSize: 25,
),
), ),
), Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), const SizedBox(height: 10),
const SizedBox(height: 10), FutureBuilder(
FutureBuilder( future: employeeList,
future: employeeList, builder: (context, snapshot) {
builder: (context, snapshot) { //print("patient Queue List ${snapshot.hasData}");
//print("patient Queue List ${snapshot.hasData}"); if (snapshot.connectionState == ConnectionState.waiting) {
if (snapshot.connectionState == ConnectionState.waiting) { return const Mihloadingcircle();
return const Mihloadingcircle(); } else if (snapshot.connectionState == ConnectionState.done) {
} else if (snapshot.connectionState == ConnectionState.done) { //List<BusinessEmployee> employeeListResults;
//List<BusinessEmployee> employeeListResults; // if (searchString == "") {
// if (searchString == "") { // patientQueueList = [];
// patientQueueList = []; // } else {
// } else {
// print(patientQueueList); // print(patientQueueList);
// } // }
return displayEmployeeList(snapshot.requireData); return displayEmployeeList(snapshot.requireData);
} else { } else {
return Center( return Center(
child: Text( child: Text(
"$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody", "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody",
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
color: MzanziInnovationHub.of(context)!.theme.errorColor()), color:
textAlign: TextAlign.center, MzanziInnovationHub.of(context)!.theme.errorColor()),
), textAlign: TextAlign.center,
); ),
} );
}, }
), },
]); ),
]),
);
} }
} }

207
Frontend/lib/mih_packages/mzansi_profile/personal_profile/app_tools/mih_personal_profile.dart
View File

@@ -4,6 +4,7 @@ import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -245,117 +246,119 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
} }
Widget getBody() { Widget getBody() {
return Column( return MihSingleChildScroll(
children: [ child: Column(
//displayProPic(), children: [
MIHProfilePicture( //displayProPic(),
profilePictureFile: widget.arguments.propicFile, MIHProfilePicture(
proPicController: proPicController, profilePictureFile: widget.arguments.propicFile,
proPic: proPic, proPicController: proPicController,
width: 155, proPic: proPic,
radius: 70, width: 155,
drawerMode: false, radius: 70,
editable: true, drawerMode: false,
onChange: (newProPic) { editable: true,
setState(() { onChange: (newProPic) {
proPic = newProPic;
});
},
),
const SizedBox(height: 25.0),
Visibility(
visible: false,
child: MIHFileField(
controller: proPicController,
hintText: "Profile Picture",
editable: false,
required: false,
onPressed: () async {
FilePickerResult? result = await FilePicker.platform.pickFiles(
type: FileType.custom,
allowedExtensions: ['jpg', 'png'],
);
if (result == null) return;
final selectedFile = result.files.first;
setState(() { setState(() {
proPic = selectedFile; proPic = newProPic;
propicPreview = MemoryImage(proPic!.bytes!);
});
setState(() {
proPicController.text = selectedFile.name;
}); });
}, },
), ),
), const SizedBox(height: 25.0),
// const SizedBox(height: 10.0), Visibility(
// MIHTextField( visible: false,
// controller: proPicController, child: MIHFileField(
// hintText: "Pro Pic", controller: proPicController,
// editable: true, hintText: "Profile Picture",
// required: true, editable: false,
// ), required: false,
const SizedBox(height: 10.0), onPressed: () async {
MIHTextField( FilePickerResult? result = await FilePicker.platform.pickFiles(
controller: usernameController, type: FileType.custom,
hintText: "Username", allowedExtensions: ['jpg', 'png'],
editable: true, );
required: true, if (result == null) return;
), final selectedFile = result.files.first;
const SizedBox(height: 10.0),
MIHTextField(
controller: fnameController,
hintText: "First Name",
editable: true,
required: true,
),
const SizedBox(height: 10.0),
MIHTextField(
controller: lnameController,
hintText: "Last Name",
editable: true,
required: true,
),
const SizedBox(height: 10.0),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Text(
"Activate Business Account",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20,
),
),
const SizedBox(
width: 10,
),
Switch(
value: businessUser,
onChanged: (bool value) {
setState(() { setState(() {
businessUser = value; proPic = selectedFile;
propicPreview = MemoryImage(proPic!.bytes!);
});
setState(() {
proPicController.text = selectedFile.name;
}); });
}, },
), ),
],
),
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: () {
submitForm();
},
), ),
), // const SizedBox(height: 10.0),
], // MIHTextField(
// controller: proPicController,
// hintText: "Pro Pic",
// editable: true,
// required: true,
// ),
const SizedBox(height: 10.0),
MIHTextField(
controller: usernameController,
hintText: "Username",
editable: true,
required: true,
),
const SizedBox(height: 10.0),
MIHTextField(
controller: fnameController,
hintText: "First Name",
editable: true,
required: true,
),
const SizedBox(height: 10.0),
MIHTextField(
controller: lnameController,
hintText: "Last Name",
editable: true,
required: true,
),
const SizedBox(height: 10.0),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Text(
"Activate Business Account",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20,
),
),
const SizedBox(
width: 10,
),
Switch(
value: businessUser,
onChanged: (bool value) {
setState(() {
businessUser = value;
});
},
),
],
),
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: () {
submitForm();
},
),
),
],
),
); );
} }
} }

3
Frontend/lib/mih_packages/mzansi_wallet/app_tools/mih_cards.dart
View File

@@ -4,6 +4,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -233,7 +234,7 @@ class _MihCardsState extends State<MihCards> {
Widget getBody() { Widget getBody() {
return Stack( return Stack(
children: [ children: [
SingleChildScrollView( MihSingleChildScroll(
child: Column( child: Column(
children: [ children: [
Row( Row(

27
Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/mih_patient_search.dart
View File

@@ -1,6 +1,7 @@
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_apis/mih_api_calls.dart'; import 'package:Mzansi_Innovation_Hub/mih_apis/mih_api_calls.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
import 'package:Mzansi_Innovation_Hub/mih_env/env.dart'; import 'package:Mzansi_Innovation_Hub/mih_env/env.dart';
@@ -39,19 +40,19 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
late Future<List<Patient>> _mihPatientSearchResults; late Future<List<Patient>> _mihPatientSearchResults;
Widget getPatientSearch() { Widget getPatientSearch() {
return KeyboardListener( return MihSingleChildScroll(
focusNode: _focusNode, child: KeyboardListener(
autofocus: true, focusNode: _focusNode,
onKeyEvent: (event) async { autofocus: true,
if (event is KeyDownEvent && onKeyEvent: (event) async {
event.logicalKey == LogicalKeyboardKey.enter) { if (event is KeyDownEvent &&
// submitPatientForm(); event.logicalKey == LogicalKeyboardKey.enter) {
submitPatientSearch(); // submitPatientForm();
//To-Do: Implement the search function submitPatientSearch();
// print("To-Do: Implement the search function"); //To-Do: Implement the search function
} // print("To-Do: Implement the search function");
}, }
child: SingleChildScrollView( },
child: Column(mainAxisSize: MainAxisSize.max, children: [ child: Column(mainAxisSize: MainAxisSize.max, children: [
const Text( const Text(
"MIH Patient Lookup", "MIH Patient Lookup",

29
Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/my_patient_list.dart
View File

@@ -1,6 +1,7 @@
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_apis/mih_api_calls.dart'; import 'package:Mzansi_Innovation_Hub/mih_apis/mih_api_calls.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
import 'package:Mzansi_Innovation_Hub/mih_env/env.dart'; import 'package:Mzansi_Innovation_Hub/mih_env/env.dart';
@@ -39,20 +40,20 @@ class _MyPatientListState extends State<MyPatientList> {
final FocusNode _focusNode = FocusNode(); final FocusNode _focusNode = FocusNode();
Widget myPatientListTool() { Widget myPatientListTool() {
return KeyboardListener( return MihSingleChildScroll(
focusNode: _focusNode, child: KeyboardListener(
autofocus: true, focusNode: _focusNode,
onKeyEvent: (event) async { autofocus: true,
if (event is KeyDownEvent && onKeyEvent: (event) async {
event.logicalKey == LogicalKeyboardKey.enter) { if (event is KeyDownEvent &&
setState(() { event.logicalKey == LogicalKeyboardKey.enter) {
_myPatientIdSearchString = _myPatientSearchController.text; setState(() {
_myPatientList = MIHApiCalls.getPatientAccessListOfBusiness( _myPatientIdSearchString = _myPatientSearchController.text;
widget.business!.business_id); _myPatientList = MIHApiCalls.getPatientAccessListOfBusiness(
}); widget.business!.business_id);
} });
}, }
child: SingleChildScrollView( },
child: Column(mainAxisSize: MainAxisSize.max, children: [ child: Column(mainAxisSize: MainAxisSize.max, children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,

3
Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/waiting_room.dart
View File

@@ -6,6 +6,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_time_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_time_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -61,7 +62,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
Widget getBusinessAppointmentsTool() { Widget getBusinessAppointmentsTool() {
return Stack( return Stack(
children: [ children: [
SingleChildScrollView( MihSingleChildScroll(
child: Column( child: Column(
children: [ children: [
const Text( const Text(