create new MIH Button

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

@@ -2,10 +2,10 @@ import 'dart:convert';
 
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_api_calls.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_date_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_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.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_success_message.dart';
@@ -208,34 +208,34 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
               required: true,
             ),
             const SizedBox(height: 30.0),
-            SizedBox(
+            MihButton(
+              onPressed: () {
+                bool filled = isAppointmentFieldsFilled();
+                if (filled) {
+                  //print("here2");
+                  submitApointment(index);
+                  //print("here3");
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (context) {
+                      return const MIHErrorMessage(errorType: "Input Error");
+                    },
+                  );
+                }
+              },
+              buttonColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
               width: 300,
-              height: 50,
-              child: MIHButton(
-                buttonText: "Book",
-                buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                textColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                onTap: () {
-                  //print("here1");
-                  bool filled = isAppointmentFieldsFilled();
-                  //print("fields filled: $filled");
-                  if (filled) {
-                    //print("here2");
-                    submitApointment(index);
-                    //print("here3");
-                  } else {
-                    showDialog(
-                      context: context,
-                      builder: (context) {
-                        return const MIHErrorMessage(errorType: "Input Error");
-                      },
-                    );
-                  }
-                },
+              child: Text(
+                "Book",
+                style: TextStyle(
+                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
-            )
+            ),
           ],
         ),
       ),
@@ -427,111 +427,97 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             // const SizedBox(height: 15.0),
             Wrap(runSpacing: 10, spacing: 10, children: [
-              // Visibility(
-              //   visible: hasAccess,
-              //   child: SizedBox(
-              //     width: 300,
-              //     height: 50,
-              //     child: MIHButton(
-              //       buttonText: "Book Appointment",
-              //       buttonColor:
-              //           MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              //       textColor:
-              //           MzanziInnovationHub.of(context)!.theme.primaryColor(),
-              //       onTap: () {
-              //         if (hasAccess) {
-              //           appointmentPopUp(index);
-              //         } else {
-              //           noAccessWarning();
-              //         }
-              //       },
-              //     ),
-              //   ),
-              // ),
               Visibility(
                 visible: hasAccess,
-                child: SizedBox(
+                child: MihButton(
+                  onPressed: () {
+                    if (hasAccess) {
+                      Navigator.of(context)
+                          .pushNamed('/patient-manager/patient',
+                              arguments: PatientViewArguments(
+                                widget.signedInUser,
+                                widget.patients[index],
+                                widget.businessUser,
+                                widget.business,
+                                "business",
+                              ));
+                    } else {
+                      noAccessWarning();
+                    }
+                  },
+                  buttonColor:
+                      MzanziInnovationHub.of(context)!.theme.successColor(),
                   width: 300,
-                  height: 50,
-                  child: MIHButton(
-                    buttonText: "View Patient Profile",
-                    buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
-                    textColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                    onTap: () {
-                      if (hasAccess) {
-                        Navigator.of(context)
-                            .pushNamed('/patient-manager/patient',
-                                arguments: PatientViewArguments(
-                                  widget.signedInUser,
-                                  widget.patients[index],
-                                  widget.businessUser,
-                                  widget.business,
-                                  "business",
-                                ));
-                      } else {
-                        noAccessWarning();
-                      }
-                    },
+                  child: Text(
+                    "View Profile",
+                    style: TextStyle(
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                    ),
                   ),
                 ),
               ),
               Visibility(
                 visible: !hasAccess && accessStatus == "No Access",
-                child: SizedBox(
+                child: MihButton(
+                  onPressed: () {
+                    MIHApiCalls.addPatientAccessAPICall(
+                      widget.business!.business_id,
+                      widget.patients[index].app_id,
+                      "patient",
+                      widget.business!.Name,
+                      widget.personalSelected,
+                      BusinessArguments(
+                        widget.signedInUser,
+                        widget.businessUser,
+                        widget.business,
+                      ),
+                      context,
+                    );
+                  },
+                  buttonColor:
+                      MzanziInnovationHub.of(context)!.theme.successColor(),
                   width: 300,
-                  height: 50,
-                  child: MIHButton(
-                    buttonText: "Request Access",
-                    buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
-                    textColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                    onTap: () {
-                      //print("Send access Request...");
-                      MIHApiCalls.addPatientAccessAPICall(
-                        widget.business!.business_id,
-                        widget.patients[index].app_id,
-                        "patient",
-                        widget.business!.Name,
-                        widget.personalSelected,
-                        BusinessArguments(
-                          widget.signedInUser,
-                          widget.businessUser,
-                          widget.business,
-                        ),
-                        context,
-                      );
-                    },
+                  child: Text(
+                    "Request Access",
+                    style: TextStyle(
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                    ),
                   ),
                 ),
               ),
               Visibility(
                 visible: !hasAccess && accessStatus == "declined",
-                child: SizedBox(
+                child: MihButton(
+                  onPressed: () {
+                    MIHApiCalls.reapplyPatientAccessAPICall(
+                      widget.business!.business_id,
+                      widget.patients[index].app_id,
+                      widget.personalSelected,
+                      BusinessArguments(
+                        widget.signedInUser,
+                        widget.businessUser,
+                        widget.business,
+                      ),
+                      context,
+                    );
+                  },
+                  buttonColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
                   width: 300,
-                  height: 50,
-                  child: MIHButton(
-                    buttonText: "Re-apply",
-                    buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.successColor(),
-                    textColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                    onTap: () {
-                      // print("Send rewaply access Request...");
-                      MIHApiCalls.reapplyPatientAccessAPICall(
-                        widget.business!.business_id,
-                        widget.patients[index].app_id,
-                        widget.personalSelected,
-                        BusinessArguments(
-                          widget.signedInUser,
-                          widget.businessUser,
-                          widget.business,
-                        ),
-                        context,
-                      );
-                    },
+                  child: Text(
+                    "Re-apply",
+                    style: TextStyle(
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                    ),
                   ),
                 ),
               ),

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

@@ -1,10 +1,10 @@
 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_mzansi_calendar_apis.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_date_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_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.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_warning_message.dart';
@@ -141,34 +141,32 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               required: true,
             ),
             const SizedBox(height: 30.0),
-            SizedBox(
+            MihButton(
+              onPressed: () {
+                bool filled = isAppointmentFieldsFilled();
+                if (filled) {
+                  submitApointment(index);
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (context) {
+                      return const MIHErrorMessage(errorType: "Input Error");
+                    },
+                  );
+                }
+              },
+              buttonColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
               width: 300,
-              height: 50,
-              child: MIHButton(
-                buttonText: "Book",
-                buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                textColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                onTap: () {
-                  //print("here1");
-                  bool filled = isAppointmentFieldsFilled();
-                  //print("fields filled: $filled");
-                  if (filled) {
-                    //print("here2");
-                    submitApointment(index);
-                    //print("here3");
-                  } else {
-                    showDialog(
-                      context: context,
-                      builder: (context) {
-                        return const MIHErrorMessage(errorType: "Input Error");
-                      },
-                    );
-                  }
-                },
+              child: Text(
+                "Book Appointment",
+                style: TextStyle(
+                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
-            )
+            ),
           ],
         ),
       ),
@@ -246,40 +244,45 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
             ),
             const SizedBox(height: 30.0),
             Wrap(runSpacing: 10, spacing: 10, children: [
-              SizedBox(
+              MihButton(
+                onPressed: () {
+                  appointmentPopUp(index);
+                },
+                buttonColor:
+                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
                 width: 300,
-                height: 50,
-                child: MIHButton(
-                  buttonText: "Book Appointment",
-                  buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                  textColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                  onTap: () {
-                    appointmentPopUp(index);
-                  },
+                child: Text(
+                  "Book Appointment",
+                  style: TextStyle(
+                    color:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
-              SizedBox(
+              MihButton(
+                onPressed: () {
+                  Navigator.of(context).pushNamed('/patient-manager/patient',
+                      arguments: PatientViewArguments(
+                        widget.signedInUser,
+                        patientProfile,
+                        widget.businessUser,
+                        widget.business,
+                        "business",
+                      ));
+                },
+                buttonColor:
+                    MzanziInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
-                height: 50,
-                child: MIHButton(
-                  buttonText: "View Patient Profile",
-                  buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
-                  textColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                  onTap: () {
-                    // Navigator.of(context).pop();
-                    Navigator.of(context).pushNamed('/patient-manager/patient',
-                        arguments: PatientViewArguments(
-                          widget.signedInUser,
-                          patientProfile,
-                          widget.businessUser,
-                          widget.business,
-                          "business",
-                        ));
-                  },
+                child: Text(
+                  "View Medical Records",
+                  style: TextStyle(
+                    color:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
             ])

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

@@ -2,12 +2,12 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_calendar_apis.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_calendar.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_date_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_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_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
@@ -240,51 +240,60 @@ class _WaitingRoomState extends State<WaitingRoom> {
                 textAlign: TextAlign.left,
               ),
               const SizedBox(height: 15),
-              SizedBox(
-                width: 500,
-                height: 50,
-                child: MIHButton(
-                  onTap: () {
-                    widget.onIndexChange(1);
-                    Navigator.of(context).pop();
-                  },
-                  buttonText: "Existing Patient",
-                  buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                  textColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              MihButton(
+                onPressed: () {
+                  widget.onIndexChange(1);
+                  Navigator.of(context).pop();
+                },
+                buttonColor:
+                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                width: 300,
+                child: Text(
+                  "Existing Patient",
+                  style: TextStyle(
+                    color:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
               const SizedBox(height: 10),
-              SizedBox(
-                width: 500,
-                height: 50,
-                child: MIHButton(
-                  onTap: () {
-                    widget.onIndexChange(2);
-                    Navigator.of(context).pop();
-                  },
-                  buttonText: "Existing MIH User",
-                  buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                  textColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              MihButton(
+                onPressed: () {
+                  widget.onIndexChange(2);
+                  Navigator.of(context).pop();
+                },
+                buttonColor:
+                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                width: 300,
+                child: Text(
+                  "Existing MIH User",
+                  style: TextStyle(
+                    color:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
               const SizedBox(height: 10),
-              SizedBox(
-                width: 500,
-                height: 50,
-                child: MIHButton(
-                  onTap: () {
-                    Navigator.pop(context);
-                    addAppointmentWindow();
-                  },
-                  buttonText: "Skeleton Appointment",
-                  buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                  textColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              MihButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                  addAppointmentWindow();
+                },
+                buttonColor:
+                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                width: 300,
+                child: Text(
+                  "Skeleton Appointment",
+                  style: TextStyle(
+                    color:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
             ],
@@ -351,18 +360,21 @@ class _WaitingRoomState extends State<WaitingRoom> {
                 ),
               ),
               const SizedBox(height: 20),
-              SizedBox(
-                width: 500,
-                height: 50,
-                child: MIHButton(
-                  onTap: () {
-                    addAppointmentCall();
-                  },
-                  buttonText: "Add",
-                  buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.successColor(),
-                  textColor:
-                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              MihButton(
+                onPressed: () {
+                  addAppointmentCall();
+                },
+                buttonColor:
+                    MzanziInnovationHub.of(context)!.theme.successColor(),
+                width: 300,
+                child: Text(
+                  "Add",
+                  style: TextStyle(
+                    color:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
             ],

Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart

@@ -1,11 +1,11 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_claim_statement_generation_api.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_icd10_code_api.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_date_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_search_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_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
@@ -224,66 +224,67 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
           required: false,
         ),
         const SizedBox(height: 15),
-        SizedBox(
-          width: 500,
-          height: 50,
-          child: MIHButton(
-            onTap: () {
-              //generate document and uploud it
-              if (isInputValid()) {
-                MIHClaimStatementGenerationApi().generateClaimStatement(
-                    ClaimStatementGenerationArguments(
-                      _docTypeController.text,
-                      widget.selectedPatient.app_id,
-                      _fullNameController.text,
-                      _idController.text,
-                      _medAidController.text,
-                      _medAidNoController.text,
-                      _medAidCodeController.text,
-                      _medAidNameController.text,
-                      _medAidSchemeController.text,
-                      widget.business!.Name,
-                      "*To-Be Added*",
-                      widget.business!.contact_no,
-                      widget.business!.bus_email,
-                      _providerNameController.text,
-                      _practiceNoController.text,
-                      _vatNoController.text,
-                      _serviceDateController.text,
-                      _serviceDescController.text,
-                      _serviceDescOptionsController.text,
-                      _prcedureNameController.text,
-                      _proceedureAdditionalInfoController.text,
-                      _icd10CodeController.text,
-                      _amountController.text,
-                      _preauthNoController.text,
-                      widget.business!.logo_path,
-                      widget.businessUser!.sig_path,
-                    ),
-                    PatientViewArguments(
-                      widget.signedInUser,
-                      widget.selectedPatient,
-                      widget.businessUser,
-                      widget.business,
-                      "business",
-                    ),
-                    widget.env,
-                    context);
-              } else {
-                showDialog(
-                  context: context,
-                  builder: (context) {
-                    return const MIHErrorMessage(errorType: "Input Error");
-                  },
-                );
-              }
-            },
-            buttonText: "Generate",
-            buttonColor:
-                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        MihButton(
+          onPressed: () {
+            if (isInputValid()) {
+              MIHClaimStatementGenerationApi().generateClaimStatement(
+                  ClaimStatementGenerationArguments(
+                    _docTypeController.text,
+                    widget.selectedPatient.app_id,
+                    _fullNameController.text,
+                    _idController.text,
+                    _medAidController.text,
+                    _medAidNoController.text,
+                    _medAidCodeController.text,
+                    _medAidNameController.text,
+                    _medAidSchemeController.text,
+                    widget.business!.Name,
+                    "*To-Be Added*",
+                    widget.business!.contact_no,
+                    widget.business!.bus_email,
+                    _providerNameController.text,
+                    _practiceNoController.text,
+                    _vatNoController.text,
+                    _serviceDateController.text,
+                    _serviceDescController.text,
+                    _serviceDescOptionsController.text,
+                    _prcedureNameController.text,
+                    _proceedureAdditionalInfoController.text,
+                    _icd10CodeController.text,
+                    _amountController.text,
+                    _preauthNoController.text,
+                    widget.business!.logo_path,
+                    widget.businessUser!.sig_path,
+                  ),
+                  PatientViewArguments(
+                    widget.signedInUser,
+                    widget.selectedPatient,
+                    widget.businessUser,
+                    widget.business,
+                    "business",
+                  ),
+                  widget.env,
+                  context);
+            } else {
+              showDialog(
+                context: context,
+                builder: (context) {
+                  return const MIHErrorMessage(errorType: "Input Error");
+                },
+              );
+            }
+          },
+          buttonColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          width: 300,
+          child: Text(
+            "Generate",
+            style: TextStyle(
+              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              fontSize: 20,
+              fontWeight: FontWeight.bold,
+            ),
           ),
-        )
+        ),
       ],
     );
   }

Frontend/lib/mih_packages/patient_profile/pat_profile/components/prescip_input.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_packages/patient_profile/pat_profile/components/medicine_search.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_search_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -419,43 +419,38 @@ class _PrescripInputState extends State<PrescripInput> {
           enableSearch: false,
         ),
         const SizedBox(height: 15.0),
-        SizedBox(
+        MihButton(
+          onPressed: () {
+            if (isFieldsFilled()) {
+              setState(() {
+                updatePerscriptionList();
+                widget.medicineController.clear();
+                widget.quantityController.clear();
+                widget.dosageController.clear();
+                widget.timesDailyController.clear();
+                widget.noDaysController.clear();
+                widget.noRepeatsController.clear();
+              });
+            } else {
+              showDialog(
+                context: context,
+                builder: (context) {
+                  return const MIHErrorMessage(errorType: "Input Error");
+                },
+              );
+            }
+          },
+          buttonColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
           width: 300,
-          height: 50,
-          child: MIHButton(
-            buttonText: "Add",
-            buttonColor:
-                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-            textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-            onTap: () {
-              if (isFieldsFilled()) {
-                // int quantity;
-                // int.parse(widget.dosageController.text) *
-                //     int.parse(widget.timesDailyController.text) *
-                //     int.parse(widget.noDaysController.text);
-                setState(() {
-                  //widget.quantityController.text = "$quantity";
-                  updatePerscriptionList();
-                  widget.medicineController.clear();
-                  widget.quantityController.clear();
-                  widget.dosageController.clear();
-                  widget.timesDailyController.clear();
-                  widget.noDaysController.clear();
-                  widget.noRepeatsController.clear();
-                });
-
-                //addPatientAPICall();
-              } else {
-                showDialog(
-                  context: context,
-                  builder: (context) {
-                    return const MIHErrorMessage(errorType: "Input Error");
-                  },
-                );
-              }
-            },
+          child: Text(
+            "Add",
+            style: TextStyle(
+              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              fontSize: 20,
+              fontWeight: FontWeight.bold,
+            ),
           ),
-        )
+        ),
       ],
     );
   }
@@ -516,29 +511,32 @@ class _PrescripInputState extends State<PrescripInput> {
           ),
         ),
         const SizedBox(height: 15.0),
-        SizedBox(
+        MihButton(
+          onPressed: () async {
+            if (perscriptionObjOutput.isNotEmpty) {
+              //print(jsonEncode(perscriptionObjOutput));
+              await generatePerscription();
+              Navigator.pop(context);
+            } else {
+              showDialog(
+                context: context,
+                builder: (context) {
+                  return const MIHErrorMessage(errorType: "Input Error");
+                },
+              );
+            }
+          },
+          buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
           width: 300,
-          height: 50,
-          child: MIHButton(
-            onTap: () async {
-              if (perscriptionObjOutput.isNotEmpty) {
-                //print(jsonEncode(perscriptionObjOutput));
-                await generatePerscription();
-                Navigator.pop(context);
-              } else {
-                showDialog(
-                  context: context,
-                  builder: (context) {
-                    return const MIHErrorMessage(errorType: "Input Error");
-                  },
-                );
-              }
-            },
-            buttonText: "Generate",
-            buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
-            textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          child: Text(
+            "Generate",
+            style: TextStyle(
+              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              fontSize: 20,
+              fontWeight: FontWeight.bold,
+            ),
           ),
-        )
+        ),
       ],
     );
   }

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

@@ -1,10 +1,10 @@
 import 'dart:convert';
 import 'package:flutter_speed_dial/flutter_speed_dial.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_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_layout/mih_single_child_scroll.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
@@ -160,30 +160,32 @@ class _PatientConsultationState extends State<PatientConsultation> {
               ),
             ),
             const SizedBox(height: 15.0),
-            SizedBox(
+            MihButton(
+              onPressed: () {
+                if (isFieldsFilled()) {
+                  addPatientNoteAPICall();
+                  Navigator.pop(context);
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (context) {
+                      return const MIHErrorMessage(errorType: "Input Error");
+                    },
+                  );
+                }
+              },
+              buttonColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
               width: 300,
-              height: 50,
-              child: MIHButton(
-                onTap: () {
-                  if (isFieldsFilled()) {
-                    addPatientNoteAPICall();
-                    Navigator.pop(context);
-                  } else {
-                    showDialog(
-                      context: context,
-                      builder: (context) {
-                        return const MIHErrorMessage(errorType: "Input Error");
-                      },
-                    );
-                  }
-                },
-                buttonText: "Add Note",
-                buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                textColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
+              child: Text(
+                "Add Note",
+                style: TextStyle(
+                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
-            )
+            ),
           ],
         ),
       ),

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

@@ -4,9 +4,9 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart';
 import 'package:mzansi_innovation_hub/mih_components/med_cert_input.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_layout/mih_single_child_scroll.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
@@ -252,31 +252,33 @@ class _PatientDocumentsState extends State<PatientDocuments> {
               },
             ),
             const SizedBox(height: 15),
-            SizedBox(
+            MihButton(
+              onPressed: () {
+                if (isFileFieldsFilled()) {
+                  submitDocUploadForm();
+                  // uploadSelectedFile(selected);
+                  Navigator.pop(context);
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (context) {
+                      return const MIHErrorMessage(errorType: "Input Error");
+                    },
+                  );
+                }
+              },
+              buttonColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
               width: 300,
-              height: 50,
-              child: MIHButton(
-                buttonText: "Add File",
-                buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                textColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                onTap: () {
-                  if (isFileFieldsFilled()) {
-                    submitDocUploadForm();
-                    // uploadSelectedFile(selected);
-                    Navigator.pop(context);
-                  } else {
-                    showDialog(
-                      context: context,
-                      builder: (context) {
-                        return const MIHErrorMessage(errorType: "Input Error");
-                      },
-                    );
-                  }
-                },
+              child: Text(
+                "Add File",
+                style: TextStyle(
+                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
-            )
+            ),
           ],
         ),
       ),
@@ -301,30 +303,32 @@ class _PatientDocumentsState extends State<PatientDocuments> {
               retDateTextController: retDateTextController,
             ),
             const SizedBox(height: 15.0),
-            SizedBox(
+            MihButton(
+              onPressed: () async {
+                if (isMedCertFieldsFilled()) {
+                  await generateMedCert();
+                  //Navigator.pop(context);
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (context) {
+                      return const MIHErrorMessage(errorType: "Input Error");
+                    },
+                  );
+                }
+              },
+              buttonColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
               width: 300,
-              height: 50,
-              child: MIHButton(
-                buttonText: "Generate",
-                buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                textColor:
-                    MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                onTap: () async {
-                  if (isMedCertFieldsFilled()) {
-                    await generateMedCert();
-                    //Navigator.pop(context);
-                  } else {
-                    showDialog(
-                      context: context,
-                      builder: (context) {
-                        return const MIHErrorMessage(errorType: "Input Error");
-                      },
-                    );
-                  }
-                },
+              child: Text(
+                "Generate",
+                style: TextStyle(
+                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
-            )
+            ),
           ],
         ),
       ),

Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 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_dropdown_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_action.dart';
@@ -9,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_header.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_layout_builder.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.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_success_message.dart';
 import 'package:mzansi_innovation_hub/mih_env/env.dart';
@@ -289,17 +289,20 @@ class _AddPatientState extends State<AddPatient> {
             },
           ),
           const SizedBox(height: 30.0),
-          SizedBox(
-            width: 450.0,
-            height: 50.0,
-            child: MIHButton(
-              onTap: () {
-                submitForm();
-              },
-              buttonText: "Add",
-              buttonColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          MihButton(
+            onPressed: () {
+              submitForm();
+            },
+            buttonColor:
+                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            width: 300,
+            child: Text(
+              "Add",
+              style: TextStyle(
+                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                fontSize: 20,
+                fontWeight: FontWeight.bold,
+              ),
             ),
           ),
         ],

Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 
 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_dropdown_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_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_header.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_layout_builder.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.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_success_message.dart';
 import 'package:mzansi_innovation_hub/mih_env/env.dart';
@@ -272,19 +272,23 @@ class _EditPatientState extends State<EditPatient> {
                         ),
                       ),
                     ),
-                    SizedBox(
-                        width: 300,
-                        height: 50,
-                        child: MIHButton(
-                          onTap: deletePatientApiCall,
-                          buttonText: "Delete",
-                          buttonColor: MzanziInnovationHub.of(context)!
-                              .theme
-                              .secondaryColor(),
-                          textColor: MzanziInnovationHub.of(context)!
+                    MihButton(
+                      onPressed: deletePatientApiCall,
+                      buttonColor: MzanziInnovationHub.of(context)!
+                          .theme
+                          .secondaryColor(),
+                      width: 300,
+                      child: Text(
+                        "Delete",
+                        style: TextStyle(
+                          color: MzanziInnovationHub.of(context)!
                               .theme
                               .primaryColor(),
-                        ))
+                          fontSize: 20,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
                   ],
                 ),
               ),
@@ -520,17 +524,20 @@ class _EditPatientState extends State<EditPatient> {
             },
           ),
           const SizedBox(height: 30.0),
-          SizedBox(
-            width: 500.0,
-            height: 50.0,
-            child: MIHButton(
-              onTap: () {
-                submitForm();
-              },
-              buttonText: "Update",
-              buttonColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-              textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+          MihButton(
+            onPressed: () {
+              submitForm();
+            },
+            buttonColor:
+                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+            width: 300,
+            child: Text(
+              "Update",
+              style: TextStyle(
+                color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                fontSize: 20,
+                fontWeight: FontWeight.bold,
+              ),
             ),
           ),
         ],