filter nans

app.py

@@ -7,7 +7,7 @@ import folium
 import streamlit as st
 from huggingface_hub import HfApi
 from streamlit_folium import st_folium
-from src.components import show_dataframes_metrics, show_embed_code, id_review_submission, show_donations
+from src.components import show_dataframes_metrics, show_embed_code, show_donations
 from src.text_content import (
     CREDITS_TEXT,
     LOGO,
@@ -15,8 +15,7 @@ from src.text_content import (
 )
 from src.utils import init_map
 from src.map_utils import get_legend_macro
-from src.dataframes import display_dataframe
-from src.dataframes import load_data, VERIFIED_REQUESTS_URL, REQUESTS_URL, INTERVENTIONS_URL
+from src.dataframes import load_data
 import gettext
 
 gettext.install("myapplication")

src/dataframes.py

@@ -91,7 +91,7 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
     display_df = display_df.drop(drop_cols, axis=1)
 
     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"
+        target = "Intervention status"
         if selected_status == "Done / تم":
             display_df = display_df[display_df[target] == "Intervention déjà passée / Past intevention"]
 

src/markers.py

@@ -18,6 +18,7 @@ ICON_MAPPING = {
     "طعام وماء": "cutlery",      # cutlery (fork and knife) for food & water
     "مخاطر (تسرب الغاز، تلف في الخدمات العامة...)": "Warning"  # warning triangle for dangers
 }
+numcol = lambda x: ord(x) - ord("A")
 
 def marker_request(request):
     # in case of multiple requests we use the first one for the marker's icon
@@ -34,9 +35,9 @@ def display_interventions(interventions_df, selected_statuses, map_obj, interven
     """Display NGO interventions on the map"""
 
     for index, row in interventions_df.iterrows():
-        village_status = row[interventions_df.columns[7]]
+        village_status = row[interventions_df.columns[numcol("K")]]
         is_future_intervention = (
-            row[interventions_df.columns[5]] == "Intervention prévue dans le futur / Planned future intervention"
+            row[interventions_df.columns[numcol("H")]] == "Intervention prévue dans le futur / Planned future intervention"
         )
 
         if pd.isna(village_status) and not is_future_intervention:
@@ -57,27 +58,57 @@ def display_interventions(interventions_df, selected_statuses, map_obj, interven
             color_mk = "darkgreen"
             status = "Partial 📝"
 
-        intervention_type = row[interventions_df.columns[6]]
-        org = row[interventions_df.columns[1]]
-        contact = row[interventions_df.columns[2]]
-        city = row[interventions_df.columns[9]]
-        date = row[interventions_df.columns[4]]
-        population = row[interventions_df.columns[11]]
-        details = row[interventions_df.columns[8]]
-        road_state = row[interventions_df.columns[12]]
+    #         ['Horodateur', 'Organization Name', 'Association ID', 'Speciality',
+    #    'Phone 1', 'Phone 2', 'Email', 'Intervention status',
+    #    'Intervention date', 'Types of Help Provided',
+    #    'Current situation of the area', 'Future help type', 'Douar name',
+    #    'Commune', 'Caidat', ' Google Maps Link',
+    #    'Accessibility to the targeted douar', 'Type of accessibility',
+    #    'Population of the douar if available', 'Intervention Additional Info',
+    #    'Any Additional info is welcome', 'Automatic Extracted Coordinates',
+    #    'Unnamed: 22'],
+
+        org = row[interventions_df.columns[numcol("B")]]
+        association_id = row[interventions_df.columns[numcol("C")]]
+        speciality = row[interventions_df.columns[numcol("D")]]
+        phone_1 = row[interventions_df.columns[numcol("E")]]
+        phone_2 = row[interventions_df.columns[numcol("F")]]
+        email = row[interventions_df.columns[numcol("G")]]
+        intervention_status = row[interventions_df.columns[numcol("H")]]
+        intervention_date = row[interventions_df.columns[numcol("I")]]
+        help_type = row[interventions_df.columns[numcol("J")]]
+        current_situation = row[interventions_df.columns[numcol("K")]]
+        future_help_type = row[interventions_df.columns[numcol("L")]]
+        douar_name = row[interventions_df.columns[numcol("M")]]
+        commune = row[interventions_df.columns[numcol("N")]]
+        caidat = row[interventions_df.columns[numcol("O")]]
+        google_maps_link = row[interventions_df.columns[numcol("P")]]
+        accessibility_to_douar = row[interventions_df.columns[numcol("Q")]]
+        type_of_accessibility = row[interventions_df.columns[numcol("R")]]
+        population = row[interventions_df.columns[numcol("S")]]
+        intervention_additional_info = row[interventions_df.columns[numcol("T")]]
+        any_additional_info = row[interventions_df.columns[numcol("U")]]
+        
+        full_douar_name = ", ".join([x for x in [douar_name, commune, caidat] if not pd.isna(x)])
         intervention_info = f"""
-        <b>Date:</b> {date}<br>
-        <b>City:</b> {city}<br>
-        <b>Intervention Status:</b> {status}<br>
-        <b>Village Status:</b> {village_status}<br>
         <b>Org:</b> {org}<br>
-        <b>Intervention:</b> {intervention_type}<br>
+        <b>Association ID:</b> {association_id}<br>
+        <b>Speciality:</b> {speciality}<br>
+        <b>Phone 1:</b> {phone_1}<br>
+        <b>Phone 2:</b> {phone_2}<br>
+        <b>Email:</b> {email}<br>
+        <b>Intervention Date:</b> {intervention_date}<br>
+        <b>Intervention Status:</b> {intervention_status}<br>
+        <b>Help Type:</b> {help_type}<br>
+        <b>Current Situation:</b> {current_situation}<br>
+        <b>Future Help Type:</b> {future_help_type}<br>
+        <b>Douar Name:</b> {full_douar_name}<br>
+        <b>Accessibility to Douar:</b> {accessibility_to_douar}<br>
+        <b>Type of Accessibility:</b> {type_of_accessibility}<br>
         <b>Population:</b> {population}<br>
-        <b>Road State:</b> {road_state}<br>
-        <b>Details:</b> {details}<br>
-        <b>Contact:</b> {contact}<br>
-        """
-
+        <b>Intervention Additional Info:</b> {intervention_additional_info}<br>
+        <b>Any Additional Info:</b> {any_additional_info}<br>
+        """ #TODO: filter nans
         if row["latlng"] is None:
             continue
 
@@ -85,7 +116,7 @@ def display_interventions(interventions_df, selected_statuses, map_obj, interven
         fg.add_child(
             folium.Marker(
                 location=row["latlng"],
-                tooltip=city,
+                tooltip=full_douar_name,
                 popup=folium.Popup(intervention_info, max_width=300),
                 icon=folium.Icon(color=color_mk),
             )