Update app.py

app.py

@@ -18,7 +18,7 @@ client = gspread.authorize(creds)
 
 SHEET_URL = "https://docs.google.com/spreadsheets/d/1if4KoVQvw5ZbhknfdZbzMkcTiPfsD6bz9V3a1th-bwQ"
 
-# -------------------- Self Sourced Leads --------------------
+# -------------------- SELF SOURCED LEADS CONFIG --------------------
 SHEET_MAP = {
     "Alice": "https://docs.google.com/spreadsheets/d/18qFpkbE2CwVOgiB6Xz4m2Ep7ZA29p5xV",
     "Bob": "https://docs.google.com/spreadsheets/d/1EKngyAvq_3hzQMAOVame2nO9LKPJEV0d",
@@ -26,13 +26,11 @@ SHEET_MAP = {
     "Dave": "https://docs.google.com/spreadsheets/d/1m5e6YXxjK62vtBxYGkJSyHpHT7lnirg6"
 }
 
-def load_leads_data(rep_name):
+def load_self_sourced_leads(rep_name):
     if rep_name not in SHEET_MAP:
         return pd.DataFrame([{"Error": f"No sheet available for '{rep_name}'"}])
-
-    sheet_url = SHEET_MAP[rep_name]
     try:
-        sheet = client.open_by_url(sheet_url)
+        sheet = client.open_by_url(SHEET_MAP[rep_name])
         worksheet = sheet.get_worksheet(0)
         data = worksheet.get_all_values()
         if not data:
@@ -55,10 +53,7 @@ def load_sheet_df(name):
     header = []
     for col in raw_header:
         counts[col] += 1
-        if counts[col] > 1:
-            header.append(f"{col}_{counts[col]}")
-        else:
-            header.append(col)
+        header.append(f"{col}_{counts[col]}" if counts[col] > 1 else col)
     header = normalize_columns(header)
     return pd.DataFrame(rows, columns=header)
 
@@ -116,8 +111,7 @@ def search_appointments(y, m, d, rep=None):
 
 # -------------------- LEADS --------------------
 def get_leads_detail():
-    df = load_sheet_df("AllocatedLeads")
-    return df
+    return load_sheet_df("AllocatedLeads")
 
 def get_leads_summary():
     df = get_leads_detail()
@@ -137,12 +131,11 @@ def compute_insights():
             return vc.idxmax() if not vc.empty else "N/A"
         return "N/A"
 
-    data = [
+    return pd.DataFrame([
         {"Metric": "Most Calls This Week",        "Rep": top(calls, "Rep")},
         {"Metric": "Most Appointments This Week", "Rep": top(appts, "Rep")},
         {"Metric": "Most Leads Allocated",        "Rep": top(leads, "Assigned Rep")},
-    ]
-    return pd.DataFrame(data)
+    ])
 
 # -------------------- USER MANAGEMENT --------------------
 def load_users():
@@ -166,221 +159,43 @@ def save_users(df):
     set_with_dataframe(ws, df)
     return "✅ Users saved!"
 
-# -------------------- QUOTES TAB UTILS --------------------
-def get_quotes_df():
-    df = load_sheet_df("LiveQuotes")
-    df.columns = [c.strip() for c in df.columns]
-    return df
-
-def rep_choices_quotes():
-    df = get_quotes_df()
-    return sorted(df["Rep"].dropna().unique().tolist()) if "Rep" in df else []
-
-def quote_year_choices():
-    df = get_quotes_df()
-    if "Year" in df.columns:
-        years = sorted(df["Year"].dropna().unique().astype(str))
-        return years
-    if "Date" in df.columns:
-        years = pd.to_datetime(df["Date"], errors="coerce").dt.year.dropna().unique()
-        return sorted(years.astype(str))
-    return []
-
-def quote_month_choices(year=None):
-    """
-    Returns a sorted list of valid month strings for a given year, always at least [''].
-    Also prints debug output to help troubleshoot.
-    """
-    df = get_quotes_df()
-    if (
-        year
-        and "Year" in df.columns
-        and "Month" in df.columns
-        and not df.empty
-    ):
-        subset = df[df["Year"].astype(str) == str(year)]
-        if subset.empty:
-            print(f"[DEBUG] No quotes found for year {year}. Returning [''].")
-            return [""]
-        try:
-            months = pd.to_numeric(subset["Month"], errors="coerce").dropna().astype(int)
-            months = [str(m) for m in months if 1 <= m <= 12]
-            months = sorted(set(months))
-            result = [""] + months if months else [""]
-            print(f"[DEBUG] Year {year}: Months dropdown = {result}")
-            return result
-        except Exception as e:
-            print(f"[DEBUG] Exception in quote_month_choices for year {year}: {e}")
-            return [""]
-    print(f"[DEBUG] No valid year or columns missing. Returning [''].")
-    return [""]
-
-def quotes_summary(year=None, month=None):
-    df = get_quotes_df()
-    if "Rep" not in df.columns or "Total" not in df.columns:
-        return pd.DataFrame([{"Error": "Missing Rep or Total column"}])
-    if year and "Year" in df.columns:
-        df = df[df["Year"].astype(str) == str(year)]
-        if month and "Month" in df.columns:
-            df = df[df["Month"].astype(str) == str(month)]
-    df["Total"] = pd.to_numeric(df["Total"].astype(str).str.replace(",", ""), errors="coerce")
-    summary = (
-        df.groupby("Rep")
-        .agg({"Document No.": "count", "Total": "sum"})
-        .rename(columns={"Document No.": "Total Quotes", "Total": "Total Value"})
-        .reset_index()
-    )
-    summary["Total Value"] = summary["Total Value"].fillna(0).round(2)
-    return summary
-
-def get_rep_quotes_filtered(rep, year=None, month=None):
-    df = get_quotes_df()
-    if "Rep" not in df.columns:
-        return pd.DataFrame([{"Error": "Missing Rep column"}])
-    df = df[df["Rep"] == rep]
-    if year and "Year" in df.columns:
-        df = df[df["Year"].astype(str) == str(year)]
-        if month and "Month" in df.columns:
-            df = df[df["Month"].astype(str) == str(month)]
-    return df
-
-def update_month_choices_summary(year):
-    months = quote_month_choices(year)
-    print(f"[DEBUG] update_month_choices_summary({year}) -> {months}")
-    return gr.Dropdown.update(choices=months, value="")
-
-def update_month_choices(year):
-    months = quote_month_choices(year)
-    print(f"[DEBUG] update_month_choices({year}) -> {months}")
-    return gr.Dropdown.update(choices=months, value="")
-
-# -------------------- UI LAYOUT --------------------
+# -------------------- GRADIO APP --------------------
 with gr.Blocks(title="Graffiti Admin Dashboard") as app:
-    gr.Markdown("# 📆 Graffiti Admin Dashboard")
+    gr.Markdown("# 📊 Graffiti Admin Dashboard")
 
-    # -- Calls Tab --
     with gr.Tab("Calls Report"):
-        rep_c = gr.Dropdown(choices=rep_choices("Calls"), label="Filter by Rep", allow_custom_value=True)
-        btn_c = gr.Button("Load This Week’s Calls")
-        tbl_c = gr.Dataframe()
-        btn_c.click(get_calls, rep_c, tbl_c)
+        rep = gr.Dropdown(choices=rep_choices("Calls"), label="Rep")
+        btn = gr.Button("Load This Week")
+        out = gr.Dataframe()
+        btn.click(get_calls, rep, out)
 
-        gr.Markdown("### Search Calls by Date")
-        y1, m1, d1 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        rep_c2 = gr.Dropdown(choices=rep_choices("Calls"), label="Filter by Rep", allow_custom_value=True)
-        btn_c2 = gr.Button("Search")
-        tbl_c2 = gr.Dataframe()
-        btn_c2.click(search_calls, [y1, m1, d1, rep_c2], tbl_c2)
-
-    # -- Appointments Tab --
     with gr.Tab("Appointments Report"):
-        rep_a = gr.Dropdown(choices=rep_choices("Appointments"), label="Filter by Rep", allow_custom_value=True)
-        btn_a = gr.Button("Load This Week’s Appts")
-        sum_a = gr.Dataframe(label="📊 Appts by Rep")
-        tbl_a = gr.Dataframe()
-        def _load_appts(r):
-            df = get_appointments(r)
-            return df.groupby("Rep").size().reset_index(name="Count"), df
-        btn_a.click(_load_appts, rep_a, [sum_a, tbl_a])
-
-        gr.Markdown("### Search Appts by Date")
-        y2, m2, d2 = gr.Textbox(label="Year"), gr.Textbox(label="Month"), gr.Textbox(label="Day")
-        rep_a2 = gr.Dropdown(choices=rep_choices("Appointments"), label="Filter by Rep", allow_custom_value=True)
-        btn_a2 = gr.Button("Search")
-        sum_a2 = gr.Dataframe(label="📊 Appts by Rep")
-        tbl_a2 = gr.Dataframe()
-        def _search_appts(y,m,d,r):
-            df = search_appointments(y,m,d,r)
-            return df.groupby("Rep").size().reset_index(name="Count"), df
-        btn_a2.click(_search_appts, [y2,m2,d2,rep_a2], [sum_a2, tbl_a2])
+        rep2 = gr.Dropdown(choices=rep_choices("Appointments"), label="Rep")
+        btn2 = gr.Button("Load This Week")
+        out2 = gr.Dataframe()
+        btn2.click(get_appointments, rep2, out2)
 
-    # -- Appointed Leads --
     with gr.Tab("Allocated Leads"):
-        btn_l = gr.Button("View Leads")
-        sum_l = gr.Dataframe(label="📊 Leads by Rep")
-        det_l = gr.Dataframe(label="🔎 Details")
-        btn_l.click(lambda: (get_leads_summary(), get_leads_detail()), None, [sum_l, det_l])
-
-    # -- Quotes Tab (NEW) --
-    with gr.Tab("Quotes"):
-        gr.Markdown("### 📈 Quotes Summary by Rep")
-        year_qs = gr.Dropdown(choices=[""] + quote_year_choices(), label="Year (optional)", value="")
-        month_qs = gr.Dropdown(choices=[""], label="Month (optional, needs year)", value="")
-        btn_qs = gr.Button("Show Quotes Summary")
-        sum_qs = gr.Dataframe(label="Summary by Rep")
-
-        # Dynamic month options for summary
-        year_qs.change(update_month_choices_summary, year_qs, month_qs)
-
-        def quotes_summary_wrapper(year, month):
-            return quotes_summary(year if year else None, month if month else None)
-        btn_qs.click(quotes_summary_wrapper, [year_qs, month_qs], sum_qs)
+        btn3 = gr.Button("Show Leads")
+        summary = gr.Dataframe()
+        details = gr.Dataframe()
+        btn3.click(lambda: (get_leads_summary(), get_leads_detail()), None, [summary, details])
 
-        gr.Markdown("### 🔎 View All Quotes for a Rep, Year, and Month")
-        rep_q = gr.Dropdown(choices=rep_choices_quotes(), label="Select Rep")
-        year_q = gr.Dropdown(choices=[""] + quote_year_choices(), label="Year (optional)", value="")
-        month_q = gr.Dropdown(choices=[""], label="Month (optional, needs year)", value="")
-        btn_qr = gr.Button("Show Quotes")
-        tbl_qr = gr.Dataframe(label="Quotes for Selection")
-
-        # Dynamic month options for rep quotes
-        year_q.change(update_month_choices, year_q, month_q)
-
-        def get_rep_quotes_filtered_wrapper(rep, year, month):
-            return get_rep_quotes_filtered(rep, year if year else None, month if month else None)
-        btn_qr.click(get_rep_quotes_filtered_wrapper, [rep_q, year_q, month_q], tbl_qr)
-
-    # -- Insights --
     with gr.Tab("Insights"):
-        btn_i = gr.Button("Generate Insights")
-        out_i = gr.Dataframe()
-        btn_i.click(compute_insights, None, out_i)
+        btn4 = gr.Button("Generate Insights")
+        out4 = gr.Dataframe()
+        btn4.click(compute_insights, None, out4)
 
-    # -- User Management --
     with gr.Tab("User Management"):
-        gr.Markdown("## 👤 Manage Users\nEdit the grid below then click **Save Users** to push back to the sheet.")
         users_tbl = gr.Dataframe(value=load_users(), interactive=True)
         save_btn = gr.Button("Save Users")
-        save_out = gr.Textbox()
-        save_btn.click(save_users, users_tbl, save_out)
-        # -------------------- Self Sourced Leads --------------------
-        SHEET_MAP = {
-        "Alice": "https://docs.google.com/spreadsheets/d/18qFpkbE2CwVOgiB6Xz4m2Ep7ZA29p5xV",
-        "Bob": "https://docs.google.com/spreadsheets/d/1EKngyAvq_3hzQMAOVame2nO9LKPJEV0d",
-        "Charlie": "https://docs.google.com/spreadsheets/d/164OTu1keBC12-5XFUDXMmLOPMkdAjBOM",
-        "Dave": "https://docs.google.com/spreadsheets/d/1m5e6YXxjK62vtBxYGkJSyHpHT7lnirg6"
-        }
-
-        def load_leads_data(rep_name):
-            if rep_name not in SHEET_MAP:
-                return pd.DataFrame([{"Error": f"No sheet available for '{rep_name}'"}])
-        
-            sheet_url = SHEET_MAP[rep_name]
-            try:
-                sheet = client.open_by_url(sheet_url)
-                worksheet = sheet.get_worksheet(0)
-                data = worksheet.get_all_values()
-                if not data:
-                    return pd.DataFrame([{"Info": "No data available"}])
-                return pd.DataFrame(data[1:], columns=data[0])
-            except Exception as e:
-                return pd.DataFrame([{"Error": str(e)}])
-            # -- Self Sourced Leads Tab (New) --
-            with gr.Tab("Self Sourced Leads"):
-                gr.Markdown("## 🔍 Self Sourced Leads by Rep")
-        
-                rep_leads = gr.Dropdown(
-                    label="Select Rep",
-                    choices=list(SHEET_MAP.keys()),
-                    allow_custom_value=True
-                )
-                btn_load_leads = gr.Button("Load Leads")
-                tbl_leads = gr.Dataframe(label="Leads Data")
-        
-                btn_load_leads.click(load_leads_data, rep_leads, tbl_leads)
-        
-        app.launch()
+        save_msg = gr.Textbox()
+        save_btn.click(save_users, users_tbl, save_msg)
 
-    
-    app.launch()
+    with gr.Tab("Self Sourced Leads"):
+        rep_s = gr.Dropdown(choices=list(SHEET_MAP.keys()), label="Rep")
+        btn_s = gr.Button("Load Leads")
+        tbl_s = gr.Dataframe()
+        btn_s.click(load_self_sourced_leads, rep_s, tbl_s)
 
+app.launch()