added formatting

.gitignore

@@ -1,3 +1,5 @@
 .env
 __pycache__/
-.venv/
+.venv/
+.data/climate_data_moderate/*
+.data/climate_data_pessimist/*

app.py

@@ -7,7 +7,6 @@ import pandas as pd
 
 import os
 from func_utils import *
-from summary_test import generate_irradiance_trend, get_mocked_summary
 
 
 def go_to_page_1():
@@ -21,13 +20,70 @@ with gr.Blocks() as demo:
             gr.HTML(
                 """
                 <style>
-                    /* Custom style for a specific row */
+                    .gradio-container {
+                        background-color: #FFFFFF;
+                        color: #000000;
+                    },
+                    .font-color{
+                        color: #000000;
+                    }
+                    .white-background {
+                        background-color: #FFFFFF !important;
+                    }
+                    .card {
+                        background-color: #FFFFFF !important;
+                        border: solid 1px;
+                        border-radius: 10px;
+                        border-color: #000000;
+                        display: flex;
+                        align-content: center;
+                        padding: 20px;
+                    }
                     .box {
-                        background-color: #90909b;
+                        background-color: #FFFFFF !important;
+                        # border-radius: 10px;
+                        display: flex;
+                        align-content: center;
+                        padding: 20px;
+                    }
+                    .result-page {
+                        background-color: #FFFFFF !important;
                         border-radius: 10px;
                         display: flex;
                         align-content: center;
                         padding: 20px;
+                        border: solid 1px;
+                        border-color: #000000;
+                    }
+                    .selected.svelte-1tcem6n.svelte-1tcem6n {
+                        color: #28C896;
+                        border-bottom-color: #28C896;
+                    }
+                    .selected.svelte-1tcem6n.svelte-1tcem6n:after {
+                        background-color: #28C896;
+                    }
+                    button.svelte-1tcem6n.svelte-1tcem6n {
+                        color: #000000 !important;
+                        border-radius: 20px;
+                    }
+                    p {
+                        color: #000000 !important;
+                    }
+                    .tab {
+                        color: #28C896;
+                    }
+                    .adress-card {
+                        background-color: #FFFFFF !important;
+                        color: #000000;
+                    }
+                    span.svelte-1gfkn6j {
+                        color: #000000 !important;
+                    }
+                    span.has-info.svelte-1gfkn6j { 
+                        color: #000000 !important;
+                    }
+                    textarea.svelte-173056l.svelte-173056l {
+                        background-color: #FFFFFF !important;
                     }
                     .culture_box {
                         background-color: #52525b;
@@ -43,100 +99,197 @@ with gr.Blocks() as demo:
                     .padding.svelte-phx28p{
                         padding: 0px;
                     }
+                    .ok-button {
+                        background-color: #28C896;
+                        width: 200px !important;
+                        border-radius: 20px;
+                    }
+                    .back-button {
+                        background-color: #FFFFFF;
+                        width: 200px !important;
+                        border-radius: 20px;
+                    }
+                    .secondary.svelte-1ixn6qd {
+                        background: linear-gradient(#28C896, #96E600);
+                        color: #FFFFFF;
+                        border-radius: 40px;
+                        width: 200px !important;
+                    }
+                    input[type=number].svelte-7ha85a.svelte-7ha85a {
+                        background-color: #FFFFFF;
+                        color: #000000 !important;
+                    }
+                    .culture-box {
+                        background-color: #FFFFFF;
+                        color: #000000 !important;
+                    }
+                    .block.svelte-11xb1hd{
+                        background-color: #FFFFFF !important;
+                        color: #000000 !important;
+                    }
+                    .culture_box {
+                        background-color: #FFFFFF !important;
+                        color: #000000 !important;
+                    }
+                    .wrap.svelte-1hfxrpf.svelte-1hfxrpf {
+                        background-color: #FFFFFF !important;
+                        color: #000000 !important;
+                    }
+                    input.svelte-1hfxrpf.svelte-1hfxrpf {
+                        background-color: #FFFFFF !important;
+                        color: #000000 !important;
+                    }
+                    .svelte-1hfxrpf{
+                        background-color: #FFFFFF !important;
+                        color: #000000 !important;
+                    }
+                    button.svelte-1tcem6n.svelte-1tcem6n:hover:not(:disabled):not(.selected) {
+                        background-color: linear-gradient(#28C896, #96E600);
+                    }
+                    .primary.svelte-1ixn6qd{
+                        background: #FFFFFF;
+                        color: #000000;
+                        border-radius: 40px;
+                        width: 200px !important;
+                        border: solid 1px;
+                        border-color: #000000;
+                    }
+                    .primary.svelte-1ixn6qd:hover,.primary[disabled].svelte-1ixn6qd {
+                        background: #28C896;
+                    }
+                    .primary.svelte-1ixn6qd:hover {
+                        border-color: #000000;
+                        border-shadow:  #000000;
+                    }
                 </style>
                 """
             )
             demo.title = "Démo GAIA - Les bénéfices de l'ombrage"
-            gr.HTML("<h1 style='text-align: center;'>Les bénéfices de l'ombrage</h1>")
             gr.HTML(
-                "<p style=''>Découvrez le potentiel de l'ombrage sur votre exploitation !</p>"
+                "<h1 style='text-align: center; color: #000000; font-size:xx-large'>Les bénéfices de l'ombrage</h1>"
+            )
+            gr.HTML(
+                "<p style='color: #000000; font-size:x-large; font-weight: 700'>Découvrez le potentiel de l'ombrage sur votre exploitation !</p>"
             )
 
             with gr.Blocks() as infos:
 
                 infos.title = "Informations sur votre exploitation"
-                gr.HTML("<h2>Renseignez les informations relatives à votre projet</h2>")
+                gr.HTML(
+                    "<h2 style='color: #000000'>Renseignez les informations relatives à votre projet</h2>"
+                )
                 with gr.Row(equal_height=True):
-                    with gr.Column(variant="panel", scale=1):
-                        with gr.Row(equal_height=True, elem_classes="box"):
-                            with gr.Tab(label="Adresse", scale=1):
+                    with gr.Column(
+                        variant="panel", scale=1, elem_classes=["white-background"]
+                    ):
+                        with gr.Row(equal_height=True, elem_classes=["card"]):
+                            with gr.Tab(label="Adresse", scale=1, elem_classes="tab"):
                                 address = gr.Textbox(
                                     label="Addresse",
-                                    info="Adresse de votre projet",
+                                    placeholder="Entrez une adresse",
+                                    elem_classes=["adress-card"],
                                 )
                             with gr.Tab(label="Coordonnées GPS", scale=1):
                                 lat = gr.Number(
-                                    label="Latitude",
-                                    info="Latitude de votre projet",
+                                    label="Latitude", elem_classes=["white-background"]
                                 )
                                 lon = gr.Number(
-                                    label="Longitude",
-                                    info="Longitude de votre projet",
+                                    label="Longitude", elem_classes=["white-background"]
                                 )
                             place_btn = gr.Button(
-                                value="Valider la localisation", size="sm"
+                                value="Valider la localisation",
+                                size="md",
+                                elem_classes=["ok-button"],
                             )
                             place_cancel_btn = gr.Button(
-                                value="Réinitialiser la localisation", size="sm"
+                                value="Réinitialiser la localisation",
+                                size="md",
+                                elem_classes=["back-button"],
+                                variant="primary"
                             )
 
-                        with gr.Row(elem_classes="box"):
+                        with gr.Row(elem_classes=["card"]):
                             culture = gr.Dropdown(
-                                label="Culture", scale=1, elem_classes="culture_box", choices=["Blé", "Colza", "Orge"]
+                                label="Culture",
+                                scale=1,
+                                elem_classes="culture_box",
+                                choices=["Blé", "Colza", "Orge"],
                             )
 
                     with gr.Column(variant="panel", scale=3):
                         map = gr.HTML()
 
-                simulation_btn = gr.Button(value="Lancer la simulation", size="lg")
+                simulation_btn = gr.Button(
+                    value="Lancer la simulation", size="md", elem_classes=["ok-button"]
+                )
 
-            go_to_page_2_btn = gr.Button("Aller aux résultats", visible=False)
+            go_to_page_2_btn = gr.Button(
+                "Aller aux résultats", visible=False, elem_classes=["ok-button"], variant="primary"
+            )
 
         page_2 = gr.Column(visible=False)
         with page_2:
             with gr.Blocks() as results:
-                results.title = "Résultats"
-                gr.HTML("<h2>Résultats de la simulation</h2>")
-                with gr.Row(equal_height=True, elem_classes="box"):
-                    with gr.Tab(label="Analyse générale", scale=1):
+                gr.HTML(
+                    "<h2 style='padding: 30px; color: #000000'>Résultats de la simulation : les conséquences du changement climatique pour l'exploitation jusqu'en 2099</h2>"
+                )
+                go_to_page_1_btn = gr.Button(
+                    value="Retour",
+                    size="md",
+                    elem_classes=["back-button"],
+                    variant="primary"
+                )
+                with gr.Row(equal_height=True, elem_classes="result-page"):
+                    with gr.Tab(label="Prévisions climatiques", scale=1):
+                        with gr.Column(elem_classes="box"):
+                            with gr.Row():
+                                gr.HTML(
+                                    "<h2 style='color: #000000'>Prévisions climatiques</h2>"
+                                )
+                            with gr.Row():
+                                plot_1 = gr.Plot()
+                            with gr.Row():
+                                plot_2 = gr.Plot()
+                            with gr.Row():
+                                plot_3 = gr.Plot()
+                    with gr.Tab(
+                        label="Prévisions pour l'exploitation sans ombrage", scale=1
+                    ):
                         with gr.Row(elem_classes="box"):
                             with gr.Column():
                                 gr.HTML(
-                                    "<h2>Synthèse des Prévisions Météorologiques selon le Scénario Pessimiste</h2>"
+                                    "<h2 style='color: #000000'>Prévisions spécifiques à l'exploitation, sans solution d'ombrage</h2>"
                                 )
                                 current_situation_summary = gr.Markdown(
                                     elem_classes="summary"
                                 )
                         with gr.Row(elem_classes="box"):
                             with gr.Column():
-                                gr.HTML("<h2>Déficit hydrique</h2>")
+                                gr.HTML(
+                                    "<h2 style='color: #000000'>Déficit hydrique</h2>"
+                                )
                                 gr.Plot()
                             with gr.Column():
-                                gr.HTML("<h2>Rendements</h2>")
+                                gr.HTML("<h2 style='color: #000000'>Rendements</h2>")
                                 gr.Plot()
-                        with gr.Column(elem_classes="box"):
-                            with gr.Row():
-                                gr.HTML("<h2>Bilan climatique</h2>")
-                            with gr.Row():
-                                plot_1 = gr.Plot()
-                                plot_2 = gr.Plot()
-                            with gr.Row():
-                                plot_3 = gr.Plot()
-                    with gr.Tab(label="Analyse avec AgriPv", scale=1):
+                    with gr.Tab(
+                        label="Prévisions pour l'exploitation avec ombrage", scale=1
+                    ):
                         with gr.Row(elem_classes="box"):
                             with gr.Column():
-                                gr.HTML("<h2>Synthèse des bénéfices avec ombrage</h2>")
+                                gr.HTML(
+                                    "<h2 style='color: #000000'>Synthèse des bénéfices pour l'exploitation suite à la mise en place d'une solution d'ombrage</h2>"
+                                )
                                 agripv_summary = gr.Markdown(elem_classes="summary")
                         with gr.Row(elem_classes="box"):
                             with gr.Column():
-                                gr.HTML("<h2>Déficit hydrique</h2>")
+                                gr.HTML(
+                                    "<h2 style='color: #000000'>Déficit hydrique</h2>"
+                                )
                                 gr.Plot()
                             with gr.Column():
-                                gr.HTML("<h2>Rendements</h2>")
+                                gr.HTML("<h2 style='color: #000000'>Rendements</h2>")
                                 gr.Plot()
-                go_to_page_1_btn = gr.Button(
-                    value="Revenir aux informations du projet", size="lg"
-                )
 
     demo.load(on_init, [lat, lon, address], [lat, lon, map])
     place_btn.click(on_init, [lat, lon, address], [lat, lon, map])

func_utils.py

@@ -2,12 +2,7 @@ import folium
 import requests
 import gradio as gr
 
-from summary_test import (
-    generate_irradiance_trend,
-    get_mocked_summary,
-    get_not_shaded_summary,
-    get_shaded_summary,
-)
+
 from visualize.visualize import get_plots
 
 
@@ -73,8 +68,8 @@ def go_to_page_2():
 
 
 def launch_simulation(lat, lon, address, culture):
-    current_situation_summary = get_not_shaded_summary()
-    agripv_summary = get_shaded_summary()
+    current_situation_summary = "truc"
+    agripv_summary = "bidule"
     page1, page_2 = go_to_page_2()
     plot_1, plot_2, plot_3 = get_plots()
     return (