feat: color theme change / error management / dead section

app/assets/config/config_checkbox_physical.json

@@ -11,7 +11,7 @@
             "Description": "Obvious bone fracture"},
         "Injury": {
             "Description": "Visible skin injury"},
-        "Parasites": {
+        "Parasite": {
             "Description": "Maggots, fleas, lice, louseflies"},
         "Swelling": {
             "Description": "Marked swelling without injury"},

app/assets/config/config_dropdown_circumstances.json

@@ -6,11 +6,11 @@
             "Options": {
                 "road_type" : ["highway", "main road", "secondary road", "local road/path/trail", "parking lot", "other road", "unknown road"]
             },
-            "Open": "Infrastructure number"
+            "Open": "Infrastructure_number"
         },
         "train": 
         {
-            "Open": "Infrastructure number"
+            "Open": "Infrastructure_number"
         },
         "aircraft": {},
         "boat": {},

app/circumstances/circumstances_dropdowns.py

@@ -100,13 +100,13 @@ def on_select_dropdown_level2(evt: gr.SelectData):
                 "circumstance_option_dropdown", 
                 evt.value.lower())
 
-def on_change_openfield_level2(evt: gr.EventData): 
-    print("Saving open field")
-    add_data_tmp("wounded_dead", 
-                "circumstance_open_field", 
-                evt.value.lower())
-
 def on_select_dropdown_extra_level2(evt: gr.SelectData):  
     add_data_tmp("wounded_dead", 
                  "circumstance_extra", 
-                 evt.value.lower())
+                 evt.value.lower())
+    
+def on_change_openfield_level2(openfield_level2_dead): 
+    print("Saving open field")
+    add_data_tmp("wounded_dead", 
+                "circumstance_open_field", 
+                str(openfield_level2_dead).lower())

app/dead.py

@@ -1,5 +1,7 @@
 import gradio as gr
 from circumstances.circumstances import create_circumstances
+from physical.physical_select_animal import create_bird_anatomy
+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
 
@@ -10,10 +12,18 @@ def show_section_dead(visible):
         
     with gr.Column(visible=visible, elem_id="dead") as section_dead:
         gr.Markdown("# Dead Animal")
-        gr.Markdown("## Please describe the cause of death", label="description")
         
-        button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_circumstances(visible)      
+        gr.Markdown("## Do you know what conditions caused this?", label="description")
+        radio_cause = gr.Radio(["Yes", "No"], value=None, show_label=False, interactive=True)
+        button_collision, button_deliberate_destruction, button_indirect_destruction, button_natural_cause, dropdown, dropdown_level2, openfield_level2, dropdown_extra_level2 = create_circumstances(visible=False)      
         
+        gr.Markdown("## Are there physical changes on the bird?" , label="description")
+        radio_physical = gr.Radio(["Yes", "No"], value=None, show_label=False, interactive=True)
+        with gr.Row():
+            physical_boxes = create_bird_anatomy(False, "dead")
+            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("dead", "None")
+
         gr.Markdown("## Follow-Up Events", label="Title")
         gr.Markdown("Please tell us what you did with the animal.", label="description")
         with gr.Row(): 
@@ -22,6 +32,9 @@ def show_section_dead(visible):
             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, \
+    return section_dead, 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, \
+          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

app/{gallery.py → display.py}

@@ -1,5 +1,9 @@
 import gradio as gr
 import pandas as pd
+from gradio_modal import Modal
+from PIL import Image
+from io import BytesIO
+import base64
 
 from validation_submission.submission import validate_save_individual
 from validation_submission.get_json import get_json_all_individuals
@@ -7,9 +11,19 @@ from validation_submission.get_json import get_json_all_individuals
 HEADERS = ["Identifier", "Location", "Wounded", "Dead"]
 
 
-from PIL import Image
-from io import BytesIO
-import base64
+def save_display_individual(gallery, df, error_box):
+    individual, error_box = validate_save_individual(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
+
+# ---------------------------------- 
+# GALLERY 
+
 def convert_image(image_base64_str): 
     im = Image.open(BytesIO(base64.b64decode(image_base64_str)))
     return im
@@ -23,15 +37,6 @@ def set_gallery_size(len_animals):
         num_rows = len_animals/(num_cols)
     return num_cols, num_rows
 
-def save_individual_to_gallery(gallery, df):
-    validate_save_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
-
 def process_animals_for_gallery(all_animals): 
     gallery_animals = []
     for _, animal in all_animals.items(): 
@@ -72,6 +77,8 @@ def keep_only_values(dict_to_filter):
         info_text = "NaN"
     return info_text
 
+# ---------------------------------- 
+# DATAFRAME 
 
 def process_animals_for_df(all_animals):
     df_animals = {}
@@ -101,14 +108,13 @@ def process_animals_for_df(all_animals):
 def make_df(df_animals):
     df = pd.DataFrame.from_dict(df_animals)
     styled_df = df.style.set_properties(**{
-    'max-width': '100px',  # Adjust width as needed
+    'min-width': '25px',
+    'max-width': '50px',  # Adjust width as needed
     'white-space': 'normal',  # Allows text to wrap to the next line
     'word-wrap': 'break-word'  # Breaks long words to fit within the width
     })
     df_gradio = gr.DataFrame(visible=True,
-                         value=df,
+                         value=styled_df,
                          headers=HEADERS, interactive=False)
-    # df = gr.DataFrame(visible=True,    
-    #                     headers=HEADERS)
     return df_gradio
 

app/main_multianimal.py

@@ -1,9 +1,10 @@
 import gradio as gr
 from gradio_modal import Modal
 
-from validation_submission.create_json import create_json_all_individuals, create_json_one_individual, create_tmp
+from validation_submission.create_json import create_json_all_individuals, create_json_one_individual, create_tmp, reset_json
 from validation_submission.add_json import add_data_to_individual
-from gallery import save_individual_to_gallery
+from validation_submission.validation import reset_error_box
+from display import save_display_individual
 from geolocalisation.maps import get_location
 from functools import partial
 from dead import show_section_dead
@@ -15,10 +16,10 @@ from physical.physical_checkbox import on_select_body_part, hide_physical
 from behavior.behavior_checkbox import show_behavior, on_select_behavior
 from follow_up.followup_events import save_fe
 from styling.style import *
-from styling.theme import theme, css
-from classes import Report
+from styling.theme import css
 
-with gr.Blocks(theme=theme, css=css) as demo:
+# with gr.Blocks(theme=theme, css=css) as demo:
+with gr.Blocks(css=css) as demo:
     create_json_all_individuals()
     # ---------------------------------------------------------
     # Intro Text
@@ -83,18 +84,20 @@ with gr.Blocks(theme=theme, css=css) as demo:
 
         # ---------------------------------------------------------
         # Initiate sections
-        section_dead, \
+        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 \
+                    fe_name_recipient_dead, fe_collection_ref_dead \
                     = show_section_dead(False)
-        section_wounded, radio_cause_wounded, radio_behavior_wounded, radio_physical_wounded, \
+        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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+                            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)
@@ -108,20 +111,23 @@ with gr.Blocks(theme=theme, css=css) as demo:
         butt_dead.click(partial_show_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 \
                                 ])
         butt_dead.click(partial_hide_section_wounded, 
                         inputs=None, 
                         outputs=[section_wounded, 
-                                radio_cause_wounded, radio_behavior_wounded, radio_physical_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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+                                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 \
                                 ])
@@ -134,25 +140,37 @@ with gr.Blocks(theme=theme, css=css) as demo:
         butt_wounded.click(partial_show_section_wounded, 
                         inputs=None, 
                         outputs=[section_wounded, 
-                                    radio_cause_wounded, radio_behavior_wounded, radio_physical_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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, \
+                                    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=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 \
                                                                             ])
-        def save_wounded_state():
-            add_data_tmp("wounded_dead", "wounded", "Yes")
-        butt_wounded.click(save_wounded_state())
         # ---------------------------------------------------------
+        # ---------------------------------------------------------
+        # ---------------------------------------------------------
+        # ---------------------------------------------------------
+        # DEAD
+        # ---------------------------------------------------------
+        # Radio Circumstance Dead
+        radio_circumstance_dead.change(fn=show_circumstances,
+                                inputs=[radio_circumstance_dead],
+                                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]
+                                )
+        
         # Dropdowns Dead
         button_collision_dead.click(dropdown_collision,  
                                     outputs=[dropdown_dead, dropdown_level2_dead, openfield_level2_dead, dropdown_extra_level2_dead])
@@ -162,17 +180,42 @@ with gr.Blocks(theme=theme, css=css) as demo:
 
         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.input(on_change_openfield_level2)
+        openfield_level2_dead.change(on_change_openfield_level2, inputs=[openfield_level2_dead])
         dropdown_extra_level2_dead.select(on_select_dropdown_extra_level2)
         # ---------------------------------------------------------
-        # Radio Cause Wounded
-        radio_cause_wounded.change(fn=show_circumstances,
-                                inputs=[radio_cause_wounded],
+        # Radio Physical Dead
+        radio_physical_dead.change(fn=show_physical,
+                                    inputs=[radio_physical_dead, gr.Text("dead", visible=False)],
+                                    outputs=[physical_boxes_dead])
+
+        # Checkbox Physical Dead
+        physical_boxes_dead.select(find_bounding_box, 
+                        inputs=[physical_boxes_dead, gr.Textbox(value="dead", visible=False)], 
+                        outputs=[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
+                                    ])
+        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)])
+        # ---------------------------------------------------------
+        # ---------------------------------------------------------
+        # ---------------------------------------------------------
+        # ---------------------------------------------------------
+        # WOUNDED
+        # ---------------------------------------------------------
+        # Radio Circumstance Wounded
+        radio_circumstance_wounded.change(fn=show_circumstances,
+                                inputs=[radio_circumstance_wounded],
                                 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]
                                 )
         
-        # Dropdowns Cause Wounded
+        # 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])
@@ -181,7 +224,7 @@ with gr.Blocks(theme=theme, css=css) as demo:
         
         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.select(on_change_openfield_level2)
+        openfield_level2_wounded.change(on_change_openfield_level2, inputs=[openfield_level2_wounded])
         dropdown_extra_level2_wounded.select(on_select_dropdown_extra_level2)
         # ---------------------------------------------------------
         # Radio Behavior Wounded
@@ -199,17 +242,17 @@ with gr.Blocks(theme=theme, css=css) as demo:
         # Checkbox Physical Wounded
         physical_boxes_wounded.select(find_bounding_box, 
                         inputs=[physical_boxes_wounded, gr.Textbox(value="wounded", visible=False)], 
-                        outputs=[checkbox_beak, text_beak, 
-                                 checkbox_body, text_body, 
-                                 checkbox_feathers, text_feathers, 
-                                 checkbox_head, text_head, 
-                                 checkbox_legs, text_legs
+                        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.select(on_select_body_part, inputs=[checkbox_beak, gr.Text("beak", visible=False)])
-        checkbox_body.select(on_select_body_part, inputs=[checkbox_body, gr.Text("body", visible=False)])
-        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)])
+        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)])
         
         # ---------------------------------------------------------
         # Follow Up Events Wounded 
@@ -229,6 +272,10 @@ with gr.Blocks(theme=theme, css=css) as demo:
         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)])
 
+        # ---------------------------------------------------------
+        # Error Box
+        error_box = gr.Text(value=None, visible=False)
+
         # ---------------------------------------------------------
         # Add One Individual's Data to the Dataframe
         # And Allow clearing of all previous output
@@ -238,30 +285,44 @@ with gr.Blocks(theme=theme, css=css) as demo:
                                           components=[
                 camera,
                 location, identified_location, 
+                #dead reset
+                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,
-                radio_cause_wounded, radio_behavior_wounded, radio_physical_wounded,
+                #wounded reset
+                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, text_beak, checkbox_body, text_body, checkbox_feathers, text_feathers, checkbox_head, text_head, checkbox_legs, text_legs, 
+                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 
+                fe_name_recipient_wounded, fe_collection_ref_wounded,
+                error_box
                 ])
+            button_close = gr.Button("Back to Display", scale = 1)
+            
+
+        # ---------------------------------------------------------
+        # Button Click Logic
         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])
-        # button_df.click(save_individual_to_df, 
-        #                 inputs=[df],
-        #                 outputs=[df])
-        button_df.click(save_individual_to_gallery, 
-                        inputs=[gallery, df],
-                        outputs=[gallery, df]
+                           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])
+        button_clear.click(hide_physical,
+                           outputs=[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])
+                
+        button_clear.click(reset_error_box, inputs=[error_box], outputs=[error_box])
+        button_clear.click(reset_json)
+
+        button_df.click(save_display_individual, 
+                        inputs=[gallery, df, error_box],
+                        outputs=[gallery, df, error_box]
                         )
-        button_df.click(lambda: Modal(visible=False), None, modal)
+        button_close.click(lambda: Modal(visible=False), None, modal)
     
     # ---------------------------------------------------------
     # Event Functions of the landing page buttons

app/styling/style.py

@@ -3,7 +3,7 @@ import gradio as gr
 gr.HTML('''
     <style>
     .custom-button {
-        background-color: #4CAF50; /* Green */
+        background-color: #3B4C54;
         border: none;
         color: white;
         padding: 15px 32px;
@@ -16,4 +16,22 @@ gr.HTML('''
         border-radius: 8px;
     }
     </style>
-    ''')
+    ''')
+
+# gr.HTML('''
+#     <style>
+#     .custom-button {
+#         background-color: #4CAF50; /* Green */
+#         border: none;
+#         color: white;
+#         padding: 15px 32px;
+#         text-align: center;
+#         text-decoration: none;
+#         display: inline-block;
+#         font-size: 16px;
+#         margin: 4px 2px;
+#         cursor: pointer;
+#         border-radius: 8px;
+#     }
+#     </style>
+#     ''')

app/styling/theme.py

@@ -2,17 +2,103 @@ import gradio as gr
 
 css = """
 .gradio-container {background: url(https://openclipart.org/image/2000px/279687)}
-#image {background-color: #73b9ae}
-#dead {background-color: #333333}
-#wounded {background-color: #5e0724}
-#bird-boxes {background-color: #f2f3f3}
-#buttons-conditions {background-color: #b3b3b3}
-#dropdown-conditions {background-color: #b3b3b3}
-#followup {background-color: #38241c} 
+
+/* Main background */
+body {
+    background-color: #3B4C54;
+    color: #ffffff; /* Set default text color for contrast */
+}
+
+/* Secondary color for headers and panels */
+.gradio-container .card, 
+.gradio-container h1, 
+.gradio-container h2, 
+.gradio-container h3, 
+.gradio-container h4 {
+    background-color: #3F543B;
+    color: #ffffff; /* Ensuring text is readable */
+}
+
+
+
+
+/* Background color for the wounded section */
+#wounded {
+    background-color: #503B54;
+    color: #ffffff; /* Ensures text is readable */
+}
+
+/* Olive green color for headers within the wounded section */
+#wounded h1, 
+#wounded h2, 
+#wounded h3, 
+#wounded h4, 
+#wounded h5, 
+#wounded h6 {
+    color: #ffffff; /* Olive green color for header text */
+    background-color: #503B54; /* No background color for headers */
+}
+
+/* Styling dropdowns within the wounded section */
+#wounded select {
+    background-color: #3F543B; /* Olive green background */
+    color: #ffffff; /* Ensures text is readable */
+    border: 1px solid #3B4C54; /* Optional border for consistency */
+}
+
+/* Styling checkboxes within the wounded section */
+#wounded input[type="checkbox"] {
+    accent-color: #3F543B; /* Olive green color for the checkbox */
+}
+
+/* Additional checkbox label styling if needed */
+#wounded label {
+    color: #ffffff; /* Ensures labels are readable */
+}
+
+
+
+
+
+/* Background color for the dead section */
+#dead {
+    background-color: #54433B;
+    color: #ffffff; /* Ensures text is readable */
+}
+
+/* Brown color for headers within the dead section */
+#dead h1, 
+#dead h2, 
+#dead h3, 
+#dead h4, 
+#dead h5, 
+#dead h6 {
+    color: #ffffff; /* Olive green color for header text */
+    background-color: #54433B; /* No background color for headers */
+}
+
+
+#bird-boxes {background-color: #3B4C54}
 #submit {background-color: #abb2bf}
+#error {background-color: #e82323}
+#valid {background-color: #07e63f}
 """
 
-#followup 2nd option: #13422f
+# OLD THEME: 
+
+# css = """
+# .gradio-container {background: url(https://openclipart.org/image/2000px/279687)}
+# #image {background-color: #73b9ae}
+# #dead {background-color: #333333}
+# #wounded {background-color: #5e0724}
+# #bird-boxes {background-color: #f2f3f3}
+# #buttons-conditions {background-color: #b3b3b3}
+# #dropdown-conditions {background-color: #b3b3b3}
+# #followup {background-color: #38241c} 
+# #submit {background-color: #abb2bf}
+# #error {background-color: #e82323}
+# #valid {background-color: #07e63f}
+# """
 
-theme = gr.themes.Soft(primary_hue="teal", secondary_hue="teal", neutral_hue="emerald",
-                         font=[gr.themes.GoogleFont("Inconsolata"), "Arial", "sans-serif"])
+# theme = gr.themes.Soft(primary_hue="teal", secondary_hue="teal", neutral_hue="emerald",
+#                          font=[gr.themes.GoogleFont("Inconsolata"), "Arial", "sans-serif"])

app/validation_submission/create_json.py

@@ -13,4 +13,8 @@ def create_json_all_individuals(all_individuals={}):
 def create_tmp(tmp_name="wounded_dead", tmp={}):
     tmp = json.dumps(tmp)
     with open(f"app/assets/tmp_json/tmp_{tmp_name}.json", "w") as outfile:
-        outfile.write(tmp)
+        outfile.write(tmp)
+
+def reset_json(): 
+    create_json_one_individual()
+    create_tmp()

app/validation_submission/processing.py

@@ -11,26 +11,9 @@ def process_circumstance(data):
                 key = data["circumstance_type"][field+"_label"]
                 data["circumstance_type"][key] = val
                 data["circumstance_type"].pop(field+"_label")
-    # {"circumstance_radio": true, 
-    #  "circumstance": "destruction / deliberatly removed", 
-    #  "cirumstance_type": {"type": "removal or direct capture", 
-    #                       "option_dropdown_label": "method",
-    #                       "open_field_label": "NA", 
-    #                       "extra_label": "NA"}, 
-    # "circumstance_option_dropdown": "Traffic/Trade"}
     return data
 
 def process_behaviors(data):
-    # INPUT  : 
-    #"behaviors_radio": true, 
-    # "behaviors_type": ["Crash, Falling From The Sky", "Neurological"]
-    #OUTPUT: 
-#     "behaviors_radio": "Yes",
-#   "behaviors_type": [
-#     {
-#       "type": "abnormal breathing",
-#       "description": "Problems breathing, breathing sounds"
-#     }
     behaviors =[]
     if data["behaviors_radio"] == "Yes":
         for type in data["behaviors_type"]: 
@@ -41,21 +24,6 @@ def process_behaviors(data):
     return data 
 
 def process_physical(data):
-    # INPUT
-    # "physical_type_feathers": "feathers", 
-    # "physical_anomaly_type_feathers": ["Blood", "Swelling"]}
-
-    # OUTPUT
-#     "physical_radio": "Yes",
-#   "physical_anomalies_type": [
-#     {
-#       "type": "beak",
-#       "anomaly_type": "deformation"
-#     },
-#     {
-#       "type": "body",
-#       "anomaly_type": "fluffed up"
-#     },
     body_parts= ["beak", "body", "legs", "feathers/wings/tail", "head incl. eyes"]
     anomalies=[]
     reformatted = {}
@@ -74,29 +42,6 @@ def process_physical(data):
     return reformatted
 
 def process_followup(data):
-    #     "follow_up_events": [
-#     {
-#       "type": "animal collected",
-#       "option": "Yes"
-#     },
-#     {
-#       "type": "recipient",
-#       "option": "Veterinary",
-#       "name_recipient": "Dr. Jane Smith"
-#     },
-#     {
-#       "type": "radiography",
-#       "option": "Unknown"
-#     },
-#     {
-#       "type": "given answer",
-#       "option": "Discussion with the speaker"
-#     },
-#     {
-#       "type": "collection reference",
-#       "reference": "Specimen ID: 12345, Collected on 2023-09-15"
-#     }
-#   ]
     followup_events = []
     for key, val in data.items(): 
         followup_event={}

app/validation_submission/submission.py

@@ -2,10 +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():
-    individual = validate_individual()
-    save_to_all_individuals(individual.model_dump())
-    return individual
+def validate_save_individual(error_box):
+    individual, error_box = validate_individual(error_box)
+    if individual:
+        save_to_all_individuals(individual.model_dump())
+    return individual, error_box
 
 def save_to_all_individuals(one_individual):
     all_individuals = get_json_all_individuals()

app/validation_submission/validation.py

@@ -1,4 +1,6 @@
 import uuid
+from pydantic import ValidationError
+import gradio as gr
 
 from validation_submission.get_json import get_json_tmp, get_json_one_individual
 from circumstances.class_circumstance import Circumstances
@@ -15,66 +17,129 @@ def get_fields(data_dict, keyword):
             extract[key] = val
     return extract
 
-def validate_individual():
+def validate_individual(error_box):
+    error_box = reset_error_box(error_box)
     data = get_json_one_individual()
     data["identifier"] = str(uuid.uuid4())
+    if "image" in data.keys():
+        img = ImageBase64.to_base64(data["image"])
+    else: 
+        img = None
+    if "geolocalisation" in data.keys():
+        geolocalisation = data["geolocalisation"]
+    else:
+        geolocalisation = None
+
+    error_behavior = None
+    error_circumstance = None 
+    error_followup = None 
+    error_physical = None 
+    error_individual = None
     if "wounded_state" not in data or "dead_state" not in data:
         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")
-        circumstance = validate_circumstance(data_wounded_dead)
-        physical = validate_physical(data_wounded_dead)
-        followup = validate_follow_up(data_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)
 
         if data["wounded_state"]=="Yes":
-            behavior = validate_behavior(data_wounded_dead)
-            individual = Report(identifier = data["identifier"],
-                                image = ImageBase64.to_base64(data["image"]),
-                                geolocalisation = data["geolocalisation"],
-                                wounded_state = data["wounded_state"],
-                                wounded = Wounded(circumstances = circumstance,
-                                                    behaviors = behavior,
-                                                    physical_anomalies = physical,
-                                                    follow_up_events = followup),
-                                dead_state = data["dead_state"])
+            print(physical)
+            behavior, error_behavior = validate_behavior(data_wounded_dead)
+            try : 
+                individual = Report(identifier = data["identifier"],
+                                    image = img,
+                                    geolocalisation = geolocalisation,
+                                    wounded_state = data["wounded_state"],
+                                    wounded = Wounded(circumstances = circumstance,
+                                                        behaviors = behavior,
+                                                        physical_anomalies = physical,
+                                                        follow_up_events = followup),
+                                    dead_state = data["dead_state"])
+            except ValidationError as e:
+                print(e)
+                error_individual = e
+
         elif data["dead_state"]=="Yes":
-            individual = Report(identifier = data["identifier"],
-                                image = ImageBase64.to_base64(data["image"]),
-                                geolocalisation = data["geolocalisation"],
-                                wounded_state = data["wounded_state"],
-                                dead_state = data["dead_state"],
-                                dead = Dead(circumstances = circumstance,
-                                                    physical_anomalies = physical,
-                                                    follow_up_events = followup)
-                                    )
+            try: 
+                individual = Report(identifier = data["identifier"],
+                                    image = img,
+                                    geolocalisation = geolocalisation,
+                                    wounded_state = data["wounded_state"],
+                                    dead_state = data["dead_state"],
+                                    dead = Dead(circumstances = circumstance,
+                                                        physical_anomalies = physical,
+                                                        follow_up_events = followup)
+                                        )
+            except ValidationError as e:
+                print(e)
+                error_individual = e
     else:
-        data["image"] = ImageBase64.to_base64(data["image"])
-        if not Report(**data).validate(): 
-            print("Validation failed for creating the individual report.")
-        else:
-            individual = Report(**data)
-    return individual
+        try: 
+            individual = Report(identifier = data["identifier"],
+                                    image = img,
+                                    geolocalisation = geolocalisation,
+                                    wounded_state = data["wounded_state"],
+                                    dead_state = data["dead_state"])
+        except ValidationError as e:
+            print(e)
+            error_individual = e
+    if error_behavior or error_circumstance or error_followup or error_physical or error_individual:
+        error_box = show_error(error_box, error_behavior, error_circumstance, error_followup, error_physical, error_individual)
+        individual = None
+    else: 
+        error_box= gr.Text(label="ALL VALID.", value="Record Registered. You can return to the Display.", visible=True, elem_id="valid")
+    return individual, error_box
 
+def show_error(error_box, error_behavior, error_circumstance, error_followup, error_physical, error_individual):
+    error_text = ""
+    if error_circumstance:
+        error_text += f"Error in circumstance: {error_circumstance}\n"
+    if error_behavior:
+        error_text += f"Error in behavior: {error_behavior}\n"
+    if error_physical:
+        error_text += f"Error in physical: {error_physical}\n"
+    if error_followup:
+        error_text += f"Error in follow-up: {error_followup}\n"
+    if error_individual:
+        error_text += f"Error in individual: {error_individual}\n"
+    error_text += "PLEASE CORRECT THESE ERRORS BEFORE SUBMITTING."
+    error_box= gr.Text(label="ERROR DETECTED !", value=error_text, visible=True, elem_id="error")
+    return error_box
 
+def reset_error_box(error_box):
+    error_box = gr.Text(value=None, visible=False)
+    return error_box
 
 #### VALIDATION FUNCTIONS
 def validate_circumstance(data): 
     circumstance_raw = get_fields(data, "circumstance")
     circumstance_formatted = process_circumstance(circumstance_raw)
-    if not Circumstances.model_validate(circumstance_formatted): 
-        print("Validation failed for the circumstance.")
-    else: 
-        return Circumstances(**circumstance_formatted)
+    try: 
+        Circumstances.model_validate(circumstance_formatted)
+        circumstances = Circumstances(**circumstance_formatted)
+        error = None
+    except ValidationError as e:
+        error = e
+        print(e)
+        circumstances = None
+    return circumstances, error
+        
 
 def validate_behavior(data): 
     behaviors_raw = get_fields(data, "behaviors")
     behaviors_formatted = process_behaviors(behaviors_raw)
     try:
         Behaviors.model_validate(behaviors_formatted)
-        return Behaviors(**behaviors_formatted)
-    except: 
+        behavior = Behaviors(**behaviors_formatted)
+        error = None
+    except ValidationError as e:
+        print(e)
         print("Validation failed for the behaviors.")
+        behavior = None
+        error = e
+    return behavior, error
         
 
 def validate_physical(data): 
@@ -82,18 +147,27 @@ def validate_physical(data):
     physical_formatted = process_physical(physical_raw)
     try: 
         PhysicalAnomalies.model_validate(physical_formatted)
-        return PhysicalAnomalies(**physical_formatted)
-    except:
+        physical = PhysicalAnomalies(**physical_formatted)
+        error = None
+    except ValidationError as e:
+        print(e)
         print("Validation failed for the physical anomalies.")
+        physical = None
+        error = e
+    return physical, error
         
 def validate_follow_up(data):
     followup_raw = get_fields(data, "followup")
     followup_formatted = process_followup(followup_raw)
     try: 
         FollowUpEvents.model_validate(followup_formatted)
-        return FollowUpEvents(**followup_formatted)
-    except:
+        followup = FollowUpEvents(**followup_formatted)
+        error = None
+    except ValidationError as e:
+        print(e)
         print("Validation failed for the follow-up events.")
+        followup = None
+    return followup, error