Use streamlit dataframe instead of displaying google sheet (with options for filtering) (#13)

- Use streamlit dataframe instead of displaying google sheet (with options for filtering) (bfa922465c76b92ce14b837ee2e0f7bc5a264268)


Co-authored-by: Loubna Ben Allal <[email protected]>

app.py

@@ -128,18 +128,67 @@ def show_requests(filtered_df, m):
         ).add_to(m)
 
 
-def display_google_sheet_tables():
+
+def display_google_sheet_tables(data_url):
     """Display the google sheet tables for requests and interventions"""
-    st.subheader("📝 **Table of requests / جدول الطلبات**")
     st.markdown(
-        f"""<iframe src="{REQUESTS_URL}" width="100%" height="600px"></iframe>""",
+        f"""<iframe src="{data_url}" width="100%" height="600px"></iframe>""",
         unsafe_allow_html=True,
     )
 
-    st.subheader("📝 **Table of interventions / جدول التدخلات**")
+
+def display_dataframe(df, drop_cols, data_url, search_id=True, status=False):
+    """Display the dataframe in a table"""
+    col_1, col_2 = st.columns([1, 1])
+
+    with col_1:
+        query = st.text_input(
+            "🔍 Search for information / بحث عن المعلومات",
+            key=f"search_requests_{int(search_id)}",
+        )
+    with col_2:
+        if search_id:
+            id_number = st.number_input(
+                "🔍 Search for an id / بحث عن رقم",
+                min_value=0,
+                max_value=len(filtered_df),
+                value=0,
+                step=1,
+            )
+        if status:
+            selected_status = st.selectbox(
+                "🗓️ Status / حالة",
+                ["all / الكل", "Done / تم", "Planned / مخطط لها"],
+                key="status",
+            )
+
+    if query:
+        # Filtering the dataframe based on the query
+        mask = df.apply(lambda row: row.astype(str).str.contains(query).any(), axis=1)
+        display_df = df[mask]
+    else:
+        display_df = df
+
+    display_df = display_df.drop(drop_cols, axis=1)
+
+    if search_id and id_number:
+        display_df = display_df[display_df["id"] == id_number]
+
+    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"
+            ]
+
+        elif selected_status == "Planned / مخطط لها":
+            display_df = display_df[
+                display_df[target] != "Intervention déjà passée / Past intevention"
+            ]
+
+    st.dataframe(display_df, height=500)
     st.markdown(
-        f"""<iframe src="{INTERVENTIONS_URL}" width="100%" height="600px"></iframe>""",
-        unsafe_allow_html=True,
+        f"To view the full Google Sheet for advanced filtering go to: {data_url} **لعرض الورقة كاملة، اذهب إلى**"
     )
 
 
@@ -236,9 +285,27 @@ show_requests(filtered_df, m)
 
 st_data = st_folium(m, use_container_width=True)
 
-# Google Sheet Tables
-display_google_sheet_tables()
-
+st.subheader("📝 **Table of requests / جدول الطلبات**")
+# Requests table
+drop_cols = [
+    "(عند الامكان) رقم هاتف شخص موجود في عين المكان",
+    "الرجاء الضغط على الرابط التالي لمعرفة موقعك إذا كان متاحا",
+    "GeoStamp",
+    "GeoCode",
+    "GeoAddress",
+    "Status",
+]
+display_dataframe(filtered_df, drop_cols, REQUESTS_URL, search_id=True)
+
+# Interventions table
+st.subheader("📝 **Table of interventions / جدول التدخلات**")
+display_dataframe(
+    interventions_df,
+    ["Informations de Contact | Contact Information"],
+    INTERVENTIONS_URL,
+    search_id=False,
+    status=True,
+)
 # Submit an id for review
 id_review_submission()