add text form field to file upload

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

@@ -2,14 +2,17 @@ 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_apis/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart';
+import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/med_cert_input.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_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_components/mih_pop_up_messages/mih_success_message.dart';
@@ -60,6 +63,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
   final noRepeatsController = TextEditingController();
   final outputController = TextEditingController();
   late PlatformFile? selected;
+  final _formKey = GlobalKey<FormState>();
   late String env;
 
   Future<void> submitDocUploadForm() async {
@@ -217,7 +221,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
     }
   }
 
-  void uploudFilePopUp() {
+  void uploudFilePopUp(double width) {
     showDialog(
       context: context,
       barrierDismissible: false,
@@ -227,15 +231,41 @@ class _PatientDocumentsState extends State<PatientDocuments> {
         onWindowTapClose: () {
           Navigator.pop(context);
         },
-        windowBody: Column(
+        windowBody: Padding(
+          padding:
+              MzanziInnovationHub.of(context)!.theme.screenType == "desktop"
+                  ? EdgeInsets.symmetric(horizontal: width * 0.05)
+                  : const EdgeInsets.symmetric(horizontal: 0),
+          child: Column(
             children: [
-            MIHFileField(
+              MihForm(
+                formKey: _formKey,
+                formFields: [
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Expanded(
+                        child: MihTextFormField(
+                          fillColor: MzanziInnovationHub.of(context)!
+                              .theme
+                              .secondaryColor(),
+                          inputColor: MzanziInnovationHub.of(context)!
+                              .theme
+                              .primaryColor(),
                           controller: selectedFileController,
-              hintText: "Select File",
+                          hintText: "Selected File",
-              editable: false,
+                          requiredText: true,
-              required: true,
+                          readOnly: true,
+                          validator: (value) {
+                            return MihValidationServices().isEmpty(value);
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      MihButton(
                         onPressed: () async {
-                FilePickerResult? result = await FilePicker.platform.pickFiles(
+                          FilePickerResult? result =
+                              await FilePicker.platform.pickFiles(
                             type: FileType.custom,
                             allowedExtensions: ['jpg', 'png', 'pdf'],
                             withData: true,
@@ -250,30 +280,15 @@ class _PatientDocumentsState extends State<PatientDocuments> {
                             selectedFileController.text = selectedFile.name;
                           });
                         },
-            ),
+                        buttonColor: MzanziInnovationHub.of(context)!
-            const SizedBox(height: 15),
+                            .theme
-            MihButton(
+                            .secondaryColor(),
-              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,
                         child: Text(
-                "Add File",
+                          "Attach",
                           style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            color: MzanziInnovationHub.of(context)!
+                                .theme
+                                .primaryColor(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -281,6 +296,36 @@ class _PatientDocumentsState extends State<PatientDocuments> {
                       ),
                     ],
                   ),
+                  const SizedBox(height: 15),
+                  MihButton(
+                    onPressed: () {
+                      if (_formKey.currentState!.validate()) {
+                        submitDocUploadForm();
+                        // uploadSelectedFile(selected);
+                        Navigator.pop(context);
+                      } else {
+                        MihAlertServices().formNotFilledCompletely(context);
+                      }
+                    },
+                    buttonColor:
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
+                    width: 300,
+                    child: Text(
+                      "Add File",
+                      style: TextStyle(
+                        color: MzanziInnovationHub.of(context)!
+                            .theme
+                            .primaryColor(),
+                        fontSize: 20,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
       ),
     );
   }
@@ -391,7 +436,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
     }
   }
 
-  Widget getMenu() {
+  Widget getMenu(double width) {
     if (widget.type == "personal") {
       return Positioned(
         right: 10,
@@ -415,7 +460,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
               backgroundColor:
                   MzanziInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
-                uploudFilePopUp();
+                uploudFilePopUp(width);
               },
             )
           ],
@@ -444,7 +489,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
               backgroundColor:
                   MzanziInnovationHub.of(context)!.theme.successColor(),
               onTap: () {
-                uploudFilePopUp();
+                uploudFilePopUp(width);
               },
             ),
             SpeedDialChild(
@@ -489,70 +534,6 @@ class _PatientDocumentsState extends State<PatientDocuments> {
     }
   }
 
-  List<Widget> setIcons() {
-    if (widget.type == "personal") {
-      return [
-        Text(
-          "Documents",
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            fontSize: 25,
-            fontWeight: FontWeight.bold,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          ),
-        ),
-        IconButton(
-          onPressed: () {
-            uploudFilePopUp();
-          },
-          icon: Icon(
-            Icons.add,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          ),
-        )
-      ];
-    } else {
-      return [
-        Text(
-          "Documents",
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            fontSize: 25,
-            fontWeight: FontWeight.bold,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          ),
-        ),
-        IconButton(
-          onPressed: () {
-            medCertPopUp();
-          },
-          icon: Icon(
-            Icons.sick_outlined,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          ),
-        ),
-        IconButton(
-          onPressed: () {
-            prescritionPopUp();
-          },
-          icon: Icon(
-            Icons.medication_outlined,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          ),
-        ),
-        IconButton(
-          onPressed: () {
-            uploudFilePopUp();
-          },
-          icon: Icon(
-            Icons.add,
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-          ),
-        )
-      ];
-    }
-  }
-
   void successPopUp(String message) {
     showDialog(
       context: context,
@@ -603,13 +584,14 @@ class _PatientDocumentsState extends State<PatientDocuments> {
 
   @override
   Widget build(BuildContext context) {
+    double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
       borderOn: false,
-      bodyItem: getBody(),
+      bodyItem: getBody(screenWidth),
     );
   }
 
-  Widget getBody() {
+  Widget getBody(double width) {
     return Stack(
       children: [
         MihSingleChildScroll(
@@ -641,7 +623,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
             },
           ),
         ),
-        getMenu(),
+        getMenu(width),
       ],
     );
   }