Update app.py

app.py

@@ -26,82 +26,80 @@ def get_current_week_range():
     end = start + timedelta(days=6)
     return start.date(), end.date()
 
-def filter_current_week(df, date_column):
-    df[date_column] = pd.to_datetime(df[date_column], errors='coerce').dt.date
-    start_date, end_date = get_current_week_range()
-    return df[(df[date_column] >= start_date) & (df[date_column] <= end_date)]
-
 def compose_date(year, month, day):
     try:
         return str(datetime(int(year), int(month), int(day)).date())
     except:
         return None
 
-# -------------------- FUNCTIONS --------------------
+# -------------------- REPORT FUNCTIONS --------------------
 def current_week_calls():
     df = load_sheet("Calls")
-    if "Date" not in df.columns:
-        return pd.DataFrame([{"Error": "Missing 'Date' column"}])
-    return filter_current_week(df, "Date")
-
-def current_week_appointments():
-    df = load_sheet("Appointments")
-    if "Date" not in df.columns:
-        return pd.DataFrame([{"Error": "Missing 'Date' column"}])
-    return filter_current_week(df, "Date")
-
-def appointed_leads():
-    df = load_sheet("Appointed Leads")
-    if "Rep" not in df.columns or "Customer Name" not in df.columns:
-        return pd.DataFrame([{"Error": "Missing 'Rep' or 'Customer Name' column"}])
-    grouped = df.groupby("Rep")["Customer Name"].apply(list).reset_index()
-    return grouped
+    if "Call Date" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Call Date' column"}])
+    df["Call Date"] = pd.to_datetime(df["Call Date"], errors='coerce').dt.date
+    start, end = get_current_week_range()
+    return df[(df["Call Date"] >= start) & (df["Call Date"] <= end)]
 
 def custom_date_calls(y, m, d):
     date_str = compose_date(y, m, d)
     if not date_str:
         return pd.DataFrame([{"Error": "Invalid date input"}])
     df = load_sheet("Calls")
-    df['Date'] = pd.to_datetime(df['Date'], errors='coerce').dt.date.astype(str)
-    return df[df['Date'] == date_str]
+    df["Call Date"] = pd.to_datetime(df["Call Date"], errors='coerce').dt.date.astype(str)
+    return df[df["Call Date"] == date_str]
+
+def current_week_appointments():
+    df = load_sheet("Appointments")
+    if "Appointment Date" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Appointment Date' column"}])
+    df["Appointment Date"] = pd.to_datetime(df["Appointment Date"], errors='coerce').dt.date
+    start, end = get_current_week_range()
+    return df[(df["Appointment Date"] >= start) & (df["Appointment Date"] <= end)]
 
 def custom_date_appointments(y, m, d):
     date_str = compose_date(y, m, d)
     if not date_str:
         return pd.DataFrame([{"Error": "Invalid date input"}])
     df = load_sheet("Appointments")
-    df['Date'] = pd.to_datetime(df['Date'], errors='coerce').dt.date.astype(str)
-    return df[df['Date'] == date_str]
+    df["Appointment Date"] = pd.to_datetime(df["Appointment Date"], errors='coerce').dt.date.astype(str)
+    return df[df["Appointment Date"] == date_str]
+
+def appointed_leads():
+    df = load_sheet("AllocatedLeads")
+    if "Rep" not in df.columns or "Company Name" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Rep' or 'Company Name' column"}])
+    return df.groupby("Rep")["Company Name"].apply(list).reset_index()
 
 # -------------------- 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"):
+    with gr.Tab("📞 Calls Report"):
         calls_btn = gr.Button("Load Current Week Calls")
         calls_table = gr.Dataframe()
         calls_btn.click(fn=current_week_calls, outputs=calls_table)
 
-        gr.Markdown("### 🔎 Check by Specific Date (YYYY-MM-DD via dropdowns)")
-        y, m, d = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        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], outputs=date_calls_table)
+        gr.Markdown("### 🔎 Search Calls by Specific Date")
+        cy, cm, cd = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
+        custom_calls_btn = gr.Button("Search Calls by Date")
+        custom_calls_table = gr.Dataframe()
+        custom_calls_btn.click(fn=custom_date_calls, inputs=[cy, cm, cd], outputs=custom_calls_table)
 
-    with gr.Tab("Appointments Report"):
+    with gr.Tab("📅 Appointments Report"):
         appt_btn = gr.Button("Load Current Week Appointments")
         appt_table = gr.Dataframe()
         appt_btn.click(fn=current_week_appointments, outputs=appt_table)
 
-        gr.Markdown("### 🔎 Check by Specific Date")
+        gr.Markdown("### 🔎 Search Appointments by Specific Date")
         ay, am, ad = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        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], outputs=date_appt_table)
+        custom_appt_btn = gr.Button("Search Appointments by Date")
+        custom_appt_table = gr.Dataframe()
+        custom_appt_btn.click(fn=custom_date_appointments, inputs=[ay, am, ad], outputs=custom_appt_table)
 
-    with gr.Tab("Appointed Leads"):
+    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)
 
-app.launch(share=True)
+app.launch()