Update app.py

app.py

@@ -24,6 +24,18 @@ questions = [
     "What treatment plan do you recommend?"
 ]
 
+# List of form fields in the correct order
+form_fields = [
+    "Age",
+    "Gender",
+    "Chief complaint",
+    "Dental history",
+    "Clinical Findings",
+    "Treatment plan",
+    "Referred to"
+]
+
+# Oral Health Assessment Form
 oral_health_assessment_form = [
     "Doctor’s Name",
     "Location",
@@ -81,7 +93,17 @@ def fill_textboxes(context):
     for question in questions:
         answer = generate_answer(question, context)
         answers.append(answer)
-    return answers
+    
+    # Map answers to form fields in the correct order
+    return {
+        "Age": answers[0],
+        "Gender": answers[1],
+        "Chief complaint": answers[2],
+        "Dental history": answers[3],
+        "Clinical Findings": answers[4],
+        "Treatment plan": answers[5],
+        "Referred to": ""
+    }
 
 # Supabase configuration
 supabase: Client = create_client(url, key)
@@ -94,10 +116,11 @@ def main(audio, doctor_name, location):
         return [context] * (len(oral_health_assessment_form) - 2)  # Adjust for the number of fields
     
     answers = fill_textboxes(context)
-    answers.insert(0, location)  # Add location
-    answers.insert(0, doctor_name)  # Add doctor name
+    answers_list = [doctor_name, location] + [""]  # Initial patient name field empty
+    answers_list += [answers.get(field, "") for field in form_fields[:-1]]  # Exclude "Referred to"
+    answers_list.append("")  # Placeholder for "Referred to"
     
-    return answers
+    return answers_list
 
 def save_answers(doctor_name, location, patient_name, age, gender, chief_complaint, medical_history, dental_history, clinical_findings, treatment_plan, referred_to):
     current_datetime = datetime.now().isoformat()
@@ -203,21 +226,27 @@ with gr.Blocks() as demo:
                     return [context] * (len(oral_health_assessment_form) - 3)  # Adjust for the number of fields
                 
                 answers = fill_textboxes(context)
-                answers.insert(0, location)  # Add location
-                answers.insert(0, doctor_name)  # Add doctor name
+                answers_list = [doctor_name, location] + [""]  # Initial patient name field empty
+                answers_list += [answers.get(field, "") for field in form_fields[:-1]]  # Exclude "Referred to"
+                answers_list.append("")  # Placeholder for "Referred to"
                 
-                return [doctor_name, location] + [""] + answers  # Patient name is left empty
+                return answers_list
 
-            transcribe_button.click(fn=update_textboxes, inputs=[audio_input, doctor_name_input, location_input], outputs=[doctor_name_display, location_display] + [patient_name_input] + textboxes_left + textboxes_right)
+            transcribe_button.click(fn=update_textboxes, inputs=[audio_input, doctor_name_input, location_input], outputs=[doctor_name_display, location_display] + [patient_name_input] + textboxes_left + textboxes_right + [dropdown_referred])
             submit_button = gr.Button("Submit", elem_id="submit_button")
-            output_html = gr.HTML(label="Submitted Answers")
-            submit_button.click(fn=save_answers, inputs=[doctor_name_display, location_display, patient_name_input] + textboxes_left + textboxes_right + [dropdown_referred], outputs=output_html)
+            result_output = gr.HTML(label="Submission Result")
+            
+            def handle_submission(patient_name, age, gender, chief_complaint, dental_history, clinical_findings, treatment_plan, referred_to):
+                return save_answers(doctor_name_input.value, location_input.value, patient_name, age, gender, chief_complaint, "none", dental_history, clinical_findings, treatment_plan, referred_to)
+            
+            submit_button.click(fn=handle_submission, inputs=[patient_name_input] + textboxes_left + textboxes_right + [dropdown_referred], outputs=result_output)
         
-        # Third tab for CSV download
+        # Third tab for Download
         with gr.Tab("Download CSV"):
-            download_button = gr.Button("Download Table as CSV")
-            download_csv_output = gr.File(label="Download CSV")
-            download_button.click(fn=gradio_download, inputs=[], outputs=download_csv_output)
+            download_button = gr.Button("Download Data as CSV")
+            download_output = gr.File(label="Download CSV")
+            
+            download_button.click(fn=gradio_download, outputs=download_output)
 
-# Launch the app
+# Run the Gradio app
 demo.launch()