Add village status selection and description to the markers, change marker color if village was visited but is in critical condition (#15)

- Add village status selection and description to the markers, change marker color if village was visited but is in critical condition (6fb458c6d43ded517186e461d0dd7b879c4d550a)
- use checkboxes instead (8cfd7ce99e7a437d8d5227cf36dfe9ed87285896)
- add new color (5ded0278b146b60333177f752543dac9d28c0445)

app.py

@@ -7,7 +7,6 @@ import pandas as pd
 import streamlit as st
 from huggingface_hub import HfApi
 from streamlit_folium import st_folium
-from src.utils import add_latlng_col
 
 from src.text_content import (
     COLOR_MAPPING,
@@ -21,18 +20,21 @@ from src.text_content import (
     REVIEW_TEXT,
     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"
-INTERVENTIONS_URL = (
-    "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
-)
+INTERVENTIONS_URL = "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
 api = HfApi(TOKEN)
 
 
 # Initialize Streamlit Config
-st.set_page_config(layout="wide", initial_sidebar_state="collapsed", page_icon="🤝", page_title="Nt3awnou نتعاونو")
+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:
@@ -42,7 +44,9 @@ if "auto_refresh" not in st.session_state:
 
 auto_refresh = st.sidebar.checkbox("Auto Refresh?", st.session_state.auto_refresh)
 if auto_refresh:
-    number = st.sidebar.number_input("Refresh rate in seconds", value=st.session_state.sleep_time)
+    number = st.sidebar.number_input(
+        "Refresh rate in seconds", value=st.session_state.sleep_time
+    )
     st.session_state.sleep_time = number
 
 
@@ -50,21 +54,34 @@ if auto_refresh:
 def display_interventions(interventions_df, m):
     """Display NGO interventions on the map"""
     for index, row in interventions_df.iterrows():
-        status = (
-            "Done ✅"
-            if row[interventions_df.columns[5]] != "Intervention prévue dans le futur / Planned future intervention"
-            else "Planned ⌛"
-        )
-        color_mk = (
-            "green"
-            if row[interventions_df.columns[5]] != "Intervention prévue dans le futur / Planned future intervention"
-            else "pink"
-        )
+        village_status = row[interventions_df.columns[7]]
+        if (
+            row[interventions_df.columns[5]]
+            == "Intervention prévue dans le futur / Planned future intervention"
+        ):
+            # future intervention
+            color_mk = "pink"
+            status = "Planned ⌛"
+        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"
+        ):
+            # past intervention  and village not in a critical condition
+            color_mk = "green"
+            status = "Done ✅"
+
+        else:
+            color_mk = "darkgreen"
+            status = "Partial ⚠️"
+
         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>Population:</b> {population}<br><b>📅 Date:</b> {date}"
         if row["latlng"] is None:
             continue
         folium.Marker(
@@ -94,7 +111,9 @@ def show_requests(filtered_df, m):
             if not pd.isna(row["  لأي  جماعة / قيادة / دوار تنتمون ؟"])
             else None,
             popup=folium.Popup(display_text, max_width=300),
-            icon=folium.Icon(color=COLOR_MAPPING.get(request_type, "blue"), icon=icon_name),
+            icon=folium.Icon(
+                color=COLOR_MAPPING.get(request_type, "blue"), icon=icon_name
+            ),
         ).add_to(m)
 
 
@@ -146,10 +165,14 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
     if status:
         target = "Pouvez-vous nous préciser si vous êtes déjà intervenus ou si vous prévoyez de le faire | Tell us if you already made the intervention, or if you're planning to do it"
         if selected_status == "Done / تم":
-            display_df = display_df[display_df[target] == "Intervention déjà passée / Past intevention"]
+            display_df = display_df[
+                display_df[target] == "Intervention déjà passée / Past intevention"
+            ]
 
         elif selected_status == "Planned / مخطط لها":
-            display_df = display_df[display_df[target] != "Intervention déjà passée / Past intevention"]
+            display_df = display_df[
+                display_df[target] != "Intervention déjà passée / Past intevention"
+            ]
 
     st.dataframe(display_df, height=500)
     st.markdown(
@@ -176,7 +199,9 @@ def id_review_submission():
     st.subheader("🔍 Review of requests")
     st.markdown(REVIEW_TEXT)
 
-    id_to_review = st.number_input("Enter id / أدخل الرقم", min_value=0, max_value=len(df), value=0, step=1)
+    id_to_review = st.number_input(
+        "Enter id / أدخل الرقم", min_value=0, max_value=len(df), value=0, step=1
+    )
     reason_for_review = st.text_area("Explain why / أدخل سبب المراجعة")
     if st.button("Submit / أرسل"):
         if reason_for_review == "":
@@ -191,7 +216,9 @@ def id_review_submission():
                 repo_id="nt3awnou/review_requests",
                 repo_type="dataset",
             )
-            st.success("Submitted at https://huggingface.co/datasets/nt3awnou/review_requests/ تم الإرسال")
+            st.success(
+                "Submitted at https://huggingface.co/datasets/nt3awnou/review_requests/ تم الإرسال"
+            )
 
 
 # Logo and Title
@@ -216,14 +243,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 | اختر نوع الطلب**")
+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]
 
@@ -242,8 +265,58 @@ 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:
-    # print(interventions_df.columns)
+    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
@@ -270,6 +343,7 @@ drop_cols = [
     "GeoCode",
     "GeoAddress",
     "Status",
+    "id",
 ]
 display_dataframe(filtered_df, drop_cols, REQUESTS_URL, search_id=True, for_help_requests=True)
 
@@ -278,7 +352,7 @@ st.divider()
 st.subheader("📝 **Table of interventions / جدول التدخلات**")
 display_dataframe(
     interventions_df,
-    [], # We show NGOs contact information
+    [],  # We show NGOs contact information
     INTERVENTIONS_URL,
     search_id=False,
     status=True,

src/map_utils.py

@@ -46,6 +46,7 @@ template = """
     <li><span style='background:#37A8DA;opacity:0.7;'></span>Food & Water / طعام وماء</li>
     <li><span style='background:#575757;opacity:0.7;'></span>Danger / مخاطر (تسرب الغاز، تلف في الخدمات العامة...)</li>
     <li><span style='background:#6EAA25;opacity:0.7;'></span>Done / تم</li>
+    <li><span style='background:#023020;opacity:0.7;'></span>Partial / تم جزئيا</li>
     <li><span style='background:#FF91E8;opacity:0.7;'></span>Planned / مخطط لها</li>
   </ul>
 </div>