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

Merge pull request #98 from yaso-meth/BUG--Appointment-list-overflow

Browse Source 
BUG--Appointment-list-overflow
This commit is contained in:
yaso-meth
2025-03-10 13:58:51 +02:00
committed by GitHub
parent 3f20f1dc44 b693dfd631
commit baae507f72
4 changed files with 278 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Frontend/lib/mih_packages/calendar/appointments.dart
View File

@@ -243,7 +243,8 @@ class _PatientAccessRequestState extends State<Appointments> {
Widget getBody() { Widget getBody() {
return Stack( return Stack(
children: [ children: [
Column( SingleChildScrollView(
child: Column(
children: [ children: [
Text( Text(
getTitle(), getTitle(),
@@ -270,7 +271,8 @@ class _PatientAccessRequestState extends State<Appointments> {
FutureBuilder( FutureBuilder(
future: appointmentResults, future: appointmentResults,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState ==
ConnectionState.waiting) {
return const Expanded( return const Expanded(
child: Center(child: Mihloadingcircle())); child: Center(child: Mihloadingcircle()));
} else if (snapshot.connectionState == } else if (snapshot.connectionState ==
@@ -295,6 +297,7 @@ class _PatientAccessRequestState extends State<Appointments> {
) )
], ],
), ),
),
Positioned( Positioned(
right: 0, right: 0,
bottom: 0, bottom: 0,

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

@@ -51,12 +51,14 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
// print("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",
style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold), style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
), ),
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), Divider(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
//spacer //spacer
const SizedBox(height: 10), const SizedBox(height: 10),
Row( Row(
@@ -111,15 +113,17 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
snapshot.data!, _mihPatientSearchString); snapshot.data!, _mihPatientSearchString);
//print(patientsList); //print(patientsList);
} }
return displayPatientList(patientsList, _mihPatientSearchString); return displayPatientList(
patientsList, _mihPatientSearchString);
} else { } else {
return Center( return Center(
child: Text( child: Text(
"Error pulling Patients Data\n$baseUrl/patients/search/$_mihPatientSearchString", "Error pulling Patients Data\n$baseUrl/patients/search/$_mihPatientSearchString",
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
color: color: MzanziInnovationHub.of(context)!
MzanziInnovationHub.of(context)!.theme.errorColor()), .theme
.errorColor()),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
); );
@@ -127,6 +131,7 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
}, },
), ),
]), ]),
),
); );
} }

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

@@ -52,6 +52,7 @@ class _MyPatientListState extends State<MyPatientList> {
}); });
} }
}, },
child: SingleChildScrollView(
child: Column(mainAxisSize: MainAxisSize.max, children: [ child: Column(mainAxisSize: MainAxisSize.max, children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@@ -71,7 +72,8 @@ class _MyPatientListState extends State<MyPatientList> {
), ),
], ],
), ),
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), Divider(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
//spacer //spacer
const SizedBox(height: 10), const SizedBox(height: 10),
Row( Row(
@@ -86,8 +88,10 @@ class _MyPatientListState extends State<MyPatientList> {
editable: true, editable: true,
onTap: () { onTap: () {
setState(() { setState(() {
_myPatientIdSearchString = _myPatientSearchController.text; _myPatientIdSearchString =
_myPatientList = MIHApiCalls.getPatientAccessListOfBusiness( _myPatientSearchController.text;
_myPatientList =
MIHApiCalls.getPatientAccessListOfBusiness(
widget.business!.business_id); widget.business!.business_id);
}); });
}, },
@@ -132,8 +136,9 @@ class _MyPatientListState extends State<MyPatientList> {
"Error pulling Patient Access Data\n$baseUrl/access-requests/business/patient/${widget.business!.business_id}", "Error pulling Patient Access Data\n$baseUrl/access-requests/business/patient/${widget.business!.business_id}",
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
color: color: MzanziInnovationHub.of(context)!
MzanziInnovationHub.of(context)!.theme.errorColor()), .theme
.errorColor()),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
); );
@@ -141,6 +146,7 @@ class _MyPatientListState extends State<MyPatientList> {
}, },
), ),
]), ]),
),
); );
} }

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

@@ -61,7 +61,8 @@ class _WaitingRoomState extends State<WaitingRoom> {
Widget getBusinessAppointmentsTool() { Widget getBusinessAppointmentsTool() {
return Stack( return Stack(
children: [ children: [
Column( SingleChildScrollView(
child: Column(
children: [ children: [
const Text( const Text(
"Waiting Room", "Waiting Room",
@@ -88,7 +89,8 @@ class _WaitingRoomState extends State<WaitingRoom> {
FutureBuilder( FutureBuilder(
future: appointmentResults, future: appointmentResults,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState ==
ConnectionState.waiting) {
return const Expanded( return const Expanded(
child: Center(child: Mihloadingcircle())); child: Center(child: Mihloadingcircle()));
} else if (snapshot.connectionState == } else if (snapshot.connectionState ==
@@ -115,6 +117,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
) )
], ],
), ),
),
Positioned( Positioned(
right: 0, right: 0,
bottom: 0, bottom: 0,