Update app.py

app.py

@@ -10,206 +10,200 @@ scope = [
     "https://www.googleapis.com/auth/drive"
 ]
 creds = ServiceAccountCredentials.from_json_keyfile_name(
-    "deep-mile-461309-t8-0e90103411e0.json",
-    scope
+    "deep-mile-461309-t8-0e90103411e0.json", scope
 )
 client = gspread.authorize(creds)
-sheet_url = "https://docs.google.com/spreadsheets/d/1if4KoVQvw5ZbhknfdZbzMkcTiPfsD6bz9V3a1th-bwQ"
+sheet_url = (
+    "https://docs.google.com/spreadsheets/d/1if4KoVQvw5ZbhknfdZbzMkcTiPfsD6bz9V3a1th-bwQ"
+)
 
 # -------------------- UTILS --------------------
-def normalize_columns(df):
+def normalize_columns(df: pd.DataFrame) -> pd.DataFrame:
     df.columns = df.columns.str.strip().str.title()
     return df
 
-def load_sheet(name):
+# Replace get_all_records() to avoid duplicate-header errors
+def load_sheet(sheet_name: str) -> pd.DataFrame:
     try:
-        ws = client.open_by_url(sheet_url).worksheet(name)
-        df = pd.DataFrame(ws.get_all_records())
-        return normalize_columns(df)
+        ws = client.open_by_url(sheet_url).worksheet(sheet_name)
+        all_values = ws.get_all_values()
+        if not all_values:
+            return pd.DataFrame()
+        headers = [h.strip().title() for h in all_values[0]]
+        data = all_values[1:]
+        return pd.DataFrame(data, columns=headers)
     except Exception as e:
         return pd.DataFrame([{"Error": str(e)}])
 
+# date utilities
 def get_current_week_range():
     today = datetime.now()
     start = today - timedelta(days=today.weekday())
     end = start + timedelta(days=6)
     return start.date(), end.date()
 
-def filter_week(df, date_col, rep_col=None, rep=None):
-    df[date_col] = pd.to_datetime(df[date_col], errors="coerce").dt.date
-    s, e = get_current_week_range()
-    out = df[(df[date_col] >= s) & (df[date_col] <= e)]
-    if rep:
+def filter_week(df: pd.DataFrame, date_col: str, rep_col: str = None, rep=None):
+    if date_col not in df.columns:
+        return df
+    df[date_col] = pd.to_datetime(df[date_col], errors='coerce').dt.date
+    start, end = get_current_week_range()
+    out = df[(df[date_col] >= start) & (df[date_col] <= end)]
+    if rep and rep_col in df.columns:
         out = out[out[rep_col] == rep]
     return out
 
-def filter_date(df, date_col, rep_col, y, m, d, rep):
+def filter_date(df: pd.DataFrame, date_col: str, rep_col: str, y, m, d, rep):
     try:
         target = datetime(int(y), int(m), int(d)).date()
     except:
         return pd.DataFrame([{"Error": "Invalid date input"}])
-    df[date_col] = pd.to_datetime(df[date_col], errors="coerce").dt.date
+    if date_col not in df.columns:
+        return pd.DataFrame([{"Error": f"Missing '{date_col}' column"}])
+    df[date_col] = pd.to_datetime(df[date_col], errors='coerce').dt.date
     out = df[df[date_col] == target]
-    if rep:
+    if rep and rep_col in df.columns:
         out = out[out[rep_col] == rep]
     return out
 
 # -------------------- REPORT FUNCTIONS --------------------
 def get_calls(rep=None):
     df = load_sheet("Calls")
-    if "Call Date" not in df:
-        return pd.DataFrame([{"Error": "Missing 'Call Date' column"}])
     return filter_week(df, "Call Date", "Rep", rep)
 
-def search_calls_by_date(y, m, d, rep):
+def get_appointments(rep=None):
+    df = load_sheet("Appointments")
+    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:
-        return pd.DataFrame([{"Error": "Missing 'Call Date' column"}])
-    return filter_date(df, "Call Date", "Rep", y, m, d, rep)
+    return filter_date(df, "Call Date", "Rep", y,m,d,rep)
 
-# -------------------- APPOINTMENTS (UPCOMING) --------------------
-def upcoming_summary_and_detail(rep=None):
-    df = load_sheet("Appointments")
-    if "Appointment Date" not in df:
-        return pd.DataFrame([{"Error": "Missing 'Appointment Date' column"}]), pd.DataFrame()
-    df["Appointment Date"] = pd.to_datetime(df["Appointment Date"], errors="coerce").dt.date
-    today = datetime.now().date()
-    future = df[df["Appointment Date"] >= today]
-    if rep:
-        future = future[future["Rep"] == rep]
-    summary = future.groupby("Rep").size().reset_index(name="Appointment Count")
-    return summary, future
-
-def search_appointments_by_date(y, m, d, rep):
+def search_appointments_by_date(y,m,d,rep):
     df = load_sheet("Appointments")
-    if "Appointment Date" not in df:
-        return pd.DataFrame([{"Error": "Missing 'Appointment Date' column"}]), pd.DataFrame()
-    try:
-        target = datetime(int(y), int(m), int(d)).date()
-    except:
-        return pd.DataFrame([{"Error": "Invalid date input"}]), pd.DataFrame()
-    df["Appointment Date"] = pd.to_datetime(df["Appointment Date"], errors="coerce").dt.date
-    out = df[df["Appointment Date"] == target]
-    if rep:
-        out = out[out["Rep"] == rep]
-    summary = out.groupby("Rep").size().reset_index(name="Appointment Count")
-    return summary, out
-
-# -------------------- APPOINTED LEADS --------------------
+    return filter_date(df, "Appointment Date", "Rep", y,m,d,rep)
+
+# Leads
+
 def get_leads_detail():
     df = load_sheet("AllocatedLeads")
-    if "Assigned Rep" not in df or "Company Name" not in df:
-        return pd.DataFrame([{"Error": "Missing 'Assigned Rep' or 'Company Name' column"}])
     return df
 
 def get_leads_summary():
     df = get_leads_detail()
-    if "Error" in df.columns:
-        return df
+    if "Assigned Rep" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Assigned Rep'"}])
     return df.groupby("Assigned Rep").size().reset_index(name="Leads Count")
 
 # -------------------- INSIGHTS --------------------
 def compute_insights():
     calls = get_calls()
-    appt_summary, _ = upcoming_summary_and_detail()
+    appts = get_appointments()
     leads = get_leads_detail()
     def top(df, col):
-        return df[col].value_counts().idxmax() if not df.empty else "N/A"
-    return pd.DataFrame([
+        if col in df.columns and not df.empty:
+            try:
+                return df[col].mode()[0]
+            except:
+                return "N/A"
+        return "N/A"
+    insights = pd.DataFrame([
         {"Metric": "Most Calls This Week",        "Rep": top(calls, "Rep")},
-        {"Metric": "Most Upcoming Appointments",  "Rep": top(appt_summary, "Rep")},
+        {"Metric": "Most Appointments This Week", "Rep": top(appts, "Rep")},
         {"Metric": "Most Leads Allocated",        "Rep": top(leads, "Assigned Rep")},
     ])
+    return insights
 
-# -------------------- USER MANAGEMENT --------------------
-def load_users():
-    df = load_sheet("User")
-    for col in ["Name", "Email", "Company", "Target Figures"]:
-        if col not in df.columns:
-            df[col] = ""
-    return df[["Name", "Email", "Company", "Target Figures"]]
+# -------------------- 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 []
 
+# -------------------- USER MANAGEMENT --------------------
 def save_users(df):
     ws = client.open_by_url(sheet_url).worksheet("User")
+    headers = df.columns.tolist()
+    rows = df.fillna("").values.tolist()
     ws.clear()
-    rows = [df.columns.tolist()] + df.fillna("").values.tolist()
-    ws.update(rows)
-    return df
+    ws.update([headers] + rows)
+    return pd.DataFrame([{"Status": "Users saved."}])
 
-# -------------------- DROPDOWN OPTIONS --------------------
-def rep_options(sheet, col):
-    df = load_sheet(sheet)
-    return sorted(df[col].dropna().unique().tolist()) if col in df else []
-
-# -------------------- UI LAYOUT --------------------
+# -------------------- UI --------------------
 with gr.Blocks(title="Graffiti Admin Dashboard") as app:
     gr.Markdown("# 📆 Graffiti Admin Dashboard")
 
-    # Calls Report Tab
     with gr.Tab("Calls Report"):
-        rc = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Calls", "Rep"))
-        btn_calls = gr.Button("Load Current Week Calls")
-        tbl_calls = gr.Dataframe()
-        btn_calls.click(fn=get_calls, inputs=rc, outputs=tbl_calls)
+        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_tbl = gr.Dataframe()
+        calls_btn.click(fn=get_calls, inputs=rep_calls, outputs=calls_tbl)
 
         gr.Markdown("### 🔍 Search Calls by Specific Date")
-        y1, m1, d1 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        rc2 = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Calls", "Rep"))
-        btn_cd = gr.Button("Search Calls by Date")
-        tbl_cd = gr.Dataframe()
-        btn_cd.click(fn=search_calls_by_date, inputs=[y1, m1, d1, rc2], outputs=tbl_cd)
+        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_tbl = gr.Dataframe()
+        calls_date_btn.click(fn=search_calls_by_date,
+                              inputs=[y1,m1,d1,rep1],
+                              outputs=calls_date_tbl)
 
-    # Appointments Report Tab
     with gr.Tab("Appointments Report"):
-        ra = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Appointments", "Rep"))
-        btn_appt = gr.Button("Load Upcoming Appointments")
-        sum_appt = gr.Dataframe(label="📊 Upcoming Appointments Summary by Rep")
-        det_appt = gr.Dataframe(label="🔎 Detailed Upcoming Appointments")
-        btn_appt.click(fn=upcoming_summary_and_detail, inputs=ra, outputs=[sum_appt, det_appt])
+        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_summary = gr.Dataframe(label="📊 Weekly Appointments Summary by Rep")
+        appt_tbl = gr.Dataframe()
+        appt_btn.click(
+            fn=lambda rep: (
+                get_appointments(rep).groupby("Rep").size().reset_index(name="Count"),
+                get_appointments(rep)
+            ),
+            inputs=rep_appt,
+            outputs=[appt_summary, appt_tbl]
+        )
 
         gr.Markdown("### 🔍 Search Appointments by Specific Date")
-        y2, m2, d2 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        ra2 = gr.Dropdown(label="Optional Rep Filter", choices=rep_options("Appointments", "Rep"))
-        btn_ad = gr.Button("Search Appointments by Date")
-        sum_ad = gr.Dataframe(label="📊 Appointments Summary for Date by Rep")
-        det_ad = gr.Dataframe(label="🔎 Detailed Appointments for Date")
-        btn_ad.click(fn=search_appointments_by_date,
-                     inputs=[y2, m2, d2, ra2],
-                     outputs=[sum_ad, det_ad])
-
-    # Appointed Leads Tab
+        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_sum = gr.Dataframe(label="📊 Appointments Summary for Date by Rep")
+        appt_date_tbl = gr.Dataframe()
+        appt_date_btn.click(
+            fn=lambda y,m,d,rep: (
+                search_appointments_by_date(y,m,d,rep)
+                    .groupby("Rep").size().reset_index(name="Count"),
+                search_appointments_by_date(y,m,d,rep)
+            ),
+            inputs=[y2,m2,d2,rep2],
+            outputs=[appt_date_sum, appt_date_tbl]
+        )
+
     with gr.Tab("Appointed Leads"):
-        btn_leads = gr.Button("View Appointed Leads")
-        sum_leads = gr.Dataframe(label="📊 Leads Count by Rep")
-        det_leads = gr.Dataframe(label="🔎 Detailed Leads")
-        btn_leads.click(fn=lambda: (get_leads_summary(), get_leads_detail()),
-                        outputs=[sum_leads, det_leads])
+        leads_btn = gr.Button("View Appointed Leads")
+        leads_sum = gr.Dataframe(label="📊 Leads Count by Rep")
+        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
     with gr.Tab("Insights"):
-        btn_ins = gr.Button("Generate Insights")
-        tbl_ins = gr.Dataframe()
-        btn_ins.click(fn=compute_insights, outputs=tbl_ins)
+        insights_btn = gr.Button("Generate Insights")
+        insights_tbl = gr.Dataframe()
+        insights_btn.click(fn=compute_insights, outputs=insights_tbl)
 
-    # User Management Tab
     with gr.Tab("User Management"):
-        gr.Markdown("### 🧑‍💼 Manage Users\nEdit, add, or remove rows, then click **Save Users**.")
-        users_df = gr.Dataframe(
-            value=load_users(),
-            label="Users",
-            interactive=True
-        )
+        gr.Markdown("## 👤 Manage Users\nEdit the grid and click **Save Users** to push changes.")
+        users_df = load_sheet("User")
+        users_grid = gr.Dataframe(value=users_df, interactive=True)
         save_btn = gr.Button("Save Users")
-        save_status = gr.Markdown()
-
-        def on_save(df):
-            saved = save_users(pd.DataFrame(df))
-            return "✅ Users saved!", saved
-
-        save_btn.click(
-            fn=on_save,
-            inputs=users_df,
-            outputs=[save_status, users_df]
-        )
+        status = gr.Dataframe()
+        save_btn.click(fn=save_users, inputs=users_grid, outputs=status)
 
-app.launch()
+app.launch()