feat: about and contacts tabs

app/{credits.py → about.py}

@@ -1,27 +1,46 @@
+import gradio as gr
+
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_ICONS = PATH + PATH_ASSETS + "icons/"
+
 credits_text = """
 # Credits
 
-## Scientific Expertise
-
-- Isabelle Wethli (Institute for Fish and Wildlife Health, University of Bern)
-- Dr. Mirjam Pewsner (Institute for Fish and Wildlife Health, University of Bern)
-- Dr. Saskia Keller (Institute for Fish and Wildlife Health, University of Bern)
+This work stemmed from a fruitful collaboration between SDSC and FIWI. 
 
-## Front End Development
+## Scientific Expertise : FIWI from UniBE 
 
-- Carlos Viviar Rios (Swiss Data Science Center)
-- Laure Vancauwenberghe (Swiss Data Science Center)
+From the [Institute for Fish and Wildlife Health, University of Bern](https://www.fiwi.vetsuisse.unibe.ch)
+- **Isabelle Wethli**
+- **Dr. Mirjam Pewsner**
+- **Dr. Saskia Keller**
 
+## Front End Development: SDSC
 
+From the [Swiss Data Science Center](https://www.datascience.ch)
+- **Carlos Viviar Rios**
+- **Laure Vancauwenberghe**
 
+## How to Contact Us? 
 
+Please reach out to FIWI via [their contacts](https://www.fiwi.vetsuisse.unibe.ch/about_us/team/index_eng.html).
 
+## Special Thanks 
 
+- **Vogelwarte** for their advice, especially Samuel Wechsler.
+- **Biolovision SA**, providers of **ornitho.ch**, for their collaboration: circumstances are matched to their current data collection schema on ornitho.ch
 
+"""
 
-### Icons 
+icons_text = """
+### Icons' Attributions
+(scroll to see all)
 
-copyright: <a href="https://www.flaticon.com/free-icons/copyright" title="copyright icons">Copyright icons created by Freepik - Flaticon</a>
+Biolovision for the circumstances icons. 
 
 flying-doves-group: <a href="https://www.flaticon.com/free-icons/animal" title="animal icons">Animal icons created by Freepik - Flaticon</a>
 
@@ -55,4 +74,25 @@ supprimer: <a href="https://www.flaticon.com/fr/icones-gratuites/faux" title="fa
 
 balai-magique: <a href="https://www.flaticon.com/fr/icones-gratuites/la-magie" title="la magie icônes">La magie icônes créées par Freepik - Flaticon</a>
 
-"""
+contact-information: <a href="https://www.flaticon.com/free-icons/contact-information" title="contact information icons">Contact information icons created by Freepik - Flaticon</a>
+
+help: <a href="https://www.flaticon.com/free-icons/help" title="help icons">Help icons created by Freepik - Flaticon</a>
+
+question: <a href="https://www.flaticon.com/free-icons/question" title="question icons">Question icons created by Freepik - Flaticon</a>
+"""
+
+with gr.Blocks(theme='shivi/calm_seafoam') as about: 
+    with gr.Row(scale = 1): 
+        gr.Image(PATH_ICONS+"sdsc.png", 
+                 height=200,
+                 interactive=False,
+                 show_fullscreen_button = False, show_share_button=False, 
+                 show_download_button=False, show_label=False)
+        gr.Image(PATH_ICONS+"fiwi.png",
+                 height=200,
+                 interactive=False,
+                 show_fullscreen_button = False, show_share_button=False, 
+                 show_download_button=False, show_label=False)
+         
+    gr.Markdown(credits_text, show_label=False)
+    gr.Markdown(icons_text, show_label=False, height=100)

app/contacts.py

@@ -0,0 +1,110 @@
+import gradio as gr
+
+from dotenv import load_dotenv
+import os
+load_dotenv()
+PATH = os.getcwd() + "/"
+PATH_ASSETS = os.getenv('PATH_ASSETS')
+PATH_ICONS = PATH + PATH_ASSETS + "icons/"
+
+contact_text = """
+    # Contacts
+
+    You have an animal alive or dead in front of you and you do not know what to do? 
+    Please call the contact below corresponding to your canton. (Cantons are in alphabetical order.)
+
+    ## AG: Aargau
+    117 | Departement Bau, Verkehr und Umwelt, Abteilung Wald, Sektion Jagd und Fischerei
+
+    ## AI: Appenzell Innerrhoden
+    071 788 92 87 | Bau- und Umweltdepartement, Amt für Umwelt, Fachstelle Jagd und Fischerei	
+
+    ## AR: Appenzell Ausserrhoden
+    079 698 19 16 |Departement Bau und Volkswirtschaft, Amt für Raum und Wald, Abteilung Natur und Wildtiere	
+
+    ## BE: Bern
+    0800 940 100 | Wirtschafts-, Energie- und Umweltdirektion	
+
+    ## BL: Basel-Landschaft
+    061 922 03 66, 061 552 56 59 | Volkswirtschafts- und Gesundheitsdirektion, Amt für Wald und Wild beider Basel	
+
+    ## BS: Basel-Stadt
+    061 922 03 66, 061 552 56 59 | Volkswirtschafts- und Gesundheitsdirektion, Amt für Wald und Wild beider Basel	
+
+    ## FR: Fribourg
+    026 305 23 31 | Energie, Landwirtschaft und Umwelt, Amt für Wald und Natur, Sektion Fauna, Jagd und Fischerei
+
+    ## GE: Geneva
+    022 388 55 00 | Office cantonal de l'agriculture et de la nature, Centrale d'engagement et des transmissions (CET)	
+
+    ## GL: Glarus
+    Verwaltung Bau und Umwelt, Umwelt, Wald und Energie, Jagd und Fischerei	
+
+    ## GR: Graubünden
+    055 645 66 66 | Amt für Jagd und Fischerei	Jagdbezirke - Über uns
+
+    ## JU: Jura 
+    032 420 48 00, 032 420 65 65 | Departement de l'environnement, Office de l'environnement, Chasse et protection de la faune sauvage	
+
+    ## LU: Luzern
+    041 248 81 17, 117 | Bau-, Umwelt- und Wirtschaftsdepartement, Landwirtschaft und Wald, Jagd, Wildhut und Jagdaufsicht	
+
+    ## NE: Neuchatel
+    032 889 67 80 | Service de la faune, des fôrets et de la nature, faune	
+
+    ## NW: Nidwalden
+    041 618 44 66 | Justiz- und Sicherheitsdirektion, Amt für Justiz, Abteilung Jagd und Fischerei	
+
+    ## OW: Obwalden
+    041 666 64 76 | Bau- und Raumentwicklungsdepartement, Amt für Wald und Landschaft, Wildtiere und Jagd	
+
+    ## SG: St. Gallen
+    117 | Volkwirtschaftsdepartement, Amt für Natur, Jagd und Fischerei	
+
+    ## SH: Schaffhausen
+    052 632 74 66 | Departement des Innern, Jagd und Fischerei	
+
+    ## SO: Solothurn
+    117| Volkswirtschaftdepartement, Amt für Wald, Jagd und Fischerei
+
+    ## SZ: Schwyz
+    041 819 29 29 | Umweltdepartement, Amt für Wald und Natur, Jagd und Wildtiere	
+
+    ## TG: Thurgau
+    058 345 61 50 | Jagd- und Fischereiverwaltung	
+
+    ## TI: Ticino
+    091 814 28 71 | Divisione dell'ambiente, Ufficio della caccia e della pesca	
+
+    ## UR: Uri
+    041 875 2316 | Sicherheitsdirektion, Amt für Forst und Jagd	
+
+    ## VD: Vaud 
+    021 557 88 55 | Environnement, Biodiversité et paysage, Police Faune-nature	
+
+    ## VS: Valais
+    027 606 70 00, 117 | Umwelt, Energie und Landwirtschaft, Dienststelle für Jagd, Fischerei und Wildtiere	
+
+    ## ZG: Zug
+    041 595 41 41 | Natur, Umwelt und Tiere, Arten, Lebensräume, Wildhut und Fischereiaufsicht	
+
+    """
+
+
+with gr.Blocks(theme='shivi/calm_seafoam') as contacts:
+    with gr.Row(scale = 1): 
+        gr.Image(PATH_ICONS+"help.png", height=300,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False)
+        gr.Image(PATH_ICONS+"contact-information.png", height=300,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False)
+        gr.Image(PATH_ICONS+"question.png", height=300,
+                        interactive=False,
+                        show_fullscreen_button = False, show_share_button=False, 
+                        show_download_button=False, show_label=False)
+        
+    gr.Markdown(contact_text, show_label=False)
+

app/gradio_test/test_selectdata_event.py

@@ -1,16 +0,0 @@
-import gradio as gr
-
-with gr.Blocks() as demo:
-    table = gr.Dataframe([[1, 2, 3], [4, 5, 6]])
-    #gallery = gr.Gallery([("cat.jpg", "Cat"), ("dog.jpg", "Dog")])
-    textbox = gr.Textbox("Hello World!")
-    statement = gr.Textbox()
-
-    def on_select(evt: gr.SelectData):
-        return gr.Textbox(f"You selected {evt.value} at {evt.index} from {evt.target}")
-
-    table.select(on_select, inputs=[table], outputs=[statement])
-    #gallery.select(on_select, gallery, statement)
-    textbox.select(on_select, inputs=[textbox], outputs=[statement])
-
-demo.launch(server_name="0.0.0.0", server_port=3131)

app/gradio_test/tests_delete_gallery.py

@@ -1,25 +0,0 @@
-import gradio as gr
-
-# Example initial image list
-images = [
-    "https://via.placeholder.com/150/0000FF",
-    "https://via.placeholder.com/150/FF0000",
-    "https://via.placeholder.com/150/00FF00"
-]
-
-# Function to remove a selected image from the gallery
-def delete_image(selected_image, image_list):
-    if selected_image in image_list:
-        image_list.remove(selected_image)  # Remove the selected image
-    return image_list  # Return the updated image list
-
-# Gradio app
-with gr.Blocks() as demo:
-    gallery = gr.Gallery(value=images, label="Gallery")  # Gallery of images
-    selected_image = gr.Dropdown(choices=images, label="Select Image to Delete")  # Dropdown for selection
-    delete_button = gr.Button("Delete Selected Image")  # Button to delete
-    
-    # When button is clicked, delete the selected image and update gallery
-    delete_button.click(fn=delete_image, inputs=[selected_image, gallery], outputs=gallery)
-    
-demo.launch(server_name="0.0.0.0", server_port=3232)

app/main.py

@@ -5,8 +5,12 @@ disable_caching()
 
 from mode_advanced import advanced 
 from mode_simple import simple
+from contacts import contacts
+from about import about
 
-demo = gr.TabbedInterface([simple, advanced], ["Simple Mode" , "Advanced Reporting"],
+
+demo = gr.TabbedInterface([simple, advanced, contacts, about], 
+                          ["Simple Mode" , "Advanced Reporting", "Cantonal Contacts", "About"],
                           theme='shivi/calm_seafoam')
 
 if __name__ == "__main__":

app/mode_advanced.py

@@ -1,24 +1,23 @@
 import gradio as gr
 from gradio_modal import Modal
+from functools import partial
 
 from geolocalisation.js_geolocation import js_geocode, display_location
-from validation_submission.utils_individual import generate_random_md5
-from validation_submission.utils_individual import add_data_to_individual
-from validation_submission.submission import validate_save_individual
-from validation_submission.validation import reset_error_box 
-from validation_submission.utils_individual import reset_individual
 from geolocalisation.maps import get_location
-from functools import partial
-from dead import show_section_dead
-from wounded import show_section_wounded
+from dead_wounded.dead import show_section_dead
+from dead_wounded.wounded import show_section_wounded
 from circumstances.circumstances import show_circumstances
 from circumstances.circumstances_dropdowns import *
 from physical.physical_select_animal import show_physical, find_bounding_box
 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 validation_submission.utils_individual import generate_random_md5
+from validation_submission.utils_individual import add_data_to_individual
+from validation_submission.submission import validate_save_individual
+from validation_submission.validation import reset_error_box 
+from validation_submission.utils_individual import reset_individual
 from styling.style import *
-from credits import credits_text
 
 from dotenv import load_dotenv
 import os
@@ -407,10 +406,18 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
             fe_name_recipient_wounded, fe_collection_ref_wounded,
             error_icon, error_box
             ])
-        show_creds = gr.Button("CREDITS", icon=PATH_ICONS+"copyright.png", scale=0.5)
-
+        
     # ---------------------------------------------------------
-    # Button Click Logic
+    # VALIDATE ANIMAL 
+    button_df.click(validate_save_individual, 
+                    inputs=[individual, 
+                            error_icon,
+                            error_box,
+                            gr.Text(mode, visible=False)],
+                    outputs=[error_icon, error_box])
+    
+    # ---------------------------------------------------------
+    # CLEAR BUTTON
     button_clear.click()
     button_clear.click(hide_physical,
                        inputs =[gr.Text(mode, visible=False)],
@@ -428,17 +435,4 @@ with gr.Blocks(theme='shivi/calm_seafoam') as advanced:
                                  checkbox_legs_dead, text_legs_dead])
     button_clear.click(reset_error_box, inputs=[error_icon, error_box], outputs=[error_icon, error_box])  
     button_clear.click(reset_individual, inputs=[individual], outputs=[individual])
-   
-    # ---------------------------------------------------------
-    # VALIDATE ANIMAL 
-    button_df.click(validate_save_individual, 
-                    inputs=[individual, 
-                            error_icon,
-                            error_box,
-                            gr.Text(mode, visible=False)],
-                    outputs=[individual, error_icon, error_box])
-    # ---------------------------------------------------------
-    #CREDITS
-    with Modal(visible=False) as modal_creds:
-        gr.Markdown(credits_text)
-    show_creds.click(lambda: Modal(visible=True), None, modal_creds)
+

app/mode_simple.py

@@ -2,13 +2,9 @@ import gradio as gr
 from gradio_modal import Modal
 from functools import partial
 
-from validation_submission.utils_individual import add_data_to_individual
-from validation_submission.submission import validate_save_individual
-from validation_submission.validation import reset_error_box
-
-
-from dead import show_section_dead
-from wounded import show_section_wounded
+from geolocalisation.js_geolocation import js_geocode, display_location
+from dead_wounded.dead import show_section_dead
+from dead_wounded.wounded import show_section_wounded
 from circumstances.circumstances import show_circumstances
 from circumstances.circumstances_dropdowns import *
 from physical.physical_select_animal import show_physical, find_bounding_box
@@ -16,10 +12,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 credits import credits_text
 from validation_submission.utils_individual import reset_individual
-
-from geolocalisation.js_geolocation import js_geocode, display_location
+from validation_submission.utils_individual import add_data_to_individual
+from validation_submission.submission import validate_save_individual
+from validation_submission.validation import reset_error_box
 from validation_submission.utils_individual import generate_random_md5
 
 from dotenv import load_dotenv
@@ -384,8 +380,8 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     with gr.Row(): 
         button_df = gr.Button("SUBMIT OBSERVATION", icon=PATH_ICONS+"effective.png",
                               scale = 3)
-        button_clear = gr.ClearButton(value="CLEAR",
-                                      scale = 1,
+        button_clear = gr.ClearButton(value="CLEAR / Create NEW Observation",
+                                      scale = 2,
                                       icon = PATH_ICONS+"balai-magique.png",
                                       components=[
             camera,
@@ -408,10 +404,18 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
             fe_name_recipient_wounded, fe_collection_ref_wounded,
             error_icon, error_box
             ])
-        show_creds = gr.Button("CREDITS", icon=PATH_ICONS+"copyright.png", scale=0.5)
-
+        
     # ---------------------------------------------------------
-    # Button Click Logic
+    # VALIDATE & SUBMIT ANIMAL 
+    button_df.click(validate_save_individual, 
+                    inputs=[individual, 
+                            error_icon,
+                            error_box,
+                            gr.Text(mode, visible=False)],
+                    outputs=[error_icon, error_box])
+    
+     # ---------------------------------------------------------
+    # CLEAR BUTTON 
     button_clear.click()
     button_clear.click(hide_physical,
                         inputs=[gr.Text(mode, visible=False)],
@@ -430,16 +434,4 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
     button_clear.click(reset_error_box, inputs=[error_icon, error_box], outputs=[error_icon, error_box])  
     button_clear.click(reset_individual, inputs=[individual], outputs=[individual])
    
-    # ---------------------------------------------------------
-    # VALIDATE ANIMAL 
-    button_df.click(validate_save_individual, 
-                    inputs=[individual, 
-                            error_icon,
-                            error_box,
-                            gr.Text(mode, visible=False)],
-                    outputs=[error_icon, error_box])
-    # ---------------------------------------------------------
-    #CREDITS
-    with Modal(visible=False) as modal_creds:
-        gr.Markdown(credits_text)
-    show_creds.click(lambda: Modal(visible=True), None, modal_creds)
+