Update app.py

app.py

@@ -1,138 +1,107 @@
 # app.py
+import gradio as gr
 import pandas as pd
 import gspread
-import gradio as gr
 from oauth2client.service_account import ServiceAccountCredentials
 from datetime import datetime, timedelta
-import re
-
-# ------------------ AUTH ------------------
-VALID_USERS = {
-    "andrew@lortechnologies.com": "Pass.123",
-    "donovanm@bid4cars.co.za": "Pass.123",
-    "grant@bid4cars.co.za": "Pass.123",
-    "phonnie@c2group.co.za": "Pass.123"
-}
 
-# ------------------ GOOGLE SHEET SETUP ------------------
+# -------------------- AUTH --------------------
 scope = ["https://spreadsheets.google.com/feeds", "https://www.googleapis.com/auth/drive"]
-creds = ServiceAccountCredentials.from_json_keyfile_name("deep-mile-461309-t8-0e90103411e0.json", scope)
+creds = ServiceAccountCredentials.from_json_keyfile_name("/mnt/data/deep-mile-461309-t8-0e90103411e0.json", scope)
 client = gspread.authorize(creds)
 sheet_url = "https://docs.google.com/spreadsheets/d/1if4KoVQvw5ZbhknfdZbzMkcTiPfsD6bz9V3a1th-bwQ"
 
-# ------------------ DATA UTILS ------------------
-def clean_utf(df):
-    for col in df.select_dtypes(include="object").columns:
-        df[col] = df[col].astype(str).apply(lambda x: re.sub(r'[^\x00-\x7F]', '', x))
-    return df
-
-def prune_5_years(df, date_col="Date"):
-    df[date_col] = pd.to_datetime(df[date_col], errors='coerce')
-    cutoff = pd.Timestamp.now() - pd.DateOffset(years=5)
-    return df[df[date_col] >= cutoff]
-
-def load_sheet(name, prune=False):
+# -------------------- UTILS --------------------
+def load_sheet(sheet_name):
     try:
-        sheet = client.open_by_url(sheet_url).worksheet(name)
+        sheet = client.open_by_url(sheet_url).worksheet(sheet_name)
         df = pd.DataFrame(sheet.get_all_records())
-        df = clean_utf(df)
-        if prune:
-            df = prune_5_years(df)
         return df
     except Exception as e:
         return pd.DataFrame([{"Error": str(e)}])
 
-# ------------------ REPORT FUNCTIONS ------------------
-def get_week_range():
-    today = datetime.today()
+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_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 --------------------
 def current_week_calls():
     df = load_sheet("Calls")
-    df["Date"] = pd.to_datetime(df["Date"], errors='coerce')
-    start, end = get_week_range()
-    return df[(df["Date"] >= pd.Timestamp(start)) & (df["Date"] <= pd.Timestamp(end))]
+    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")
-    df["Date"] = pd.to_datetime(df["Date"], errors='coerce')
-    start, end = get_week_range()
-    return df[(df["Date"] >= pd.Timestamp(start)) & (df["Date"] <= pd.Timestamp(end))]
+    if "Date" not in df.columns:
+        return pd.DataFrame([{"Error": "Missing 'Date' column"}])
+    return filter_current_week(df, "Date")
 
-def get_appointed_leads():
+def appointed_leads():
     df = load_sheet("Appointed Leads")
-    if "Rep" in df.columns and "Customer Name" in df.columns:
-        return df.groupby("Rep")["Customer Name"].apply(list).reset_index(name="Leads")
-    return pd.DataFrame([{"Error": "Missing 'Rep' or 'Customer Name' column."}])
-
-def live_search(sheet_name, field, keyword):
-    df = load_sheet(sheet_name, prune=(sheet_name == "LiveQuotes"))
-    if field not in df.columns:
-        return pd.DataFrame(), "Field not found"
-    matches = df[df[field].astype(str).str.contains(keyword, case=False, na=False)]
-    return matches, f"Found {len(matches)} results"
-
-def rep_target_comparison():
-    calls = current_week_calls()
-    users = load_sheet("Users")
-    if "Rep Name" not in users.columns:
-        return pd.DataFrame([{"Error": "Missing 'Rep Name' in Users sheet"}])
-
-    calls_grouped = calls.groupby("Rep Name").size().reset_index(name="Visits")
-    merged = pd.merge(users, calls_grouped, how="left", on="Rep Name")
-    merged["Visits"] = merged["Visits"].fillna(0).astype(int)
-    merged["Target Met"] = merged["Visits"] >= merged.get("Target", 0)
-    return merged
-
-# ------------------ GRADIO UI ------------------
-with gr.Blocks() as app:
-    with gr.Row():
-        with gr.Column(visible=True) as login_ui:
-            gr.Markdown("## 🔐 Login Required")
-            email = gr.Textbox(label="Email")
-            password = gr.Textbox(label="Password", type="password")
-            login_btn = gr.Button("Login")
-            login_msg = gr.Markdown("")
-
-        with gr.Column(visible=False) as main_ui:
-            gr.Markdown("## 📊 Graffiti Admin Dashboard")
-
-            with gr.Tab("Calls Report"):
-                btn_calls = gr.Button("Load Current Week Calls")
-                calls_output = gr.Dataframe()
-                btn_calls.click(fn=current_week_calls, outputs=calls_output)
-
-            with gr.Tab("Appointments Report"):
-                btn_appt = gr.Button("Load Current Week Appointments")
-                appt_output = gr.Dataframe()
-                btn_appt.click(fn=current_week_appointments, outputs=appt_output)
-
-            with gr.Tab("Appointed Leads"):
-                btn_leads = gr.Button("View Appointed Leads")
-                leads_output = gr.Dataframe()
-                btn_leads.click(fn=get_appointed_leads, outputs=leads_output)
-
-            with gr.Tab("Query Live Sheets"):
-                dropdown = gr.Dropdown(choices=["LiveQuotes", "LiveCustomer", "LiveJobBags"], label="Select Sheet")
-                field = gr.Textbox(label="Field (column name)")
-                keyword = gr.Textbox(label="Keyword to search")
-                search_btn = gr.Button("Search")
-                query_table = gr.Dataframe()
-                status = gr.Markdown()
-                search_btn.click(fn=live_search, inputs=[dropdown, field, keyword], outputs=[query_table, status])
-
-            with gr.Tab("Weekly Rep Performance"):
-                btn_perf = gr.Button("Compare Rep Activity vs Target")
-                perf_output = gr.Dataframe()
-                btn_perf.click(fn=rep_target_comparison, outputs=perf_output)
-
-    def do_login(user, pw):
-        if VALID_USERS.get(user) == pw:
-            return gr.update(visible=False), gr.update(visible=True), ""
-        return gr.update(visible=True), gr.update(visible=False), "❌ Invalid login"
-
-    login_btn.click(fn=do_login, inputs=[email, password], outputs=[login_ui, main_ui, login_msg])
-
-app.launch()
+    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
+
+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]
+
+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]
+
+# -------------------- UI --------------------
+with gr.Blocks(title="Graffiti Admin Dashboard") as app:
+    gr.Markdown("## 📅 Graffiti Admin Dashboard")
+
+    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)
+
+    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")
+        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)
+
+    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)