feat: follow up events collect inputs

app/dead.py

@@ -1,6 +1,6 @@
 import gradio as gr
 from circumstances import create_causes
-from followup_events import create_followup_section
+from followup_events import create_followup_dropdowns, create_followup_open
 from utils_json import add_data_to_individual  
 
 def show_section_dead(visible):
@@ -14,6 +14,14 @@ def show_section_dead(visible):
         
         button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_causes(visible)      
         
-        create_followup_section()
+        gr.Markdown("## Follow-Up Events", label="Title")
+        gr.Markdown("Please tell us what you did with the animal.", label="description")
+        with gr.Row(): 
+            fe_collection_dropdown, fe_recepient_dropdown, fe_radio_dropdown, fe_answer_dropdown = create_followup_dropdowns(visible, "dead")
+        with gr.Row(): 
+            fe_name_recipient, fe_collection_ref = create_followup_open(visible, "dead")
 
-    return section_dead, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2
+
+    return section_dead, button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, \
+          dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, \
+          fe_collection_dropdown, fe_recepient_dropdown, fe_radio_dropdown, fe_answer_dropdown, fe_name_recipient, fe_collection_ref

app/followup_events.py

@@ -1,17 +1,46 @@
 import gradio as gr
 from utils_config import get_custom_config_dropdowns
+from utils_json import add_data_to_individual
 
-def create_followup_section():
+def create_followup_dropdowns(visible, elem_id): 
     followup_config = get_custom_config_dropdowns("config_followup.json")
     followup_config = followup_config["Event follow-up"]
-    gr.Markdown("Please tell us what you did with the animal.", label="description")
-    with gr.Row(): 
-        for key, val in followup_config.items():
-            followup_label = key
-            if "Options" in val.keys(): 
-                gr.Dropdown(choices=val["Options"], label=followup_label, visible=True, elem_id="followup")
-    with gr.Row(): 
-        for key, val in followup_config.items():
-            followup_label = key
-            if "Open" in val.keys(): 
-                gr.Textbox(label=followup_label, visible=True, elem_id="followup")
+    fe_collection_dropdown = create_fe_collection_dropdown(followup_config, visible, elem_id)
+    fe_recipient_dropdown = create_fe_recipient_dropdown(followup_config, visible, elem_id)
+    fe_radio_dropdown = create_fe_radio_dropdown(followup_config, visible, elem_id)
+    fe_answer_dropdown = create_fe_answer_dropdown(followup_config, visible, elem_id)
+    return fe_collection_dropdown, fe_recipient_dropdown, fe_radio_dropdown, fe_answer_dropdown
+
+def create_followup_open(visible, elem_id): 
+    fe_name_recipient = gr.Textbox(label="Name of recipient / museum", visible=visible, 
+                                   elem_id=elem_id, interactive=True)
+    fe_collection_ref = gr.Textbox(label="Collection reference", visible=visible, 
+                                   elem_id=elem_id, interactive=True)
+    return fe_name_recipient, fe_collection_ref
+
+
+def create_fe_collection_dropdown(followup_config, visible, elem_id):
+    fe_collection_dropdown = gr.Dropdown(choices=followup_config["Animal collected"]["Options"], label="Animal collected", 
+                                         visible=visible, elem_id=elem_id, interactive=True)
+    return fe_collection_dropdown
+
+def create_fe_recipient_dropdown(followup_config, visible, elem_id):
+    fe_recipient_dropdown = gr.Dropdown(choices=followup_config["Recipient"]["Options"], label="Recipient", 
+                                        visible=visible, elem_id=elem_id, interactive=True)
+    return fe_recipient_dropdown
+
+def create_fe_radio_dropdown(followup_config, visible, elem_id): 
+    fe_radio_dropdown = gr.Dropdown(choices=followup_config["Radiography"]["Options"], label="Radiography", 
+                                        visible=visible, elem_id=elem_id, interactive=True)
+    return fe_radio_dropdown
+
+def create_fe_answer_dropdown(followup_config, visible, elem_id): 
+    fe_answer_dropdown = gr.Dropdown(choices=followup_config["Given answer"]["Options"], label="Given answer", 
+                                        visible=visible, elem_id=elem_id, interactive=True)
+    return fe_answer_dropdown
+
+def save_fe(value, key): 
+    add_data_to_individual(key, value)
+
+
+    

app/main_multianimal.py

@@ -12,6 +12,7 @@ from circumstances_dropdowns import *
 from physical_select_animal import show_physical, find_bounding_box
 from physical_checkbox import on_select_body_part, hide_physical
 from behavior_checkbox import show_behavior, on_select_behavior
+from followup_events import save_fe
 from style import *
 from theme import theme, css
 
@@ -77,15 +78,19 @@ with gr.Blocks(theme=theme, css=css) as demo:
         # Initiate sections
         section_dead, \
             button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, \
-                dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead \
+                dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
+                    fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
+                        fe_name_recipient_dead, fe_collection_ref_dead \
                     = show_section_dead(False)
         section_wounded, radio_cause_wounded, radio_behavior_wounded, radio_physical_wounded, \
             button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, \
                 dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, \
                     behavior_checkbox, behavior_text, \
                         physical_boxes_wounded, \
-                            checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs \
-                            = show_section_wounded(False)
+                            checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+                            fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
+                                fe_name_recipient_wounded, fe_collection_ref_wounded \
+                                = show_section_wounded(False)
     
         # ---------------------------------------------------------
         # ---------------------------------------------------------
@@ -97,7 +102,9 @@ with gr.Blocks(theme=theme, css=css) as demo:
                         inputs=None, 
                         outputs=[section_dead, 
                                 button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                                dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead
+                                dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
+                                fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
+                                fe_name_recipient_dead, fe_collection_ref_dead \
                                 ])
         butt_dead.click(partial_hide_section_wounded, 
                         inputs=None, 
@@ -107,7 +114,9 @@ with gr.Blocks(theme=theme, css=css) as demo:
                                 dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
                                 behavior_checkbox, behavior_text, 
                                 physical_boxes_wounded, 
-                                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+                                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+                                fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
+                                fe_name_recipient_wounded, fe_collection_ref_wounded \
                                 ])
         # ---------------------------------------------------------
         # Wounded Button Logic
@@ -122,11 +131,15 @@ with gr.Blocks(theme=theme, css=css) as demo:
                                     dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
                                     behavior_checkbox, behavior_text, 
                                     physical_boxes_wounded, 
-                                    checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+                                    checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+                                    fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
+                                    fe_name_recipient_wounded, fe_collection_ref_wounded \
                                     ])
         butt_wounded.click(partial_hide_section_dead, inputs=None, outputs=[section_dead, 
                                                                             button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
-                                                                            dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead
+                                                                            dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, \
+                                                                            fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, \
+                                                                            fe_name_recipient_dead, fe_collection_ref_dead \
                                                                             ])
         # ---------------------------------------------------------
         # Dropdowns Dead
@@ -186,6 +199,24 @@ with gr.Blocks(theme=theme, css=css) as demo:
         checkbox_feathers.select(on_select_body_part, inputs=[checkbox_feathers, gr.Text("feathers", visible=False)])
         checkbox_head.select(on_select_body_part, inputs=[checkbox_head, gr.Text("head", visible=False)])
         checkbox_legs.select(on_select_body_part, inputs=[checkbox_legs, gr.Text("legs", visible=False)])
+        
+        # ---------------------------------------------------------
+        # Follow Up Events Wounded 
+        fe_collection_dropdown_wounded.select(save_fe, inputs=[fe_collection_dropdown_wounded, gr.Textbox("fe_collection", visible=False)])
+        fe_recepient_dropdown_wounded.select(save_fe, inputs=[fe_recepient_dropdown_wounded, gr.Textbox("fe_recipient", visible=False)])
+        fe_radio_dropdown_wounded.select(save_fe, inputs=[fe_radio_dropdown_wounded, gr.Textbox("fe_radio", visible=False)]) 
+        fe_answer_dropdown_wounded.select(save_fe, inputs=[fe_answer_dropdown_wounded, gr.Textbox("fe_answer", visible=False)])
+        fe_name_recipient_wounded.input(save_fe, inputs=[fe_name_recipient_wounded, gr.Textbox("fe_name_recipient", visible=False)])
+        fe_collection_ref_wounded.input(save_fe, inputs=[fe_collection_ref_wounded, gr.Textbox("fe_collection_ref", visible=False)])
+
+        # ---------------------------------------------------------
+        # Follow Up Events Dead 
+        fe_collection_dropdown_dead.select(save_fe, inputs=[fe_collection_dropdown_dead, gr.Textbox("fe_collection", visible=False)])
+        fe_recepient_dropdown_dead.select(save_fe, inputs=[fe_recepient_dropdown_dead, gr.Textbox("fe_recipient", visible=False)])
+        fe_radio_dropdown_dead.select(save_fe, inputs=[fe_radio_dropdown_dead, gr.Textbox("fe_radio", visible=False)]) 
+        fe_answer_dropdown_dead.select(save_fe, inputs=[fe_answer_dropdown_dead, gr.Textbox("fe_answer", visible=False)])
+        fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("fe_name_recipient", visible=False)])
+        fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("fe_collection_ref", visible=False)])
 
         # ---------------------------------------------------------
         # Add One Individual's Data to the Dataframe
@@ -198,14 +229,17 @@ with gr.Blocks(theme=theme, css=css) as demo:
                 location, identified_location, 
                 button_collision_dead, button_deliberate_destruction_dead, button_indirect_destruction_dead, button_natural_cause_dead, 
                 dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead,
+                fe_collection_dropdown_dead, fe_recepient_dropdown_dead, fe_radio_dropdown_dead, fe_answer_dropdown_dead, 
+                fe_name_recipient_dead, fe_collection_ref_dead,
                 radio_cause_wounded, radio_behavior_wounded, radio_physical_wounded,
                 button_collision_wounded, button_deliberate_destruction_wounded, button_indirect_destruction_wounded, button_natural_cause_wounded, 
                 dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded,
                 behavior_checkbox, behavior_text, 
                 physical_boxes_wounded, 
-                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+                checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, 
+                fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, 
+                fe_name_recipient_wounded, fe_collection_ref_wounded 
                 ])
-            
         button_clear.click()
         button_clear.click(hide_physical,
                            outputs=[checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs])

app/wounded.py

@@ -3,7 +3,7 @@ from circumstances import create_causes
 from physical_select_animal import create_bird_anatomy
 from physical_checkbox import process_body_parts
 from behavior_checkbox import create_behavior_checkbox
-from followup_events import create_followup_section
+from followup_events import create_followup_dropdowns, create_followup_open
 from utils_json import add_data_to_individual  
 
 def show_section_wounded(visible):
@@ -30,9 +30,14 @@ def show_section_wounded(visible):
             with gr.Column():
                 checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs = process_body_parts("wounded", "None")
 
-
+            
         gr.Markdown("## Follow-Up Events", label="Title")
-        create_followup_section()
+        gr.Markdown("Please tell us what you did with the animal.", label="description")
+        with gr.Row(): 
+            fe_collection_dropdown, fe_recepient_dropdown, fe_radio_dropdown, fe_answer_dropdown = create_followup_dropdowns(visible, "wounded")
+        with gr.Row(): 
+            fe_name_recipient, fe_collection_ref = create_followup_open(visible, "wounded")
+
 
     # Change variables and names
     return wounded_section, radio_cause, radio_behaviour, radio_physical, \
@@ -40,4 +45,5 @@ def show_section_wounded(visible):
         dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, \
         behavior_checkbox, behavior_text, \
         physical_boxes, \
-        checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs
+        checkbox_beak, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+        fe_collection_dropdown, fe_recepient_dropdown, fe_radio_dropdown, fe_answer_dropdown, fe_name_recipient, fe_collection_ref