Update app.py

app.py

@@ -4,9 +4,7 @@ from datetime import datetime
 
 import folium
 import pandas as pd
-import requests
 import streamlit as st
-from folium import plugins
 from huggingface_hub import HfApi
 from streamlit_folium import st_folium
 
@@ -20,10 +18,9 @@ from src.text_content import (
     INTRO_TEXT_FR,
     LOGO,
     REVIEW_TEXT,
-    REVIEW_TEXT_2,
     SLOGAN,
 )
-from src.utils import init_map, parse_gg_sheet
+from src.utils import add_latlng_col, init_map, parse_gg_sheet
 
 TOKEN = os.environ.get("HF_TOKEN", None)
 REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fOGvHWb23loadyFZUeHJs/edit#gid=966953708"
@@ -32,7 +29,12 @@ api = HfApi(TOKEN)
 
 
 # Initialize Streamlit Config
-st.set_page_config(layout="wide", initial_sidebar_state="collapsed")
+st.set_page_config(
+    layout="wide",
+    initial_sidebar_state="collapsed",
+    page_icon="🤝",
+    page_title="Nt3awnou نتعاونو",
+)
 
 # Initialize States
 if "sleep_time" not in st.session_state:
@@ -40,9 +42,6 @@ if "sleep_time" not in st.session_state:
 if "auto_refresh" not in st.session_state:
     st.session_state.auto_refresh = False
 
-# Session for Requests
-session = requests.Session()
-
 auto_refresh = st.sidebar.checkbox("Auto Refresh?", st.session_state.auto_refresh)
 if auto_refresh:
     number = st.sidebar.number_input(
@@ -51,48 +50,42 @@ if auto_refresh:
     st.session_state.sleep_time = number
 
 
-# Utility functions
-@st.cache_data(persist=True)
-def parse_latlng_from_link(url):
-    try:
-        # extract latitude and longitude from gmaps link
-        if "@" not in url:
-            resp = session.head(url, allow_redirects=True)
-            url = resp.url
-        latlng = url.split("@")[1].split(",")[0:2]
-        return [float(latlng[0]), float(latlng[1])]
-    except Exception as e:
-        return None
-
-
-def parse_gg_sheet_interventions(url):
-    url = url.replace("edit#gid=", "export?format=csv&gid=")
-    print(url)
-    df = pd.read_csv(url, on_bad_lines="skip")
-    return df.assign(latlng=df.iloc[:, 3].apply(parse_latlng_from_link))
-
-
 # Streamlit functions
 def display_interventions(interventions_df, m):
     """Display NGO interventions on the map"""
     for index, row in interventions_df.iterrows():
+        village_status = row[interventions_df.columns[7]]
         status = (
             "Done ✅"
             if row[interventions_df.columns[5]]
             != "Intervention prévue dans le futur / Planned future intervention"
+            and village_status
+            != "Critique, Besoin d'aide en urgence / Critical, in urgent need of help"
             else "Planned ⌛"
         )
-        color_mk = (
-            "green"
-            if row[interventions_df.columns[5]]
+        if (
+            row[interventions_df.columns[5]]
             != "Intervention prévue dans le futur / Planned future intervention"
-            else "pink"
-        )
+            and village_status
+            != "Critique, Besoin d'aide en urgence / Critical, in urgent need of help"
+        ):
+            color_mk = "green"
+        elif (
+            row[interventions_df.columns[5]]
+            != "Intervention prévue dans le futur / Planned future intervention"
+            and village_status
+            == "Critique, Besoin d'aide en urgence / Critical, in urgent need of help"
+        ):
+            color_mk = "darkgreen"
+        else:
+            color_mk = "pink"
+
         intervention_type = row[interventions_df.columns[6]].split("/")[0].strip()
         org = row[interventions_df.columns[1]]
         city = row[interventions_df.columns[9]]
         date = row[interventions_df.columns[4]]
-        intervention_info = f"<b>Status:</b> {status}<br><b>Org:</b> {org}<br><b>Intervention:</b> {intervention_type}<br><b>📅 Date:</b> {date}"
+        population = row[interventions_df.columns[11]]
+        intervention_info = f"<b>Intervention Status:</b> {status}<br><b>Village Status:</b> {village_status.split('/')[0]}<br><b>Org:</b> {org}<br><b>Intervention:</b> {intervention_type}<br><b>📅 Date:</b> {date}<br><b>📅 Population:</b> {population}"
         if row["latlng"] is None:
             continue
         folium.Marker(
@@ -128,7 +121,6 @@ def show_requests(filtered_df, m):
         ).add_to(m)
 
 
-
 def display_google_sheet_tables(data_url):
     """Display the google sheet tables for requests and interventions"""
     st.markdown(
@@ -190,13 +182,25 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False):
     st.markdown(
         f"To view the full Google Sheet for advanced filtering go to: {data_url} **لعرض الورقة كاملة، اذهب إلى**"
     )
+    # if we want to check hidden contact information
+    st.markdown(
+        f"We are hiding contact information to protect the privacy of the victims. If you are an NGO and want to contact the victims, please contact us at [email protected]",
+    )
+    # arabic needs rtl
+    st.markdown(
+        f"""
+                <div style="text-align: left;">
+                <a href="mailto:[email protected]">[email protected]</a> نحن نخفي معلومات الاتصال لحماية خصوصية الضحايا. إذا كنت جمعية وتريد الاتصال بالضحايا، يرجى الاتصال بنا على 
+                </div>
+                """,
+        unsafe_allow_html=True,
+    )
 
 
 def id_review_submission():
     """Id review submission form"""
     st.subheader("🔍 Review of requests")
     st.markdown(REVIEW_TEXT)
-    st.markdown(REVIEW_TEXT_2)
 
     id_to_review = st.number_input(
         "Enter id / أدخل الرقم", min_value=0, max_value=len(df), value=0, step=1
@@ -222,24 +226,14 @@ def id_review_submission():
 
 # Logo and Title
 st.markdown(LOGO, unsafe_allow_html=True)
-st.title("Nt3awnou نتعاونو ")
+# st.title("Nt3awnou نتعاونو")
 st.markdown(SLOGAN, unsafe_allow_html=True)
 
-# Language tabs
-st.sidebar.title("Language / اللغة")
-tab_ar, tab_en, tab_fr = st.tabs(["العربية", "English", "Français"])
-
-with tab_en:
-    st.markdown(INTRO_TEXT_EN, unsafe_allow_html=True)
-with tab_ar:
-    st.markdown(INTRO_TEXT_AR, unsafe_allow_html=True)
-with tab_fr:
-    st.markdown(INTRO_TEXT_FR, unsafe_allow_html=True)
-
-
 # Load data and initialize map with plugins
 df = parse_gg_sheet(REQUESTS_URL)
-interventions_df = parse_gg_sheet_interventions(INTERVENTIONS_URL)
+df = add_latlng_col(df, process_column=15)
+interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
+interventions_df = add_latlng_col(interventions_df, process_column=12)
 m = init_map()
 
 # Selection of requests
@@ -252,13 +246,10 @@ options = [
 ]
 selected_options = []
 
-with tab_en:
-    st.markdown("👉 **Choose request type**")
-with tab_ar:
-    st.markdown("👉 **اختر نوع الطلب**")
-with tab_fr:
-    st.markdown("👉 **Choisissez le type de demande**")
 
+st.markdown(
+    "👉 **Choose request type | Choissisez le type de demande | اختر نوع الطلب**"
+)
 col1, col2, col3, col4, col5 = st.columns([2, 3, 2, 3, 4])
 cols = [col1, col2, col3, col4, col5]
 
@@ -277,16 +268,76 @@ show_interventions = st.checkbox(
     value=True,
 )
 
+# Categories of villages
+
+st.markdown(
+    "👉 **State of villages visited by NGOs| Etat de villages visités par les ONGs | اختر نوع القرى التي زارتها الجمعيات**",
+    unsafe_allow_html=True,
+)
+
+
+# use checkboxes
+col_1, col_2, col_3 = st.columns([1, 1, 1])
+
+critical_villages = col_1.checkbox(
+    "Critical, in urgent need of help / وضع حرج، في حاجة عاجلة للمساعدة",
+    value=True,
+)
+partially_satisfied_villages = col_2.checkbox(
+    "Partially served / مساعدة جزئية، بحاجة للمزيد من التدخلات",
+    value=True,
+)
+fully_satisfied_villages = col_3.checkbox(
+    "Fully served  / تمت المساعدة بشكل كامل",
+    value=True,
+)
+selected_village_types = []
+
+if critical_villages:
+    selected_village_types.append(
+        "Critical, in urgent need of help / وضع حرج، في حاجة عاجلة للمساعدة"
+    )
+
+if partially_satisfied_villages:
+    selected_village_types.append(
+        "Partially served / مساعدة جزئية، بحاجة للمزيد من التدخلات"
+    )
+
+if fully_satisfied_villages:
+    selected_village_types.append("Fully served  / تمت المساعدة بشكل كامل")
+
+status_mapping = {
+    "Critical, in urgent need of help / وضع حرج، في حاجة عاجلة للمساعدة": "Critique, Besoin d'aide en urgence / Critical, in urgent need of help",
+    "Partially served / مساعدة جزئية، بحاجة للمزيد من التدخلات": "Partiellement satisfait / Partially Served",
+    "Fully served  / تمت المساعدة بشكل كامل": "Entièrement satisfait / Fully served",
+}
+selected_statuses = [status_mapping[status] for status in selected_village_types]
+
 if show_interventions:
+    interventions_df = interventions_df.loc[
+        interventions_df[
+            "Etat de la région actuel | Current situation of the area "
+        ].isin(selected_statuses)
+    ]
     display_interventions(interventions_df, m)
 
 # Show requests
 show_requests(filtered_df, m)
 
 st_data = st_folium(m, use_container_width=True)
+tab_ar, tab_en, tab_fr = st.tabs(["العربية", "English", "Français"])
+
+
+with tab_en:
+    st.markdown(INTRO_TEXT_EN, unsafe_allow_html=True)
+with tab_ar:
+    st.markdown(INTRO_TEXT_AR, unsafe_allow_html=True)
+with tab_fr:
+    st.markdown(INTRO_TEXT_FR, unsafe_allow_html=True)
 
-st.subheader("📝 **Table of requests / جدول الطلبات**")
 # Requests table
+st.divider()
+st.subheader("📝 **Table of requests / جدول الطلبات**")
 drop_cols = [
     "(عند الامكان) رقم هاتف شخص موجود في عين المكان",
     "الرجاء الضغط على الرابط التالي لمعرفة موقعك إذا كان متاحا",
@@ -294,19 +345,23 @@ drop_cols = [
     "GeoCode",
     "GeoAddress",
     "Status",
+    "id",
 ]
 display_dataframe(filtered_df, drop_cols, REQUESTS_URL, search_id=True)
 
 # Interventions table
+st.divider()
 st.subheader("📝 **Table of interventions / جدول التدخلات**")
 display_dataframe(
     interventions_df,
-    ["Informations de Contact | Contact Information"],
+    [],  # We show NGOs contact information
     INTERVENTIONS_URL,
     search_id=False,
     status=True,
 )
+
 # Submit an id for review
+st.divider()
 id_review_submission()