Update app.py

app.py

@@ -25,90 +25,96 @@ def get_current_week_range():
     end = start + timedelta(days=6)
     return start.date(), end.date()
 
-def compose_date(year, month, day):
-    try:
-        return str(datetime(int(year), int(month), int(day)).date())
-    except:
-        return None
-
-def filter_week(df, column, rep=None):
-    df[column] = pd.to_datetime(df[column], errors='coerce').dt.date
+def filter_week(df, date_column, rep_column=None, rep=None):
+    df[date_column] = pd.to_datetime(df[date_column], errors='coerce').dt.date
     start, end = get_current_week_range()
-    filtered = df[(df[column] >= start) & (df[column] <= end)]
-    if rep:
-        filtered = filtered[filtered['Rep'].fillna('').str.lower() == rep.lower()]
+    filtered = df[(df[date_column] >= start) & (df[date_column] <= end)]
+    if rep and rep.strip():
+        filtered = filtered[filtered[rep_column] == rep]
     return filtered
 
-def filter_by_date(df, column, y, m, d, rep=None):
-    date_str = compose_date(y, m, d)
-    if not date_str:
-        return pd.DataFrame([{"Error": "Invalid date"}])
-    df[column] = pd.to_datetime(df[column], errors='coerce').dt.date.astype(str)
-    result = df[df[column] == date_str]
-    if rep:
-        result = result[result['Rep'].fillna('').str.lower() == rep.lower()]
-    return result
+def filter_date(df, date_column, rep_column, y, m, d, rep):
+    try:
+        date_str = str(datetime(int(y), int(m), int(d)).date())
+    except:
+        return pd.DataFrame([{"Error": "Invalid date input"}])
+    df[date_column] = pd.to_datetime(df[date_column], errors='coerce').dt.date.astype(str)
+    filtered = df[df[date_column] == date_str]
+    if rep and rep.strip():
+        filtered = filtered[df[rep_column] == rep]
+    return filtered
 
 # -------------------- FUNCTIONS --------------------
-def current_week_calls(rep=None):
+def get_calls(rep=None):
     df = load_sheet("Calls")
     if "Call Date" not in df.columns:
         return pd.DataFrame([{"Error": "Missing 'Call Date' column"}])
-    return filter_week(df, "Call Date", rep)
+    return filter_week(df, "Call Date", "Rep", rep)
 
-def current_week_appointments(rep=None):
+def get_appointments(rep=None):
     df = load_sheet("Appointments")
     if "Appointment Date" not in df.columns:
         return pd.DataFrame([{"Error": "Missing 'Appointment Date' column"}])
-    return filter_week(df, "Appointment Date", rep)
+    return filter_week(df, "Appointment Date", "Rep", rep)
 
-def custom_date_calls(y, m, d, rep=None):
+def search_calls_by_date(y, m, d, rep):
     df = load_sheet("Calls")
-    return filter_by_date(df, "Call Date", y, m, d, rep)
+    if "Call Date" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Call Date' column"}])
+    return filter_date(df, "Call Date", "Rep", y, m, d, rep)
 
-def custom_date_appointments(y, m, d, rep=None):
+def search_appointments_by_date(y, m, d, rep):
     df = load_sheet("Appointments")
-    return filter_by_date(df, "Appointment Date", y, m, d, rep)
+    if "Appointment Date" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Appointment Date' column"}])
+    return filter_date(df, "Appointment Date", "Rep", y, m, d, rep)
 
-def appointed_leads():
+def get_leads():
     df = load_sheet("AllocatedLeads")
-    if "Assigned Rep" not in df.columns or "Company Name" not in df.columns:
+    if "Assigned Rep " not in df.columns or "Company Name" not in df.columns:
         return pd.DataFrame([{"Error": "Missing 'Assigned Rep' or 'Company Name' column"}])
-    return df.groupby("Assigned Rep")["Company Name"].apply(list).reset_index()
+    return df.groupby("Assigned Rep ")["Company Name"].apply(list).reset_index()
+
+# -------------------- DROPDOWN OPTIONS --------------------
+def rep_options(sheet_name, rep_col):
+    df = load_sheet(sheet_name)
+    if rep_col in df.columns:
+        return sorted(df[rep_col].dropna().unique().tolist())
+    return []
 
 # -------------------- UI --------------------
 with gr.Blocks(title="Graffiti Admin Dashboard") as app:
-    gr.Markdown("## 📅 Graffiti Admin Dashboard")
+    gr.Markdown("# 📆 Graffiti Admin Dashboard")
 
     with gr.Tab("Calls Report"):
-        calls_rep = gr.Textbox(label="Optional Rep Filter")
+        rep_calls = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Calls", "Rep"), allow_custom_value=True)
         calls_btn = gr.Button("Load Current Week Calls")
         calls_table = gr.Dataframe()
-        calls_btn.click(fn=current_week_calls, inputs=calls_rep, outputs=calls_table)
+        calls_btn.click(fn=get_calls, inputs=rep_calls, outputs=calls_table)
 
         gr.Markdown("### 🔍 Search Calls by Specific Date")
-        y, m, d = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        call_rep = gr.Textbox(label="Optional Rep Filter")
-        date_calls_btn = gr.Button("Search Calls by Date")
-        date_calls_table = gr.Dataframe()
-        date_calls_btn.click(fn=custom_date_calls, inputs=[y, m, d, call_rep], outputs=date_calls_table)
+        y1, m1, d1 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
+        rep1 = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Calls", "Rep"), allow_custom_value=True)
+        calls_date_btn = gr.Button("Search Calls by Date")
+        calls_date_table = gr.Dataframe()
+        calls_date_btn.click(fn=search_calls_by_date, inputs=[y1, m1, d1, rep1], outputs=calls_date_table)
 
     with gr.Tab("Appointments Report"):
-        appt_rep = gr.Textbox(label="Optional Rep Filter")
+        rep_appt = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Appointments", "Rep"), allow_custom_value=True)
         appt_btn = gr.Button("Load Current Week Appointments")
         appt_table = gr.Dataframe()
-        appt_btn.click(fn=current_week_appointments, inputs=appt_rep, outputs=appt_table)
+        appt_btn.click(fn=get_appointments, inputs=rep_appt, outputs=appt_table)
 
         gr.Markdown("### 🔍 Search Appointments by Specific Date")
-        ay, am, ad = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        appt_rep2 = gr.Textbox(label="Optional Rep Filter")
-        date_appt_btn = gr.Button("Search Appointments by Date")
-        date_appt_table = gr.Dataframe()
-        date_appt_btn.click(fn=custom_date_appointments, inputs=[ay, am, ad, appt_rep2], outputs=date_appt_table)
+        y2, m2, d2 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
+        rep2 = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Appointments", "Rep"), allow_custom_value=True)
+        appt_date_btn = gr.Button("Search Appointments by Date")
+        appt_date_table = gr.Dataframe()
+        appt_date_btn.click(fn=search_appointments_by_date, inputs=[y2, m2, d2, rep2], outputs=appt_date_table)
 
     with gr.Tab("Appointed Leads"):
         leads_btn = gr.Button("View Appointed Leads")
         leads_table = gr.Dataframe()
-        leads_btn.click(fn=appointed_leads, outputs=leads_table)
+        leads_btn.click(fn=get_leads, outputs=leads_table)
 
-app.launch(share=True)
+app.launch()