fix interventions filtering

app.py

@@ -51,23 +51,23 @@ if auto_refresh:
 
 
 # Streamlit functions
-def display_interventions(interventions_df):
+def display_interventions(interventions_df, selected_statuses):
     """Display NGO interventions on the map"""
     for index, row in interventions_df.iterrows():
         village_status = row[interventions_df.columns[7]]
-        if pd.isna(village_status):
+        is_future_intervention = row[interventions_df.columns[5]] == "Intervention prévue dans le futur / Planned future intervention"
+
+        if pd.isna(village_status) and not is_future_intervention:
             village_status = "Partiellement satisfait / Partially Served"
-        if (
-            row[interventions_df.columns[5]]
-            == "Intervention prévue dans le futur / Planned future intervention"
-        ):
-            # future intervention
+
+        if village_status not in selected_statuses:
+            continue
+
+        if is_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
+            village_status
             != "Critique, Besoin d'aide en urgence / Critical, in urgent need of help"
         ):
             # past intervention  and village not in a critical condition
@@ -255,7 +255,7 @@ selected_options = []
 st.markdown(
     "👉 **Choose request type | Choissisez le type de demande | اختر نوع الطلب**"
 )
-col1, col2, col3, col4, col5 = st.columns([2, 3, 2, 3, 4])
+col1, col2, col3, col4, col5 = st.columns([2, 4, 2, 3, 2])
 cols = [col1, col2, col3, col4, col5]
 
 for i, option in enumerate(options):
@@ -276,16 +276,11 @@ 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,
@@ -298,9 +293,7 @@ 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 / وضع حرج، في حاجة عاجلة للمساعدة"
@@ -322,7 +315,7 @@ status_mapping = {
 selected_statuses = [status_mapping[status] for status in selected_village_types]
 
 if show_interventions:
-    display_interventions(interventions_df)
+    display_interventions(interventions_df, selected_statuses)
 
 # Show requests
 show_requests(filtered_df)