add "show unverified requests"

app.py

@@ -1,6 +1,7 @@
 import os
 import time
 from datetime import datetime
+import uuid
 
 import folium
 import pandas as pd
@@ -23,6 +24,7 @@ from src.text_content import (
 from src.utils import add_latlng_col, init_map, parse_gg_sheet, is_request_in_list, marker_request
 
 TOKEN = os.environ.get("HF_TOKEN", None)
+VERIFIED_REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1PXcAtI5L95hHSXAiRl3Y4v5O4coG39S86OTfBEcvLTE/edit#gid=0"
 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"
 api = HfApi(TOKEN)
@@ -53,6 +55,7 @@ if auto_refresh:
 # Streamlit functions
 def display_interventions(interventions_df, selected_statuses):
     """Display NGO interventions on the map"""
+    global fg
     for index, row in interventions_df.iterrows():
         village_status = row[interventions_df.columns[7]]
         is_future_intervention = row[interventions_df.columns[5]] == "Intervention prévue dans le futur / Planned future intervention"
@@ -97,30 +100,53 @@ def display_interventions(interventions_df, selected_statuses):
 
 def show_requests(filtered_df):
     """Display victim requests on the map"""
+    global fg
     for index, row in filtered_df.iterrows():
         request_type = row["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"]
         displayed_request = marker_request(request_type) # TODO: the marker should depend on selected_options
-        long_lat = row[
-            "هل يمكنك تقديم الإحداثيات الدقيقة للموقع؟ (ادا كنت لا توجد بعين المكان) متلاً \n31.01837503440344, -6.781405948842175"
-        ]
+        long_lat = row["latlng"]
         maps_url = f"https://maps.google.com/?q={long_lat}"
         # we display all requests in popup text and use the first one for the icon/color
         display_text = f'<b>Request Type:</b> {request_type}<br><b>Id:</b> {row["id"]}<br><a href="{maps_url}" target="_blank" rel="noopener noreferrer"><b>Google Maps</b></a>'
         icon_name = ICON_MAPPING.get(request_type, "list")
-        if row["latlng"] is None:
+        if long_lat is None:
             continue
 
         fg.add_child(folium.Marker(
-            location=row["latlng"],
+            location=long_lat,
             tooltip=row["  لأي  جماعة / قيادة / دوار تنتمون ؟"]
             if not pd.isna(row["  لأي  جماعة / قيادة / دوار تنتمون ؟"])
             else None,
             popup=folium.Popup(display_text, max_width=300),
             icon=folium.Icon(
-                color=COLOR_MAPPING.get(displayed_request, "blue"), icon=icon_name, prefix="glyphicon"
+                color=COLOR_MAPPING.get(displayed_request, "beige"), icon=icon_name, prefix="glyphicon"
             ),
         ))
 
+def show_verified_requests(filtered_verified_df):
+    """Display verified victim requests on the map"""
+    global fg
+    for index, row in filtered_verified_df.iterrows():
+        request_type = row["Help Details"]
+        displayed_request = marker_request(request_type) # TODO: the marker should depend on selected_options
+        long_lat = row["latlng"]
+        maps_url = f"https://maps.google.com/?q={long_lat}"
+        # we display all requests in popup text and use the first one for the icon/color
+        display_text = f'<b>Request Type:</b> {request_type}<br><b>Verified Id:</b> {row["id"]}<br><a href="{maps_url}" target="_blank" rel="noopener noreferrer"><b>Google Maps</b></a>'
+        icon_name = ICON_MAPPING.get(request_type, "list")
+        if long_lat is None:
+            continue
+        location = row['Location Details']
+        fg.add_child(folium.Marker(
+            location=long_lat,
+            tooltip=location
+            if not pd.isna(location)
+            else None,
+            popup=folium.Popup(display_text, max_width=300),
+            icon=folium.Icon(
+                color=COLOR_MAPPING.get(displayed_request, "beige"), icon=icon_name, prefix="glyphicon"
+            ),
+        ))
 
 def display_google_sheet_tables(data_url):
     """Display the google sheet tables for requests and interventions"""
@@ -137,7 +163,7 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
     with col_1:
         query = st.text_input(
             "🔍 Search for information / بحث عن المعلومات",
-            key=f"search_requests_{int(search_id)}",
+            key=f"query_{uuid.uuid4()}"
         )
     with col_2:
         if search_id:
@@ -147,12 +173,13 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
                 max_value=len(filtered_df),
                 value=0,
                 step=1,
+                key=f"id_{uuid.uuid4()}"
             )
         if status:
             selected_status = st.selectbox(
                 "🗓️ Status / حالة",
                 ["all / الكل", "Done / تم", "Planned / مخطط لها"],
-                key="status",
+                key=f"status_{uuid.uuid4()}"
             )
 
     if query:
@@ -231,13 +258,6 @@ st.markdown(LOGO, unsafe_allow_html=True)
 # st.title("Nt3awnou نتعاونو")
 st.markdown(SLOGAN, unsafe_allow_html=True)
 
-# Load data and initialize map with plugins
-df = parse_gg_sheet(REQUESTS_URL)
-df = add_latlng_col(df, process_column=15)
-len_requests = len(df)
-interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
-interventions_df = add_latlng_col(interventions_df, process_column="Automatic Extracted Coordinates")
-len_interventions = len(interventions_df)
 m = init_map()
 fg = folium.FeatureGroup(name="Markers")
 
@@ -251,7 +271,18 @@ options = [
 ]
 selected_options = []
 
-
+col1, col2 = st.columns([1, 1])
+with col1:
+    show_unverified = st.checkbox(
+        "Display unverified requests / عرض الطلبات غير المؤكدة / Afficher les demandes non vérifiées",
+        value=False,
+    )
+with col2:
+    show_interventions = st.checkbox(
+        "Display Interventions | Afficher les interventions | عرض عمليات المساعدة",
+        value=True,
+    )
+    
 st.markdown(
     "👉 **Choose request type | Choissisez le type de demande | اختر نوع الطلب**"
 )
@@ -263,18 +294,30 @@ for i, option in enumerate(options):
     if checked:
         selected_options.append(option)
 
-df["id"] = df.index
+# Load data and initialize map with plugins
+df = parse_gg_sheet(REQUESTS_URL)
+if show_unverified:
+    df = add_latlng_col(df, process_column=15)
+len_requests = len(df)
+interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
+interventions_df = add_latlng_col(interventions_df, process_column="Automatic Extracted Coordinates")
+len_interventions = len(interventions_df)
+verified_df = parse_gg_sheet(VERIFIED_REQUESTS_URL)
+verified_df = add_latlng_col(verified_df, process_column="Automatic Extracted Coordinates")
+len_verified_requests = len(verified_df)
+
+df["id"] = df.index # Needed to display request id
+verified_df["id"] = verified_df.index # Needed to display request id
 # keep rows with at least one request in selected_options
 filtered_df = df[df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].apply(
     lambda x: is_request_in_list(x, selected_options, options)
 )]
+filtered_verified_df = verified_df[verified_df["Help Details"].apply(
+    lambda x: is_request_in_list(x, selected_options, options)
+)]
 
 
 # Selection of interventions
-show_interventions = st.checkbox(
-    "Display Interventions | Afficher les interventions | عرض عمليات المساعدة",
-    value=True,
-)
 
 st.markdown(
     "👉 **State of villages visited by NGOs| Etat de villages visités par les ONGs | وضعية القرى التي زارتها الجمعيات**",
@@ -318,7 +361,11 @@ if show_interventions:
     display_interventions(interventions_df, selected_statuses)
 
 # Show requests
-show_requests(filtered_df)
+if show_unverified:
+    show_requests(filtered_df)
+
+# Show verified requests
+show_verified_requests(verified_df)
 
 st_folium(m, use_container_width=True, returned_objects=[], feature_group_to_add=fg, key="map")
 
@@ -416,6 +463,16 @@ with tab_fr:
             unsafe_allow_html=True,
         )
 
+# Verified Requests table
+st.divider()
+st.subheader("📝 **Table of verified requests / جدول الطلبات المؤكدة**")
+drop_cols = [
+    "Phone Number",
+    "id",
+    "VerificationStatus"
+]
+display_dataframe(verified_df, drop_cols, VERIFIED_REQUESTS_URL, search_id=True, for_help_requests=True)
+
 # Requests table
 st.divider()
 st.subheader("📝 **Table of requests / جدول الطلبات**")

src/utils.py

@@ -9,7 +9,7 @@ import streamlit as st
 EPICENTER_LOCATION = [31.12210171476489, -8.42945837915193]
 BORDER_COLOR = "black"
 
-@st.cache_data
+# @st.cache(persist=False) #TODO fix this
 def parse_gg_sheet(url):
     print("Parsing Google Sheet:", url)
     url = url.replace("edit#gid=", "export?format=csv&gid=")