add new text field input into patient manager

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

@@ -2,11 +2,13 @@ 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_apis/mih_validation_services.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_form.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.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_components/mih_pop_up_messages/mih_warning_message.dart';
@@ -47,6 +49,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
   TextEditingController lnameController = TextEditingController();
   TextEditingController accessStatusController = TextEditingController();
   final baseAPI = AppEnviroment.baseApiUrl;
+  final _formKey = GlobalKey<FormState>();
 
   Future<void> addPatientAccessAPICall(int index) async {
     var response = await http.post(
@@ -175,25 +178,52 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         windowBody: Column(
           children: [
-            MIHTextField(
+            MihForm(
+              formKey: _formKey,
+              formFields: [
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: idController,
+                  multiLineInput: false,
+                  requiredText: true,
+                  readOnly: true,
                   hintText: "ID No.",
-              editable: false,
+                  validator: (value) {
-              required: true,
+                    return MihValidationServices().isEmpty(value);
+                  },
                 ),
                 const SizedBox(height: 10.0),
-            MIHTextField(
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: fnameController,
+                  multiLineInput: false,
+                  requiredText: true,
+                  readOnly: true,
                   hintText: "First Name",
-              editable: false,
+                  validator: (value) {
-              required: true,
+                    return MihValidationServices().isEmpty(value);
+                  },
                 ),
                 const SizedBox(height: 10.0),
-            MIHTextField(
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: lnameController,
+                  multiLineInput: false,
+                  requiredText: true,
+                  readOnly: true,
                   hintText: "Surname",
-              editable: false,
+                  validator: (value) {
-              required: true,
+                    return MihValidationServices().isEmpty(value);
+                  },
                 ),
                 const SizedBox(height: 10.0),
                 MIHDateField(
@@ -219,7 +249,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       showDialog(
                         context: context,
                         builder: (context) {
-                      return const MIHErrorMessage(errorType: "Input Error");
+                          return const MIHErrorMessage(
+                              errorType: "Input Error");
                         },
                       );
                     }
@@ -230,7 +261,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                   child: Text(
                     "Book",
                     style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -238,6 +270,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                 ),
               ],
             ),
+          ],
+        ),
       ),
     );
   }
@@ -331,32 +365,60 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         windowBody: Column(
           children: [
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: idController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "ID No.",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 10.0),
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: fnameController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "First Name",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 10.0),
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: lnameController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "Surname",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 10.0),
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: accessStatusController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "Access Status",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 20.0),
             Visibility(

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

@@ -1,11 +1,13 @@
 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_apis/mih_validation_services.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_form.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.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';
 import 'package:mzansi_innovation_hub/mih_env/env.dart';
@@ -41,6 +43,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
   TextEditingController idController = TextEditingController();
   TextEditingController fnameController = TextEditingController();
   TextEditingController lnameController = TextEditingController();
+  final _formKey = GlobalKey<FormState>();
 
   final baseAPI = AppEnviroment.baseApiUrl;
 
@@ -66,18 +69,6 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       timeController.text,
       context,
     );
-    // MIHApiCalls.addAppointmentAPICall(
-    //   widget.business!.business_id,
-    //   widget.patientAccesses[index].app_id,
-    //   dateController.text,
-    //   timeController.text,
-    //   BusinessArguments(
-    //     widget.signedInUser,
-    //     widget.businessUser,
-    //     widget.business,
-    //   ),
-    //   context,
-    // );
   }
 
   bool isAppointmentFieldsFilled() {
@@ -108,25 +99,52 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
         },
         windowBody: Column(
           children: [
-            MIHTextField(
+            MihForm(
+              formKey: _formKey,
+              formFields: [
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: idController,
+                  multiLineInput: false,
+                  requiredText: true,
+                  readOnly: true,
                   hintText: "ID No.",
-              editable: false,
+                  validator: (value) {
-              required: true,
+                    return MihValidationServices().isEmpty(value);
+                  },
                 ),
                 const SizedBox(height: 10.0),
-            MIHTextField(
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: fnameController,
+                  multiLineInput: false,
+                  requiredText: true,
+                  readOnly: true,
                   hintText: "First Name",
-              editable: false,
+                  validator: (value) {
-              required: true,
+                    return MihValidationServices().isEmpty(value);
+                  },
                 ),
                 const SizedBox(height: 10.0),
-            MIHTextField(
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: lnameController,
+                  multiLineInput: false,
+                  requiredText: true,
+                  readOnly: true,
                   hintText: "Surname",
-              editable: false,
+                  validator: (value) {
-              required: true,
+                    return MihValidationServices().isEmpty(value);
+                  },
                 ),
                 const SizedBox(height: 10.0),
                 MIHDateField(
@@ -141,8 +159,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   required: true,
                 ),
                 const SizedBox(height: 30.0),
-            MihButton(
+                Center(
+                  child: MihButton(
                     onPressed: () {
+                      if (_formKey.currentState!.validate()) {
                         bool filled = isAppointmentFieldsFilled();
                         if (filled) {
                           submitApointment(index);
@@ -150,10 +170,12 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                           showDialog(
                             context: context,
                             builder: (context) {
-                      return const MIHErrorMessage(errorType: "Input Error");
+                              return const MIHErrorMessage(
+                                  errorType: "Input Error");
                             },
                           );
                         }
+                      }
                     },
                     buttonColor:
                         MzanziInnovationHub.of(context)!.theme.secondaryColor(),
@@ -161,12 +183,17 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                     child: Text(
                       "Book Appointment",
                       style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        color: MzanziInnovationHub.of(context)!
+                            .theme
+                            .primaryColor(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
                     ),
                   ),
+                ),
+              ],
+            ),
           ],
         ),
       ),
@@ -222,28 +249,53 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
         },
         windowBody: Column(
           children: [
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: idController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "ID No.",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 10.0),
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: fnameController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "First Name",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 10.0),
-            MIHTextField(
+            MihTextFormField(
+              fillColor:
+                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+              inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               controller: lnameController,
+              multiLineInput: false,
+              requiredText: true,
+              readOnly: true,
               hintText: "Surname",
-              editable: false,
+              validator: (value) {
-              required: true,
+                return MihValidationServices().isEmpty(value);
+              },
             ),
             const SizedBox(height: 30.0),
-            Wrap(runSpacing: 10, spacing: 10, children: [
+            Center(
+              child: Wrap(
+                runSpacing: 10,
+                spacing: 10,
+                children: [
                   MihButton(
                     onPressed: () {
                       appointmentPopUp(index);
@@ -254,8 +306,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                     child: Text(
                       "Book Appointment",
                       style: TextStyle(
-                    color:
+                        color: MzanziInnovationHub.of(context)!
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -263,7 +316,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   ),
                   MihButton(
                     onPressed: () {
-                  Navigator.of(context).pushNamed('/patient-manager/patient',
+                      Navigator.of(context)
+                          .pushNamed('/patient-manager/patient',
                               arguments: PatientViewArguments(
                                 widget.signedInUser,
                                 patientProfile,
@@ -278,14 +332,17 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                     child: Text(
                       "View Medical Records",
                       style: TextStyle(
-                    color:
+                        color: MzanziInnovationHub.of(context)!
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
                     ),
                   ),
-            ])
+                ],
+              ),
+            )
           ],
         ),
       ),

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

@@ -1,16 +1,17 @@
 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_apis/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_calendar.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_form.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';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.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_env/env.dart';
@@ -59,6 +60,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
   late Future<List<Appointment>> businessAppointmentResults;
   late Future<List<Appointment>> appointmentResults;
   bool inWaitingRoom = true;
+  final _formKey = GlobalKey<FormState>();
 
   // Business Appointment Tool
   Widget getBusinessAppointmentsTool() {
@@ -314,14 +316,21 @@ class _WaitingRoomState extends State<WaitingRoom> {
           },
           windowBody: Column(
             children: [
-              SizedBox(
+              MihForm(
-                // width: 500,
+                formKey: _formKey,
-                child: MIHTextField(
+                formFields: [
+                  MihTextFormField(
+                    fillColor:
+                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    inputColor:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
                     controller: _appointmentTitleController,
-                  hintText: "Title",
+                    multiLineInput: false,
-                  editable: true,
+                    requiredText: true,
-                  required: true,
+                    hintText: "Appointment Title",
-                ),
+                    validator: (value) {
+                      return MihValidationServices().isEmpty(value);
+                    },
                   ),
                   const SizedBox(height: 10),
                   SizedBox(
@@ -342,20 +351,27 @@ class _WaitingRoomState extends State<WaitingRoom> {
                     ),
                   ),
                   const SizedBox(height: 10),
-              SizedBox(
+                  MihTextFormField(
-                // width: 500,
                     height: 250,
-                child: MIHMLTextField(
+                    fillColor:
+                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    inputColor:
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
                     controller: _appointmentDescriptionIDController,
+                    multiLineInput: true,
+                    requiredText: true,
                     hintText: "Description",
-                  editable: true,
+                    validator: (value) {
-                  required: true,
+                      return MihValidationServices().isEmpty(value);
-                ),
+                    },
                   ),
                   const SizedBox(height: 20),
-              MihButton(
+                  Center(
+                    child: MihButton(
                       onPressed: () {
+                        if (_formKey.currentState!.validate()) {
                           addAppointmentCall();
+                        }
                       },
                       buttonColor:
                           MzanziInnovationHub.of(context)!.theme.successColor(),
@@ -363,13 +379,17 @@ class _WaitingRoomState extends State<WaitingRoom> {
                       child: Text(
                         "Add",
                         style: TextStyle(
-                    color:
+                          color: MzanziInnovationHub.of(context)!
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                              .theme
+                              .primaryColor(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
                       ),
                     ),
+                  ),
+                ],
+              ),
             ],
           ),
         );
@@ -413,8 +433,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
   }
 
   bool isAppointmentInputValid() {
-    if (_appointmentTitleController.text.isEmpty ||
+    if (_appointmentDescriptionIDController.text.isEmpty ||
-        _appointmentDescriptionIDController.text.isEmpty ||
         _appointmentDateController.text.isEmpty ||
         _appointmentTimeController.text.isEmpty) {
       return false;

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

@@ -43,7 +43,8 @@ class _PatientInfoState extends State<PatientInfo> {
   late String medAid;
 
   Widget getPatientDetailsField() {
-    return Wrap(
+    return Center(
+      child: Wrap(
         spacing: 15,
         runSpacing: 10,
         children: [
@@ -112,6 +113,7 @@ class _PatientInfoState extends State<PatientInfo> {
             hintText: "Address",
           ),
         ],
+      ),
     );
   }
 
@@ -202,10 +204,12 @@ class _PatientInfoState extends State<PatientInfo> {
         ),
       ),
     ]);
-    return Wrap(
+    return Center(
+      child: Wrap(
         spacing: 10,
         runSpacing: 10,
         children: medAidDet,
+      ),
     );
   }
 
@@ -271,6 +275,7 @@ class _PatientInfoState extends State<PatientInfo> {
       children: [
         MihSingleChildScroll(
           child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
             children: [
               MihForm(
                 formKey: _formKey,