QOL: Patient Manager Package performance improvements pt2

Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart

@@ -748,8 +748,6 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
         return Padding(
           padding: EdgeInsets.symmetric(horizontal: getPaddingSize()),
           child: ListView.builder(
-            physics: const NeverScrollableScrollPhysics(),
-            shrinkWrap: true,
             itemCount: mzansiProfileProvider.personalHome
                 ? mihCalendarProvider.personalAppointments!.length
                 : mihCalendarProvider.businessAppointments!.length,

Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart

@@ -558,8 +558,6 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
       builder: (BuildContext context, MzansiProfileProvider profileProvider,
           PatientManagerProvider patientManagerProvider, Widget? child) {
         return ListView.separated(
-          shrinkWrap: true,
-          physics: const NeverScrollableScrollPhysics(),
           separatorBuilder: (BuildContext context, index) {
             return Divider(
               color: MihColors.getSecondaryColor(

Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart

@@ -522,8 +522,6 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       builder: (BuildContext context, MzansiProfileProvider profileProvider,
           PatientManagerProvider patientManagerProvider, Widget? child) {
         return ListView.separated(
-          shrinkWrap: true,
-          physics: const NeverScrollableScrollPhysics(),
           separatorBuilder: (BuildContext context, index) {
             return Divider(
               color: MihColors.getSecondaryColor(

Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/mih_patient_search.dart

@@ -3,7 +3,6 @@ import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
@@ -34,38 +33,36 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
     return Consumer<PatientManagerProvider>(
       builder: (BuildContext context,
           PatientManagerProvider patientManagerProvider, Widget? child) {
-        return MihSingleChildScroll(
+        return Column(mainAxisSize: MainAxisSize.max, children: [
-          child: Column(mainAxisSize: MainAxisSize.max, children: [
+          Padding(
-            Padding(
+            padding: EdgeInsets.symmetric(horizontal: width / 20),
-              padding: EdgeInsets.symmetric(horizontal: width / 20),
+            child: MihSearchBar(
-              child: MihSearchBar(
+              controller: _mihPatientSearchController,
-                controller: _mihPatientSearchController,
+              hintText: "Search Patient ID/ Aid No.",
-                hintText: "Search Patient ID/ Aid No.",
+              prefixIcon: Icons.search,
-                prefixIcon: Icons.search,
+              fillColor: MihColors.getSecondaryColor(
-                fillColor: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              hintColor: MihColors.getPrimaryColor(
-                hintColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              onPrefixIconTap: () {
-                onPrefixIconTap: () {
+                submitPatientSearch(patientManagerProvider);
-                  submitPatientSearch(patientManagerProvider);
+              },
-                },
+              onClearIconTap: () {
-                onClearIconTap: () {
+                setState(() {
-                  setState(() {
+                  _mihPatientSearchController.clear();
-                    _mihPatientSearchController.clear();
+                  _mihPatientSearchString = "";
-                    _mihPatientSearchString = "";
+                });
-                  });
+                patientManagerProvider
-                  patientManagerProvider
+                    .setPatientSearchResults(patientSearchResults: []);
-                      .setPatientSearchResults(patientSearchResults: []);
+              },
-                },
+              searchFocusNode: _searchFocusNode,
-                searchFocusNode: _searchFocusNode,
-              ),
             ),
-            //spacer
+          ),
-            const SizedBox(height: 10),
+          //spacer
+          const SizedBox(height: 10),
 
-            displayPatientList(patientManagerProvider, _mihPatientSearchString),
+          displayPatientList(patientManagerProvider, _mihPatientSearchString),
-          ]),
+        ]);
-        );
       },
     );
   }
@@ -86,7 +83,9 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
   Widget displayPatientList(
       PatientManagerProvider patientManagerProvider, String searchString) {
     if (patientManagerProvider.patientSearchResults.isNotEmpty) {
-      return BuildMihPatientSearchList();
+      return Expanded(
+        child: BuildMihPatientSearchList(),
+      );
     } else if (patientManagerProvider.patientSearchResults.isEmpty &&
         searchString != "") {
       return Column(

Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/my_patient_list.dart

@@ -4,7 +4,6 @@ import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart
 import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
@@ -33,46 +32,44 @@ class _MyPatientListState extends State<MyPatientList> {
 
   Widget myPatientListTool(MzansiProfileProvider profileProvider,
       PatientManagerProvider patientManagerProvider, double width) {
-    return MihSingleChildScroll(
+    return Column(mainAxisSize: MainAxisSize.max, children: [
-      child: Column(mainAxisSize: MainAxisSize.max, children: [
+      Padding(
-        Padding(
+        padding: EdgeInsets.symmetric(horizontal: width / 20),
-          padding: EdgeInsets.symmetric(horizontal: width / 20),
+        child: MihSearchBar(
-          child: MihSearchBar(
+          controller: _myPatientSearchController,
-            controller: _myPatientSearchController,
+          hintText: "Search Patient ID",
-            hintText: "Search Patient ID",
+          prefixIcon: Icons.search,
-            prefixIcon: Icons.search,
+          fillColor: MihColors.getSecondaryColor(
-            fillColor: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          hintColor: MihColors.getPrimaryColor(
-            hintColor: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          onPrefixIconTap: () {
-            onPrefixIconTap: () {
+            setState(() async {
-              setState(() async {
+              _myPatientIdSearchString = _myPatientSearchController.text;
-                _myPatientIdSearchString = _myPatientSearchController.text;
+              await MihPatientServices().getPatientAccessListOfBusiness(
-                await MihPatientServices().getPatientAccessListOfBusiness(
+                  patientManagerProvider,
-                    patientManagerProvider,
+                  profileProvider.business!.business_id);
-                    profileProvider.business!.business_id);
+            });
-              });
+          },
-            },
+          onClearIconTap: () {
-            onClearIconTap: () {
+            setState(() {
-              setState(() {
+              _myPatientSearchController.clear();
-                _myPatientSearchController.clear();
+              _myPatientIdSearchString = "";
-                _myPatientIdSearchString = "";
+            });
-              });
+            getMyPatientList(profileProvider, patientManagerProvider);
-              getMyPatientList(profileProvider, patientManagerProvider);
+          },
-            },
+          searchFocusNode: _searchFocusNode,
-            searchFocusNode: _searchFocusNode,
-          ),
         ),
-        //spacer
+      ),
-        const SizedBox(height: 10),
+      //spacer
-        displayMyPatientList(patientManagerProvider),
+      const SizedBox(height: 10),
-      ]),
+      displayMyPatientList(patientManagerProvider),
-    );
+    ]);
   }
 
   Widget displayMyPatientList(PatientManagerProvider patientManagerProvider) {
     if (patientManagerProvider.myPaitentList!.isNotEmpty) {
-      return BuildMyPatientListList();
+      return Expanded(child: BuildMyPatientListList());
     }
     if (hasSearchedBefore && _myPatientIdSearchString.isNotEmpty) {
       return Column(
@@ -199,7 +196,6 @@ class _MyPatientListState extends State<MyPatientList> {
 
   @override
   void dispose() {
-    // TODO: implement dispose
     super.dispose();
     _myPatientSearchController.dispose();
     _searchFocusNode.dispose();

Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/waiting_room.dart

@@ -10,7 +10,6 @@ import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_calendar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
@@ -71,29 +70,22 @@ class _WaitingRoomState extends State<WaitingRoom> {
         }
         return Stack(
           children: [
-            MihSingleChildScroll(
+            Column(
-              child: Column(
+              children: [
-                children: [
+                MIHCalendar(
-                  MIHCalendar(
+                    calendarWidth: 500,
-                      calendarWidth: 500,
+                    rowHeight: 35,
-                      rowHeight: 35,
+                    setDate: (value) {
-                      setDate: (value) {
+                      mihCalendarProvider.setSelectedDay(value);
-                        mihCalendarProvider.setSelectedDay(value);
+                      setState(() {
-                        setState(() {
+                        selectedAppointmentDateController.text = value;
-                          selectedAppointmentDateController.text = value;
+                      });
-                        });
+                    }),
-                      }),
+                // Divider(
-                  // Divider(
+                //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                // ),
-                  // ),
+                displayAppointmentList(mihCalendarProvider)
-                  Row(
+              ],
-                    mainAxisSize: MainAxisSize.max,
-                    children: [
-                      displayAppointmentList(mihCalendarProvider),
-                    ],
-                  )
-                ],
-              ),
             ),
             Positioned(
               right: 10,

Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_claim_statement_files_list.dart

@@ -266,8 +266,6 @@ class _BuildClaimStatementFileListState
           PatientManagerProvider patientManagerProvider, Widget? child) {
         if (patientManagerProvider.patientClaimsDocuments!.isNotEmpty) {
           return ListView.separated(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
             separatorBuilder: (BuildContext context, int index) {
               return Divider(
                 color: MihColors.getSecondaryColor(

Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_files_list.dart

@@ -299,8 +299,6 @@ class _BuildFilesListState extends State<BuildFilesList> {
           PatientManagerProvider patientManagerProvider, Widget? child) {
         if (patientManagerProvider.patientDocuments!.isNotEmpty) {
           return ListView.separated(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
             separatorBuilder: (BuildContext context, int index) {
               return Divider(
                 color: MihColors.getSecondaryColor(

Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_notes_list.dart

@@ -222,8 +222,6 @@ class _BuildNotesListState extends State<BuildNotesList> {
           PatientManagerProvider patientManagerProvider, Widget? child) {
         if (patientManagerProvider.consultationNotes!.isNotEmpty) {
           return ListView.separated(
-            shrinkWrap: true,
-            physics: const NeverScrollableScrollPhysics(),
             separatorBuilder: (BuildContext context, int index) {
               return Divider(
                 color: MihColors.getSecondaryColor(

Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart

@@ -48,12 +48,7 @@ class _PatientClaimOrStatementState extends State<PatientClaimOrStatement> {
           PatientManagerProvider patientManagerProvider, Widget? child) {
         return Stack(
           children: [
-            Column(
+            BuildClaimStatementFileList(),
-              children: [
-                //const Placeholder(),
-                BuildClaimStatementFileList(),
-              ],
-            ),
             Visibility(
               visible: !patientManagerProvider.personalMode,
               child: Positioned(

Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart

@@ -8,7 +8,6 @@ import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
@@ -290,10 +289,7 @@ class _PatientConsultationState extends State<PatientConsultation> {
           PatientManagerProvider patientManagerProvider, Widget? child) {
         return Stack(
           children: [
-            MihSingleChildScroll(
+            BuildNotesList(),
-                child: Column(children: [
-              BuildNotesList(),
-            ])),
             Visibility(
               visible: !patientManagerProvider.personalMode,
               child: Positioned(

Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart

@@ -8,7 +8,6 @@ import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
@@ -565,11 +564,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
           PatientManagerProvider patientManagerProvider, Widget? child) {
         return Stack(
           children: [
-            MihSingleChildScroll(
+            BuildFilesList(),
-              child: Column(children: [
-                BuildFilesList(),
-              ]),
-            ),
             getMenu(profileProvider, patientManagerProvider, width),
           ],
         );