feat(JSON): individual JSON swapped by gradio state to avoid multiuser overwritting issues

README.md

@@ -12,32 +12,36 @@ short_description: Digiwild
 
 ## Docker
 
-```
+``` bash
 docker build -t ordes/digiwild . 
 ```
 
 
-```
-docker run -it -p 7860:7860 ordes/digiwild:swallow
+``` bash
+docker run -it -p 7860:7860 ordes/digiwild
 ```
 
-```
+``` bash
 cd /digiwild/app
 python3 main.py
 ```
 
 ### How to develop on docker
 
-```
-docker run -it -p 7860:3333 -v $(pwd):/home/user/digiwild/
+``` bash
+docker run -it -p 7860:7860 -v $(pwd):/home/user/digiwild/ ordes/digiwild
 ```
 
 ## TODO
 
+- [x] Change `wounded` to `wounded / sick`
+- [x] Info formatting
 - [ ] Use in memory object instead of files to avoid writting / reading problems.
 - [ ] Connection to a database? Maybe an open MongoDB
-- [ ] GPS Compatibility
-- [ ] New fields suggested
+- [x] GPS Compatibility
+- [x] New fields suggested: Number individuals, Species, Comments
+- [ ] Save new fields values into the JSON. Perform validation too.
+- [ ] Add info and placeholder information to the different components.
 
 ## Needs
 
@@ -45,4 +49,6 @@ docker run -it -p 7860:3333 -v $(pwd):/home/user/digiwild/
 - Uploading of pics
 - GPS location
 - Comments
-- Symptomps selection (Dropdown)
+- Symptomps selection (Dropdown)
+
+## PR Updates

app/behavior/behavior_checkbox.py

@@ -4,9 +4,10 @@ from utils.utils_checkbox import create_checkbox
 from utils.utils_visible import set_visible
 from validation_submission.add_json import add_data_tmp
 
-def on_select_behavior(behavior_checkbox): 
+def on_select_behavior(behavior_checkbox, individual): 
     behavior_checkbox = [behavior.lower() for behavior in behavior_checkbox]
-    add_data_tmp("wounded_dead", "behaviors_type", behavior_checkbox)
+    individual = add_data_tmp("wounded_dead", "behaviors_type", behavior_checkbox)
+    return individual
 
 def retrieve_behavior_options_description():
     dropdown_config = get_custom_config_dropdowns("config_checkbox_behavior.json")
@@ -23,8 +24,8 @@ def create_behavior_checkbox(section: str, visible):
     checkbox, text = create_checkbox("", section, label_checkbox, visible, options, descriptions)
     return checkbox, text
 
-def show_behavior(choice, section: str): 
+def show_behavior(choice, section: str, individual): 
     visible = set_visible(choice)
     checkbox, text = create_behavior_checkbox(section, visible)
-    add_data_tmp("wounded_dead", "behaviors_radio", choice)
-    return checkbox, text
+    individual = add_data_tmp("wounded_dead", "behaviors_radio", choice, individual)
+    return checkbox, text, individual

app/circumstances/circumstances.py

@@ -13,13 +13,13 @@ LOGO_PATH = PATH + PATH_ASSETS + "logos"
 CAUSE_COL_WIDTH = "50px"
 
 
-def show_circumstances(choice): 
+def show_circumstances(choice, individual): 
     visible = set_visible(choice)
-    add_data_tmp("wounded_dead", 
+    individual = add_data_tmp("wounded_dead", 
                     "circumstance_radio", 
-                    choice)
+                    choice, individual)
     button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_circumstances(visible)
-    return button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2
+    return button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, individual
 
 def create_circumstances(visible):
     button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause = create_circumstances_buttons(visible)      

app/circumstances/circumstances_dropdowns.py

@@ -14,32 +14,32 @@ def reinitialise_level2():
     dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
     return dropdown_level2, openfield_level2, dropdown_extra_level2
 
-def create_dropdown_level1(label): 
+def create_dropdown_level1(label, individual): 
     dropdown_config = get_custom_config_dropdowns("config_dropdown_circumstances.json")
     options = retrieve_config_options(label, dropdown_config)
     dropdown = gr.Dropdown(choices=options, label=label, interactive=True, visible=True)
     dropdown_level2, openfield_level2, dropdown_extra_level2 = reinitialise_level2()
-    return dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2
+    return dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, individual
     
-def dropdown_collision():
+def dropdown_collision(individual):
     label = "Collision with a means of transport"
-    add_data_tmp("wounded_dead", "circumstance", label.lower())
-    return create_dropdown_level1(label)
+    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual)
 
-def dropdown_deliberate_destruction():
+def dropdown_deliberate_destruction(individual):
     label = "Destruction / Deliberatly removed"
-    add_data_tmp("wounded_dead", "circumstance", label.lower())
-    return create_dropdown_level1(label)     
+    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual)     
 
-def dropdown_indirect_destruction(): 
+def dropdown_indirect_destruction(individual): 
     label = "Indirect destruction"
-    add_data_tmp("wounded_dead", "circumstance", label.lower())
-    return create_dropdown_level1(label) 
+    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual) 
 
-def dropdown_natural_cause(): 
+def dropdown_natural_cause(individual): 
     label = "Natural cause"
-    add_data_tmp("wounded_dead", "circumstance", label.lower())
-    return create_dropdown_level1(label)         
+    individual = add_data_tmp("wounded_dead", "circumstance", label.lower(), individual)
+    return create_dropdown_level1(label, individual)         
 
 
 #--------------------------------------------------------- LEVEL 2 DROPDOWNS
@@ -70,15 +70,15 @@ def get_options(value):
         return options_label, options_dropdown, open_field, extras, extras_label
 
        
-def on_select(evt: gr.SelectData):  # SelectData is a subclass of EventData
+def on_select(evt: gr.SelectData, individual):  # SelectData is a subclass of EventData
     options_label, options_dropdown, open_field, extras, extras_label = get_options(evt.value)
-    add_data_tmp("wounded_dead", 
+    individual = add_data_tmp("wounded_dead", 
                     "circumstance_type", 
                     {"type": (evt.value).lower(),
                      "option_dropdown_label" : options_label.lower() if options_label is not None else 'NA',
                      "open_field_label" : open_field.lower() if open_field is not None else 'NA',
                      "extra_label": extras_label.lower() if extras_label is not None else 'NA'
-                    })
+                    }, individual)
     if options_dropdown is not None:
         dropdown_level2 = gr.Dropdown(choices=options_dropdown, label=evt.value, interactive=True, visible=True)
     else: 
@@ -93,20 +93,23 @@ def on_select(evt: gr.SelectData):  # SelectData is a subclass of EventData
         dropdown_extra_level2 = gr.Dropdown(choices=extras, label=extras_label, interactive=True, visible=True)
     else: 
         dropdown_extra_level2 = gr.Dropdown(choices=[], visible=False)
-    return dropdown_level2, openfield_level2, dropdown_extra_level2
+    return dropdown_level2, openfield_level2, dropdown_extra_level2, individual
 
-def on_select_dropdown_level2(evt: gr.SelectData): 
-    add_data_tmp("wounded_dead", 
+def on_select_dropdown_level2(evt: gr.SelectData, individual): 
+    individual = add_data_tmp("wounded_dead", 
                 "circumstance_option_dropdown", 
-                evt.value.lower())
+                evt.value.lower(), individual)
+    return individual
 
-def on_select_dropdown_extra_level2(evt: gr.SelectData):  
-    add_data_tmp("wounded_dead", 
+def on_select_dropdown_extra_level2(evt: gr.SelectData, individual):  
+    individual = add_data_tmp("wounded_dead", 
                  "circumstance_extra", 
-                 evt.value.lower())
+                 evt.value.lower(), individual)
+    return individual
     
-def on_change_openfield_level2(openfield_level2_dead): 
+def on_change_openfield_level2(openfield_level2_dead, individual): 
     print("Saving open field")
-    add_data_tmp("wounded_dead", 
+    individual = add_data_tmp("wounded_dead", 
                 "circumstance_open_field", 
-                str(openfield_level2_dead).lower())
+                str(openfield_level2_dead).lower(), individual)
+    return individual

app/dead.py

@@ -5,10 +5,10 @@ from physical.physical_checkbox import process_body_parts
 from follow_up.followup_events import create_followup_dropdowns, create_followup_open
 from validation_submission.add_json import add_data_to_individual
 
-def show_section_dead(visible):
+def show_section_dead(visible, individual):
     if visible==True: 
-        add_data_to_individual("wounded_state", "No")
-        add_data_to_individual("dead_state", "Yes")
+        individual = add_data_to_individual("wounded_state", "No", individual)
+        individual = add_data_to_individual("dead_state", "Yes", individual)
         
     with gr.Column(visible=visible, elem_id="dead") as section_dead:
         gr.Markdown("# Dead Animal")
@@ -32,7 +32,7 @@ def show_section_dead(visible):
             fe_name_recipient, fe_collection_ref = create_followup_open(visible, "dead")
 
 
-    return section_dead, radio_cause, radio_physical,\
+    return section_dead, individual, radio_cause, radio_physical,\
          button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, \
           dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, \
           physical_boxes, \

app/display.py

@@ -11,15 +11,16 @@ from validation_submission.get_json import get_json_all_individuals
 HEADERS = ["Identifier", "Location", "Wounded", "Dead"]
 
 
-def save_display_individual(gallery, df, error_box):
-    individual, error_box = validate_save_individual(error_box)
+def save_display_individual(gallery, df, error_box, data):
+    #print(data)
+    individual, error_box, data = validate_save_individual(data, error_box)
     if individual:
         all_animals = get_json_all_individuals()
         gallery_animals = process_animals_for_gallery(all_animals)
         gallery = make_gallery(gallery_animals)
         df_animals = process_animals_for_df(all_animals)
         df = make_df(df_animals)
-    return gallery, df, error_box
+    return gallery, df, error_box, data
 
 # ---------------------------------- 
 # GALLERY 

app/follow_up/followup_events.py

@@ -39,8 +39,9 @@ def create_fe_answer_dropdown(followup_config, visible, elem_id):
                                         visible=visible, elem_id=elem_id, interactive=True)
     return fe_answer_dropdown
 
-def save_fe(value, key): 
-    add_data_tmp("wounded_dead", "followup " + key.lower(), value.lower())
+def save_fe(value, key, individual): 
+    individual = add_data_tmp("wounded_dead", "followup " + key.lower(), value.lower())
+    return individual
 
 
     

app/geolocalisation/js_geolocation.py

@@ -0,0 +1,35 @@
+# JavaScript code to get location and update hidden_input
+js_geocode = """
+    function() {
+        var textbox = document.querySelector('#textbox_id textarea');
+        console.log(textbox)
+        if (navigator.geolocation) {
+            navigator.geolocation.getCurrentPosition(
+                function(position) {
+                    var data = {
+                        'latitude': position.coords.latitude,
+                        'longitude': position.coords.longitude,
+                        'accuracy': position.coords.accuracy
+                    };
+                    console.log("Geolocation data:", data);
+                    textbox.value = JSON.stringify(data);
+                    textbox.dispatchEvent(new Event('input', { bubbles: true }));
+                },
+                function(error) {
+                    var data = {'error': error.message};
+                    console.log("Geolocation error:", data);
+                    textbox.value = JSON.stringify(data);
+                    textbox.dispatchEvent(new Event('input', { bubbles: true }));
+                }
+            );
+        } else {
+            var data = {'error': 'Geolocation is not supported by this browser.'};
+            console.log("Geolocation unsupported:", data);
+            textbox.value = JSON.stringify(data);
+            textbox.dispatchEvent(new Event('input', { bubbles: true }));
+        }
+    }
+"""
+
+def display_location(location_json):
+    return location_json

app/geolocalisation/maps.py

@@ -15,11 +15,12 @@ def create_geolocalisation_object(lat, long, name):
         print("Pydantic Error for Geolocalisation")
     return geolocalisation
 
-def save_geolocalisation_to_json(geolocalisation): 
+def save_geolocalisation_to_json(geolocalisation, individual): 
     geo_dict = geolocalisation.dict()
-    add_data_to_individual("geolocalisation", geo_dict)
+    individual = add_data_to_individual("geolocalisation", geo_dict, individual)
+    return individual
 
-def get_location(address):
+def get_location(address, individual):
     try: 
         # calling the Nominatim tool
         loc = Nominatim(user_agent="GetLoc")
@@ -33,18 +34,18 @@ def get_location(address):
 
         # Save values
         geolocalisation = create_geolocalisation_object(lat, lon, address)
-        save_geolocalisation_to_json(geolocalisation)
+        individual = save_geolocalisation_to_json(geolocalisation, individual)
 
         #display location processing
         value = "Latitude = " + str(lat) + "\n" + "Longitude = " + str(lon)
         identified_location= gr.Textbox(visible=True, interactive=False, 
                                         label="Identified GPS Location", 
                                         value=value)
-        return identified_location
+        return identified_location, individual
     
     except:
         error = "Please try another less precise location."
         identified_location= gr.Textbox(visible=True, interactive=False, 
                                         label="Identified GPS Location", 
                                         value=error)
-        return identified_location
+        return identified_location, individual

app/main.py

@@ -18,8 +18,13 @@ from follow_up.followup_events import save_fe
 from styling.style import *
 from styling.theme import css
 
+from geolocalisation.js_geolocation import js_geocode, display_location
+
 # with gr.Blocks(theme=theme, css=css) as demo:
 with gr.Blocks(theme='shivi/calm_seafoam') as demo:
+    individual = gr.State({})
+
+#with gr.Blocks() as demo:
     create_json_all_individuals()
     # ---------------------------------------------------------
     # Intro Text
@@ -47,57 +52,102 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
         # ---------------------------------------------------------
         # Camera
         with gr.Row():
-            def save_image(camera):
-                add_data_to_individual("image", camera.tolist())
+            def save_image(camera, individual):
+                individual = add_data_to_individual("image", camera.tolist(), individual)
+                return individual
 
             camera = gr.Image(elem_id="image")
-            camera.input(save_image, inputs=[camera])
+            camera.input(save_image, inputs=[camera, individual], outputs=[individual])
         # ---------------------------------------------------------
         # Location
         #with gr.Row():
             with gr.Column(scale=1):
+                gr.Markdown("### Location")
+                gr.Markdown("#### Location (Using address)")
                 location = gr.Textbox(visible=True, interactive=True, label="Location of Sighting")
                 #display location processing
                 identified_location= gr.Textbox(visible=False, interactive=False, 
                                                 label="Identified GPS Location")
                 with gr.Row():
                     #to submit it
-                    submit_location = gr.Button("Get GPS Coordinates", 
+                    submit_location = gr.Button("Get Coordinates using address", 
                                                 visible=True, interactive=True, scale=3)
-                    submit_location.click(get_location, inputs=[location], outputs=[identified_location])
+                    submit_location.click(get_location, inputs=[location, individual], outputs=[identified_location, individual])
                     #to clear it
                     clear_location = gr.ClearButton(components=[location, identified_location], 
                                                     visible=True, interactive=True, scale=1
                                                     )
                     clear_location.click()
 
-                # TODO: Introduce text_box for Species
+                # Geolocation
+                gr.Markdown("#### Location (Using GPS)")
+                location_data = gr.JSON(label="Identified GPS Location")
+                hidden_input = gr.Textbox(visible=False, elem_id="textbox_id")
+                btn_gpslocation = gr.Button("Get Coordinates using GPS (Permission required)")
+                btn_gpslocation.click(None, [], [], js=js_geocode)
+                hidden_input.change(display_location, inputs=hidden_input, outputs=location_data)
+
+                
+                # Introducing text_box for Species
+                gr.Markdown("### General details")
+                with gr.Row():
+                    specie = gr.Textbox(
+                        label="Species (if known)",
+                        placeholder="e.g. European Robin, Common Blackbird",
+                        info="Enter the species name if you can identify it. If unsure, provide your best guess or general description (e.g. 'small brown bird')",
+                        visible=True,
+                        interactive=True
+                    )
 
-                # TODO: Introduce text_box for comments 
+                # Number of individuals
+                with gr.Row():
+                    num_individuals = gr.Number(
+                        label="Number of Individuals",
+                        value=1,  # Default value
+                        minimum=1,
+                        precision=0,  # Only whole numbers
+                        info="Enter the number of animals observed",
+                        #placeholder="Enter number...",
+                        visible=True,
+                        interactive=True
+                    )
+
+                # Introducing text_box for comments 
+                with gr.Row():
+                    comments = gr.TextArea(
+                        label="Additional Comments",
+                        placeholder="Enter any additional observations or notes about the sighting...",
+                        info="Optional: Add any relevant details about the animal(s) or circumstances",
+                        lines=3,
+                        max_lines=5,
+                        visible=True,
+                        interactive=True
+                    )
 
         
         # ---------------------------------------------------------
          # ---------------------------------------------------------
         # Dead and Wounded Buttons
         gr.Markdown("## The State of the Animal", label="Title")
-        gr.Markdown("Please tell us if the animal was wounded or dead.", label="description")
+        gr.Markdown("Please tell us if the animal was wounded / sick or dead.", label="description")
         with gr.Row() as block_form:
             with gr.Column(scale=1):
-                butt_wounded = gr.Button("Wounded", elem_id="wounded")
+                butt_wounded = gr.Button("Wounded / Sick", elem_id="wounded")
             with gr.Column(scale=1):
                 butt_dead = gr.Button("Dead", elem_id="dead")
 
         # ---------------------------------------------------------
         # Initiate sections
-        section_dead, radio_circumstance_dead, radio_physical_dead,\
+        section_dead, individual, radio_circumstance_dead, radio_physical_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, \
                     physical_boxes_dead, \
                     checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_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_circumstance_wounded, radio_behavior_wounded, radio_physical_wounded, \
+                    = show_section_dead(False, individual)
+        
+        section_wounded, individual, radio_circumstance_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, \
@@ -105,7 +155,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
                             checkbox_beak_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
                             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)
+                                = show_section_wounded(False, individual)
     
         # ---------------------------------------------------------
         # ---------------------------------------------------------
@@ -114,8 +164,9 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
         partial_show_section_dead = partial(show_section_dead, True)
         partial_hide_section_wounded = partial(show_section_wounded, False)
         butt_dead.click(partial_show_section_dead, 
-                        inputs=None, 
+                        inputs=[individual], 
                         outputs=[section_dead, 
+                                individual,
                                 radio_circumstance_dead, radio_physical_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, \
@@ -124,9 +175,11 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
                                 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, 
+                        inputs=[individual], 
                         outputs=[section_wounded, 
+                                individual,
                                 radio_circumstance_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,
@@ -143,26 +196,32 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
         partial_hide_section_dead = partial(show_section_dead, False)
 
         butt_wounded.click(partial_show_section_wounded, 
-                        inputs=None, 
+                        inputs=[individual], 
                         outputs=[section_wounded, 
-                                    radio_circumstance_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_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
-                                    fe_collection_dropdown_wounded, fe_recepient_dropdown_wounded, fe_radio_dropdown_wounded, fe_answer_dropdown_wounded, \
-                                    fe_name_recipient_wounded, fe_collection_ref_wounded \
+                                individual,
+                                radio_circumstance_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_wounded, text_beak_wounded, checkbox_body_wounded, text_body_wounded, checkbox_feathers_wounded, text_feathers_wounded, checkbox_head_wounded, text_head_wounded, checkbox_legs_wounded, text_legs_wounded, \
+                                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=[individual], 
+                           outputs=[section_dead, 
+                                    individual,
+                                    radio_circumstance_dead, radio_physical_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, \
+                                    physical_boxes_dead, \
+                                    checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_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_wounded.click(partial_hide_section_dead, inputs=None, outputs=[section_dead, 
-                                                                            radio_circumstance_dead, radio_physical_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, \
-                                                                            physical_boxes_dead, \
-                                                                            checkbox_beak_dead, text_beak_dead, checkbox_body_dead, text_body_dead, checkbox_feathers_dead, text_feathers_dead, checkbox_head_dead, text_head_dead, checkbox_legs_dead, text_legs_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 \
-                                                                            ])
+        
         # ---------------------------------------------------------
         # ---------------------------------------------------------
         # ---------------------------------------------------------
@@ -171,27 +230,28 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
         # ---------------------------------------------------------
         # Radio Circumstance Dead
         radio_circumstance_dead.change(fn=show_circumstances,
-                                inputs=[radio_circumstance_dead],
+                                inputs=[radio_circumstance_dead, individual],
                                 outputs=[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, individual]
                                 )
         
         # Dropdowns Dead
-        button_collision_dead.click(dropdown_collision,  
-                                    outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
-        button_deliberate_destruction_dead.click(dropdown_deliberate_destruction, outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
-        button_indirect_destruction_dead.click(dropdown_indirect_destruction, outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
-        button_natural_cause_dead.click(dropdown_natural_cause, outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
+        button_collision_dead.click(dropdown_collision,
+                                    inputs=[individual],
+                                    outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+        button_deliberate_destruction_dead.click(dropdown_deliberate_destruction, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+        button_indirect_destruction_dead.click(dropdown_indirect_destruction, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+        button_natural_cause_dead.click(dropdown_natural_cause, inputs=[individual], outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
 
-        dropdown_dead.select(on_select, None, [dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
-        dropdown_level2_dead.select(on_select_dropdown_level2)
-        openfield_level2_dead.change(on_change_openfield_level2, inputs=[openfield_level2_dead])
-        dropdown_extra_level2_dead.select(on_select_dropdown_extra_level2)
+        dropdown_dead.select(on_select, inputs=[individual], outputs=[dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead, individual])
+        dropdown_level2_dead.select(on_select_dropdown_level2, inputs=[individual], outputs=[individual] )
+        openfield_level2_dead.change(on_change_openfield_level2, inputs=[openfield_level2_dead, individual], outputs=[individual])
+        dropdown_extra_level2_dead.select(on_select_dropdown_extra_level2, inputs=[individual], outputs=[individual])
         # ---------------------------------------------------------
         # Radio Physical Dead
         radio_physical_dead.change(fn=show_physical,
-                                    inputs=[radio_physical_dead, gr.Text("dead", visible=False)],
-                                    outputs=[physical_boxes_dead])
+                                    inputs=[radio_physical_dead, gr.Text("dead", visible=False), individual],
+                                    outputs=[physical_boxes_dead, individual])
 
         # Checkbox Physical Dead
         physical_boxes_dead.select(find_bounding_box, 
@@ -202,11 +262,11 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
                                  checkbox_head_dead, text_head_dead, 
                                  checkbox_legs_dead, text_legs_dead
                                     ])
-        checkbox_beak_dead.select(on_select_body_part, inputs=[checkbox_beak_dead, gr.Text("beak", visible=False)])
-        checkbox_body_dead.select(on_select_body_part, inputs=[checkbox_body_dead, gr.Text("body", visible=False)])
-        checkbox_feathers_dead.select(on_select_body_part, inputs=[checkbox_feathers_dead, gr.Text("feathers", visible=False)])
-        checkbox_head_dead.select(on_select_body_part, inputs=[checkbox_head_dead, gr.Text("head", visible=False)])
-        checkbox_legs_dead.select(on_select_body_part, inputs=[checkbox_legs_dead, gr.Text("legs", visible=False)])
+        checkbox_beak_dead.select(on_select_body_part, inputs=[checkbox_beak_dead, gr.Text("beak", visible=False), individual], outputs=[individual])
+        checkbox_body_dead.select(on_select_body_part, inputs=[checkbox_body_dead, gr.Text("body", visible=False), individual], outputs=[individual])
+        checkbox_feathers_dead.select(on_select_body_part, inputs=[checkbox_feathers_dead, gr.Text("feathers", visible=False), individual], outputs=[individual])
+        checkbox_head_dead.select(on_select_body_part, inputs=[checkbox_head_dead, gr.Text("head", visible=False), individual], outputs=[individual])
+        checkbox_legs_dead.select(on_select_body_part, inputs=[checkbox_legs_dead, gr.Text("legs", visible=False), individual], outputs=[individual])
         # ---------------------------------------------------------
         # ---------------------------------------------------------
         # ---------------------------------------------------------
@@ -215,67 +275,69 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
         # ---------------------------------------------------------
         # Radio Circumstance Wounded
         radio_circumstance_wounded.change(fn=show_circumstances,
-                                inputs=[radio_circumstance_wounded],
+                                inputs=[radio_circumstance_wounded, individual],
                                 outputs=[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]
+                                            dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual]
                                 )
         
         # Dropdowns Circumstance Wounded
-        button_collision_wounded.click(dropdown_collision,  
-                                    outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
-        button_deliberate_destruction_wounded.click(dropdown_deliberate_destruction, outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
-        button_indirect_destruction_wounded.click(dropdown_indirect_destruction, outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
-        button_natural_cause_wounded.click(dropdown_natural_cause, outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
+        button_collision_wounded.click(dropdown_collision,
+                                    inputs=[individual],  
+                                    outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+        button_deliberate_destruction_wounded.click(dropdown_deliberate_destruction, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+        button_indirect_destruction_wounded.click(dropdown_indirect_destruction, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+        button_natural_cause_wounded.click(dropdown_natural_cause, inputs=[individual], outputs=[dropdown_wounded, dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
         
-        dropdown_wounded.select(on_select, None, [dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded])
-        dropdown_level2_wounded.select(on_select_dropdown_level2)
-        openfield_level2_wounded.change(on_change_openfield_level2, inputs=[openfield_level2_wounded])
-        dropdown_extra_level2_wounded.select(on_select_dropdown_extra_level2)
+        dropdown_wounded.select(on_select, inputs=[individual], outputs=[dropdown_level2_wounded, openfield_level2_wounded, dropdown_extra_level2_wounded, individual])
+        dropdown_level2_wounded.select(on_select_dropdown_level2, inputs=[individual], outputs=[individual])
+        openfield_level2_wounded.change(on_change_openfield_level2, inputs=[openfield_level2_wounded, individual])
+        dropdown_extra_level2_wounded.select(on_select_dropdown_extra_level2, inputs=[individual], outputs=[individual])
         # ---------------------------------------------------------
         # Radio Behavior Wounded
         radio_behavior_wounded.change(fn=show_behavior,
-                                    inputs=[radio_behavior_wounded, gr.Text("wounded", visible=False)],
-                                    outputs=[behavior_checkbox, behavior_text])
+                                    inputs=[radio_behavior_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                    outputs=[behavior_checkbox, behavior_text, individual])
         behavior_checkbox.select(on_select_behavior, 
-                                 inputs=[behavior_checkbox])
+                                 inputs=[behavior_checkbox, individual],
+                                 outputs=[individual])
         # ---------------------------------------------------------
         # Radio Physical Wounded
         radio_physical_wounded.change(fn=show_physical,
-                                    inputs=[radio_physical_wounded, gr.Text("wounded", visible=False)],
-                                    outputs=[physical_boxes_wounded])
+                                    inputs=[radio_physical_wounded, gr.Text("wounded / sick", visible=False), individual],
+                                    outputs=[physical_boxes_wounded, individual])
 
         # Checkbox Physical Wounded
         physical_boxes_wounded.select(find_bounding_box, 
-                        inputs=[physical_boxes_wounded, gr.Textbox(value="wounded", visible=False)], 
+                        inputs=[physical_boxes_wounded, gr.Textbox(value="wounded / sick", visible=False)], 
                         outputs=[checkbox_beak_wounded, text_beak_wounded, 
                                  checkbox_body_wounded, text_body_wounded, 
                                  checkbox_feathers_wounded, text_feathers_wounded, 
                                  checkbox_head_wounded, text_head_wounded, 
                                  checkbox_legs_wounded, text_legs_wounded
                                     ])
-        checkbox_beak_wounded.select(on_select_body_part, inputs=[checkbox_beak_wounded, gr.Text("beak", visible=False)])
-        checkbox_body_wounded.select(on_select_body_part, inputs=[checkbox_body_wounded, gr.Text("body", visible=False)])
-        checkbox_feathers_wounded.select(on_select_body_part, inputs=[checkbox_feathers_wounded, gr.Text("feathers", visible=False)])
-        checkbox_head_wounded.select(on_select_body_part, inputs=[checkbox_head_wounded, gr.Text("head", visible=False)])
-        checkbox_legs_wounded.select(on_select_body_part, inputs=[checkbox_legs_wounded, gr.Text("legs", visible=False)])
+        checkbox_beak_wounded.select(on_select_body_part, inputs=[checkbox_beak_wounded, gr.Text("beak", visible=False), individual], outputs=[individual])
+        checkbox_body_wounded.select(on_select_body_part, inputs=[checkbox_body_wounded, gr.Text("body", visible=False), individual], outputs=[individual])
+        checkbox_feathers_wounded.select(on_select_body_part, inputs=[checkbox_feathers_wounded, gr.Text("feathers", visible=False), individual], outputs=[individual])
+        checkbox_head_wounded.select(on_select_body_part, inputs=[checkbox_head_wounded, gr.Text("head", visible=False), individual], outputs=[individual])
+        checkbox_legs_wounded.select(on_select_body_part, inputs=[checkbox_legs_wounded, gr.Text("legs", visible=False), individual], outputs=[individual])
         
         # ---------------------------------------------------------
         # Follow Up Events Wounded 
-        fe_collection_dropdown_wounded.select(save_fe, inputs=[fe_collection_dropdown_wounded, gr.Textbox("animal collected", visible=False)])
-        fe_recepient_dropdown_wounded.select(save_fe, inputs=[fe_recepient_dropdown_wounded, gr.Textbox("recipient", visible=False)])
-        fe_radio_dropdown_wounded.select(save_fe, inputs=[fe_radio_dropdown_wounded, gr.Textbox("radiography", visible=False)]) 
-        fe_answer_dropdown_wounded.select(save_fe, inputs=[fe_answer_dropdown_wounded, gr.Textbox("given answer", visible=False)])
-        fe_name_recipient_wounded.input(save_fe, inputs=[fe_name_recipient_wounded, gr.Textbox("recipient name", visible=False)])
-        fe_collection_ref_wounded.input(save_fe, inputs=[fe_collection_ref_wounded, gr.Textbox("collection reference", visible=False)])
+        fe_collection_dropdown_wounded.select(save_fe, inputs=[fe_collection_dropdown_wounded, gr.Textbox("animal collected", visible=False), individual], outputs=[individual])
+        fe_recepient_dropdown_wounded.select(save_fe, inputs=[fe_recepient_dropdown_wounded, gr.Textbox("recipient", visible=False), individual],outputs=[individual])
+        fe_radio_dropdown_wounded.select(save_fe, inputs=[fe_radio_dropdown_wounded, gr.Textbox("radiography", visible=False), individual],outputs=[individual]) 
+        fe_answer_dropdown_wounded.select(save_fe, inputs=[fe_answer_dropdown_wounded, gr.Textbox("given answer", visible=False), individual],outputs=[individual])
+        fe_name_recipient_wounded.input(save_fe, inputs=[fe_name_recipient_wounded, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
+        fe_collection_ref_wounded.input(save_fe, inputs=[fe_collection_ref_wounded, gr.Textbox("collection reference", visible=False), individual],outputs=[individual])
 
         # ---------------------------------------------------------
         # Follow Up Events Dead 
-        fe_collection_dropdown_dead.select(save_fe, inputs=[fe_collection_dropdown_dead, gr.Textbox("animal collected", visible=False)])
-        fe_recepient_dropdown_dead.select(save_fe, inputs=[fe_recepient_dropdown_dead, gr.Textbox("recipient", visible=False)])
-        fe_radio_dropdown_dead.select(save_fe, inputs=[fe_radio_dropdown_dead, gr.Textbox("radiography", visible=False)]) 
-        fe_answer_dropdown_dead.select(save_fe, inputs=[fe_answer_dropdown_dead, gr.Textbox("given answer", visible=False)])
-        fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("recipient name", visible=False)])
-        fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("collection reference", visible=False)])
+        fe_collection_dropdown_dead.select(save_fe, inputs=[fe_collection_dropdown_dead, gr.Textbox("animal collected", visible=False), individual],outputs=[individual])
+        fe_recepient_dropdown_dead.select(save_fe, inputs=[fe_recepient_dropdown_dead, gr.Textbox("recipient", visible=False), individual],outputs=[individual])
+        fe_radio_dropdown_dead.select(save_fe, inputs=[fe_radio_dropdown_dead, gr.Textbox("radiography", visible=False), individual],outputs=[individual]) 
+        fe_answer_dropdown_dead.select(save_fe, inputs=[fe_answer_dropdown_dead, gr.Textbox("given answer", visible=False), individual],outputs=[individual])
+        fe_name_recipient_dead.input(save_fe, inputs=[fe_name_recipient_dead, gr.Textbox("recipient name", visible=False), individual],outputs=[individual])
+        fe_collection_ref_dead.input(save_fe, inputs=[fe_collection_ref_dead, gr.Textbox("collection reference", visible=False), individual], outputs=[individual])
 
         # ---------------------------------------------------------
         # Error Box
@@ -324,8 +386,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as demo:
         button_clear.click(reset_json)
 
         button_df.click(save_display_individual, 
-                        inputs=[gallery, df, error_box],
-                        outputs=[gallery, df, error_box]
+                        inputs=[gallery, df, error_box, individual],
+                        outputs=[gallery, df, error_box, individual]
                         )
         button_close.click(lambda: Modal(visible=False), None, modal)
     

app/physical/physical_checkbox.py

@@ -71,10 +71,11 @@ def process_body_parts(section, matched_box):
           
 #--------------------------------------------------------- 
 
-def on_select_body_part(body_part_checkbox, body_part): 
-    add_data_tmp("wounded_dead", "physical_type_"+body_part.lower(), body_part.lower())
+def on_select_body_part(body_part_checkbox, body_part, individual): 
+    individual = add_data_tmp("wounded_dead", "physical_type_"+body_part.lower(), body_part.lower(), individual)
     body_part_checkbox = [body_part_check.lower() for body_part_check in body_part_checkbox]
-    add_data_tmp("wounded_dead", "physical_anomaly_"+body_part.lower(), body_part_checkbox)
+    individual = add_data_tmp("wounded_dead", "physical_anomaly_"+body_part.lower(), body_part_checkbox, individual)
+    return individual
 
 #--------------------------------------------------------- 
 

app/physical/physical_select_animal.py

@@ -37,11 +37,11 @@ def create_bird_anatomy(visible, section: str):
                             visible=visible)
     return img_with_boxes
 
-def show_physical(choice, section: str): 
+def show_physical(choice, section: str, individual): 
     visible = set_visible(choice)
     physical_boxes = create_bird_anatomy(visible, section)
-    add_data_tmp("wounded_dead", "physical_radio", choice)
-    return physical_boxes
+    individual = add_data_tmp("wounded_dead", "physical_radio", choice, individual)
+    return physical_boxes, individual
 
 
 

app/utils/utils_checkbox.py

@@ -2,17 +2,17 @@ import gradio as gr
 
 #---------------------------------------------------------
 def create_checkbox(value, section, label_checkbox, visible, options, descriptions):
-    descriptions_info = "".join([f"\t{option}: {description}\n" for option, description in zip(options, descriptions)])
+    descriptions_info = "<br><br>".join([f"* **{option}**: {description}" for option, description in zip(options, descriptions)])
     checkbox = gr.CheckboxGroup(options, 
                         label=label_checkbox + f" {value}:",
                         visible=visible,
                         interactive=True,
                         elem_id=section)
-    text = gr.Textbox(descriptions_info, 
+    text = gr.Markdown(descriptions_info, 
                     label = "Info", 
                     visible=visible,
-                    interactive=False,
-                    lines=13, 
-                    max_lines=15, 
+                    #interactive=False,
+                    #lines=13, 
+                    #max_lines=15, 
                     elem_id=section)
     return checkbox, text

app/validation_submission/add_json.py

@@ -1,15 +1,19 @@
 from validation_submission.create_json import create_json_one_individual, create_tmp
 import json 
 
-def add_data_to_individual(key, value): 
-    with open("data/one_individual.json", 'r') as openfile:
-        one_individual = json.load(openfile)
-    one_individual[key] = value
-    create_json_one_individual(one_individual)
+def add_data_to_individual(key, value, individual): 
+    # with open("data/one_individual.json", 'r') as openfile:
+    #     one_individual = json.load(openfile)
+    # one_individual[key] = value
+    # create_json_one_individual(one_individual)
+    individual[key] = value
+    return individual
 
-def add_data_tmp(tmp_name, key, value): 
-    with open(f"app/assets/tmp_json/tmp_{tmp_name}.json", 'r') as openfile:
-        tmp = json.load(openfile)
-    tmp[key] = value
-    create_tmp(tmp_name, tmp)
+def add_data_tmp(tmp_name, key, value, individual): 
+    # with open(f"app/assets/tmp_json/tmp_{tmp_name}.json", 'r') as openfile:
+    #     tmp = json.load(openfile)
+    # tmp[key] = value
+    # create_tmp(tmp_name, tmp)
+    individual[key] = value
+    return individual
     

app/validation_submission/processing.py

@@ -1,6 +1,7 @@
 #### PROCESS FUNCTIONS 
 
 def process_circumstance(data):
+
     fields_to_check = ["option_dropdown", "open_field", "extra"]
     if data["circumstance_radio"] == "Yes":
         for field in fields_to_check:

app/validation_submission/submission.py

@@ -2,11 +2,11 @@ import json
 from validation_submission.get_json import get_json_all_individuals
 from validation_submission.validation import validate_individual
 
-def validate_save_individual(error_box):
-    individual, error_box = validate_individual(error_box)
+def validate_save_individual(data, error_box):
+    individual, error_box = validate_individual(data, error_box)
     if individual:
         save_to_all_individuals(individual.model_dump())
-    return individual, error_box
+    return individual, error_box, data
 
 def save_to_all_individuals(one_individual):
     all_individuals = get_json_all_individuals()

app/validation_submission/validation.py

@@ -10,16 +10,16 @@ from follow_up.class_follow_up import FollowUpEvents
 from classes import Report, Wounded, Dead, ImageBase64
 from validation_submission.processing import process_circumstance, process_behaviors, process_physical, process_followup
 
-def get_fields(data_dict, keyword): 
+def get_fields(data_dict, keyword):
     extract = {} 
     for key, val in data_dict.items():
         if keyword in key:
             extract[key] = val
     return extract
 
-def validate_individual(error_box):
+def validate_individual(data, error_box):
     error_box = reset_error_box(error_box)
-    data = get_json_one_individual()
+    #data = get_json_one_individual() # TODO: This should change
     data["identifier"] = str(uuid.uuid4())
     if "image" in data.keys():
         img = ImageBase64.to_base64(data["image"])
@@ -39,7 +39,7 @@ def validate_individual(error_box):
         data["wounded_state"] = "No"
         data["dead_state"] = "No"
     if (data["wounded_state"] == "Yes") or (data["dead_state"] == "Yes"):
-        data_wounded_dead = get_json_tmp("wounded_dead")
+        data_wounded_dead = data #get_json_tmp("wounded_dead")
         circumstance, error_circumstance = validate_circumstance(data_wounded_dead)
         physical, error_physical = validate_physical(data_wounded_dead)
         followup, error_followup = validate_follow_up(data_wounded_dead)

app/wounded.py

@@ -6,13 +6,13 @@ from behavior.behavior_checkbox import create_behavior_checkbox
 from follow_up.followup_events import create_followup_dropdowns, create_followup_open
 from validation_submission.add_json import add_data_to_individual  
 
-def show_section_wounded(visible):
+def show_section_wounded(visible, individual):
     if visible==True: 
-        add_data_to_individual("wounded_state", "Yes")
-        add_data_to_individual("dead_state", "No")
+        individual = add_data_to_individual("wounded_state", "Yes", individual)
+        individual = add_data_to_individual("dead_state", "No", individual)
         
     with gr.Column(visible=visible, elem_id="wounded") as wounded_section:
-        gr.Markdown("# Wounded Animal")
+        gr.Markdown("# Wounded / Sick Animal")
         
         gr.Markdown("## Do you know what conditions caused this?", label="description")
         radio_cause = gr.Radio(["Yes", "No"], value=None, show_label=False, interactive=True)
@@ -40,7 +40,7 @@ def show_section_wounded(visible):
 
 
     # Change variables and names
-    return wounded_section, radio_cause, radio_behaviour, radio_physical, \
+    return wounded_section, individual, radio_cause, radio_behaviour, radio_physical, \
         button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, \
         dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2, \
         behavior_checkbox, behavior_text, \