Update app.py

app.py

@@ -1,4 +1,3 @@
-# app.py
 import gradio as gr
 import pandas as pd
 import gspread
@@ -8,47 +7,59 @@ from datetime import datetime, timedelta
 from gspread_dataframe import set_with_dataframe
 
 # -------------------- CONFIG --------------------
-SHEET_URL = "https://docs.google.com/spreadsheets/d/1if4KoVQvw5ZbhknfdZbzMkcTiPfsD6bz9V3a1th-bwQ"
-USER_SHEET_NAME = "Users"   # <--- make sure this tab exists
+SHEET_URL        = "https://docs.google.com/spreadsheets/d/1if4KoVQvw5ZbhknfdZbzMkcTiPfsD6bz9V3a1th-bwQ"
+USER_SHEET_NAME  = "Users"   # <-- must match (or contain) your “Users” tab
 
 # -------------------- AUTH --------------------
 scope = [
     "https://spreadsheets.google.com/feeds",
     "https://www.googleapis.com/auth/drive",
 ]
-creds = ServiceAccountCredentials.from_json_keyfile_name(
+creds  = ServiceAccountCredentials.from_json_keyfile_name(
     "deep-mile-461309-t8-0e90103411e0.json", scope
 )
 client = gspread.authorize(creds)
 
+# -------------------- FUZZY WORKSHEET LOOKUP --------------------
+def open_ws_by_substring(substr: str):
+    """
+    Try exact match, then fall back to the first worksheet
+    whose title contains `substr` (case-insensitive).
+    """
+    sh = client.open_by_url(SHEET_URL)
+    try:
+        return sh.worksheet(substr)
+    except WorksheetNotFound:
+        for ws in sh.worksheets():
+            if substr.lower() in ws.title.lower():
+                return ws
+    raise WorksheetNotFound(f"No tab matching '{substr}'")
+
 # -------------------- SHEET UTILS --------------------
 def normalize_columns(df: pd.DataFrame) -> pd.DataFrame:
     df.columns = df.columns.str.strip().str.title()
     return df
 
 def load_sheet(sheet_name: str) -> pd.DataFrame:
-    """Loads an entire sheet into a DataFrame, or returns a one-row error."""
+    """Return a DataFrame of the entire sheet, or an Error row."""
     try:
-        ws = client.open_by_url(SHEET_URL).worksheet(sheet_name)
+        ws = open_ws_by_substring(sheet_name)
         df = pd.DataFrame(ws.get_all_records())
         return normalize_columns(df)
     except Exception as e:
         return pd.DataFrame([{"Error": str(e)}])
 
 def load_sheet_df(sheet_name: str) -> pd.DataFrame:
-    """Same as load_sheet but re-raises WorksheetNotFound for callers to catch."""
-    try:
-        ws = client.open_by_url(SHEET_URL).worksheet(sheet_name)
-    except WorksheetNotFound:
-        raise
+    """Like load_sheet, but lets WorksheetNotFound bubble up."""
+    ws = open_ws_by_substring(sheet_name)
     df = pd.DataFrame(ws.get_all_records())
     return normalize_columns(df)
 
-# -------------------- WEEK FILTERS --------------------
+# -------------------- DATE FILTER HELPERS --------------------
 def get_current_week_range():
     today = datetime.now().date()
     start = today - timedelta(days=today.weekday())
-    end = start + timedelta(days=6)
+    end   = start + timedelta(days=6)
     return start, end
 
 def filter_week(df, date_col, rep_col=None, rep=None):
@@ -77,18 +88,18 @@ def get_calls(rep=None):
         return df
     return filter_week(df, "Call Date", "Rep", rep)
 
-def get_appointments(rep=None):
-    df = load_sheet("Appointments")
-    if "Appointment Date" not in df.columns:
-        return df
-    return filter_week(df, "Appointment Date", "Rep", rep)
-
 def search_calls_by_date(y, m, d, rep):
     df = load_sheet("Calls")
     if "Call Date" not in df.columns:
         return df
     return filter_date(df, "Call Date", "Rep", y, m, d, rep)
 
+def get_appointments(rep=None):
+    df = load_sheet("Appointments")
+    if "Appointment Date" not in df.columns:
+        return df
+    return filter_week(df, "Appointment Date", "Rep", rep)
+
 def search_appointments_by_date(y, m, d, rep):
     df = load_sheet("Appointments")
     if "Appointment Date" not in df.columns:
@@ -96,14 +107,15 @@ def search_appointments_by_date(y, m, d, rep):
     return filter_date(df, "Appointment Date", "Rep", y, m, d, rep)
 
 def get_leads_detail():
-    df = load_sheet("AllocatedLeads")
-    return df
+    return load_sheet("AllocatedLeads")
 
 def get_leads_summary():
     df = get_leads_detail()
     if "Error" in df.columns:
         return df
-    return df.groupby("Assigned Rep").size().reset_index(name="Leads Count")
+    return df.groupby("Assigned Rep")\
+             .size()\
+             .reset_index(name="Leads Count")
 
 def compute_insights():
     calls = get_calls()
@@ -143,7 +155,6 @@ def load_users() -> pd.DataFrame:
     try:
         return load_sheet_df(USER_SHEET_NAME)
     except WorksheetNotFound:
-        # fall back to empty skeleton
         return pd.DataFrame(columns=cols)
 
 def save_users(df: pd.DataFrame):
@@ -156,64 +167,133 @@ def save_users(df: pd.DataFrame):
 with gr.Blocks(title="Graffiti Admin Dashboard") as app:
     gr.Markdown("# 📆 Graffiti Admin Dashboard")
 
-    # -- Calls Tab --
+    # -- Calls Report --
     with gr.Tab("Calls Report"):
-        rep_calls = gr.Dropdown(choices=rep_options("Calls","Rep"), label="Optional Rep Filter", allow_custom_value=True)
-        calls_btn  = gr.Button("Load Current Week Calls")
-        calls_tbl  = gr.Dataframe()
-        calls_btn.click(fn=get_calls, inputs=rep_calls, outputs=calls_tbl)
+        rep_calls = gr.Dropdown(choices=rep_options("Calls","Rep"),
+                                label="Optional Rep Filter",
+                                allow_custom_value=True)
+        calls_btn = gr.Button("Load Current Week Calls")
+
+        with gr.Row():
+            with gr.Column():
+                calls_sum = gr.Dataframe(label="📊 Calls by Rep")
+            with gr.Column():
+                calls_det = gr.Dataframe(label="🔎 Detailed Calls")
+
+        calls_btn.click(
+            fn=lambda r: (
+                get_calls(r).groupby("Rep")
+                            .size()
+                            .reset_index(name="Count"),
+                get_calls(r)
+            ),
+            inputs=rep_calls,
+            outputs=[calls_sum, calls_det]
+        )
 
         gr.Markdown("### 🔍 Search Calls by Specific Date")
-        y1,m1,d1 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        rep1     = gr.Dropdown(choices=rep_options("Calls","Rep"), label="Optional Rep Filter", allow_custom_value=True)
+        y1 = gr.Textbox(label="Year")
+        m1 = gr.Textbox(label="Month")
+        d1 = gr.Textbox(label="Day")
+        rep1 = gr.Dropdown(choices=rep_options("Calls","Rep"),
+                           label="Optional Rep Filter",
+                           allow_custom_value=True)
         calls_date_btn = gr.Button("Search Calls by Date")
-        calls_date_tbl = gr.Dataframe()
-        calls_date_btn.click(fn=search_calls_by_date, inputs=[y1,m1,d1,rep1], outputs=calls_date_tbl)
 
-    # -- Appointments Tab --
+        with gr.Row():
+            with gr.Column():
+                calls_date_sum = gr.Dataframe(label="📊 Calls by Rep on Date")
+            with gr.Column():
+                calls_date_det = gr.Dataframe(label="🔎 Detailed Calls on Date")
+
+        calls_date_btn.click(
+            fn=lambda y,m,d,r: (
+                search_calls_by_date(y,m,d,r)
+                  .groupby("Rep")
+                  .size()
+                  .reset_index(name="Count"),
+                search_calls_by_date(y,m,d,r)
+            ),
+            inputs=[y1,m1,d1,rep1],
+            outputs=[calls_date_sum, calls_date_det]
+        )
+
+    # -- Appointments Report --
     with gr.Tab("Appointments Report"):
-        rep_appt = gr.Dropdown(choices=rep_options("Appointments","Rep"), label="Optional Rep Filter", allow_custom_value=True)
-        appt_btn = gr.Button("Load Current Week Appointments")
-        appt_sum = gr.Dataframe(label="📊 Weekly Appointments Summary by Rep")
-        appt_tbl = gr.Dataframe()
+        rep_appt = gr.Dropdown(choices=rep_options("Appointments","Rep"),
+                               label="Optional Rep Filter",
+                               allow_custom_value=True)
+        appt_btn  = gr.Button("Load Current Week Appointments")
+
+        with gr.Row():
+            with gr.Column():
+                appt_sum = gr.Dataframe(label="📊 Weekly Appointments Summary by Rep")
+            with gr.Column():
+                appt_det = gr.Dataframe(label="🔎 Detailed Appointments")
+
         appt_btn.click(
-            fn=lambda r: ( get_appointments(r).groupby("Rep").size().reset_index(name="Count"),
-                           get_appointments(r) ),
+            fn=lambda r: (
+                get_appointments(r)
+                  .groupby("Rep")
+                  .size()
+                  .reset_index(name="Count"),
+                get_appointments(r)
+            ),
             inputs=rep_appt,
-            outputs=[appt_sum, appt_tbl]
+            outputs=[appt_sum, appt_det]
         )
 
         gr.Markdown("### 🔍 Search Appointments by Specific Date")
-        y2,m2,d2 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        rep2     = gr.Dropdown(choices=rep_options("Appointments","Rep"), label="Optional Rep Filter", allow_custom_value=True)
+        y2 = gr.Textbox(label="Year")
+        m2 = gr.Textbox(label="Month")
+        d2 = gr.Textbox(label="Day")
+        rep2 = gr.Dropdown(choices=rep_options("Appointments","Rep"),
+                           label="Optional Rep Filter",
+                           allow_custom_value=True)
         appt_date_btn = gr.Button("Search Appointments by Date")
-        appt_date_sum = gr.Dataframe(label="📊 Appointments Summary for Date by Rep")
-        appt_date_tbl = gr.Dataframe()
+
+        with gr.Row():
+            with gr.Column():
+                appt_date_sum = gr.Dataframe(label="📊 Appts by Rep on Date")
+            with gr.Column():
+                appt_date_det = gr.Dataframe(label="🔎 Detailed Appts on Date")
+
         appt_date_btn.click(
             fn=lambda y,m,d,r: (
-                search_appointments_by_date(y,m,d,r).groupby("Rep").size().reset_index(name="Count"),
+                search_appointments_by_date(y,m,d,r)
+                  .groupby("Rep")
+                  .size()
+                  .reset_index(name="Count"),
                 search_appointments_by_date(y,m,d,r)
             ),
             inputs=[y2,m2,d2,rep2],
-            outputs=[appt_date_sum, appt_date_tbl]
+            outputs=[appt_date_sum, appt_date_det]
         )
 
-    # -- Appointed Leads Tab --
+    # -- Appointed Leads --
     with gr.Tab("Appointed Leads"):
-        leads_btn    = gr.Button("View Appointed Leads")
-        leads_sum    = gr.Dataframe(label="📊 Leads Count by Rep")
-        leads_detail = gr.Dataframe(label="🔎 Detailed Leads")
-        leads_btn.click(fn=lambda: (get_leads_summary(), get_leads_detail()), outputs=[leads_sum, leads_detail])
+        leads_btn = gr.Button("View Appointed Leads")
+
+        with gr.Row():
+            with gr.Column():
+                leads_sum    = gr.Dataframe(label="📊 Leads Count by Rep")
+            with gr.Column():
+                leads_det    = gr.Dataframe(label="🔎 Detailed Leads")
+
+        leads_btn.click(
+            fn=lambda: (get_leads_summary(), get_leads_detail()),
+            outputs=[leads_sum, leads_det]
+        )
 
-    # -- Insights Tab --
+    # -- Insights --
     with gr.Tab("Insights"):
         insights_btn = gr.Button("Generate Insights")
         insights_tbl = gr.Dataframe()
         insights_btn.click(fn=compute_insights, outputs=insights_tbl)
 
-    # -- User Management Tab --
+    # -- User Management --
     with gr.Tab("User Management"):
-        gr.Markdown("### 🙍 Manage Users\nEdit the grid and click **Save Users** to push changes.")
+        gr.Markdown("### 🙍 Manage Users  \nEdit the grid and click **Save Users**.")
         users_tbl = gr.Dataframe(value=load_users(), interactive=True)
         save_btn  = gr.Button("Save Users")
         save_msg  = gr.Textbox(interactive=False)