Fix parser to handle DAILY sheet structure with activity rows

app.py

@@ -47,69 +47,117 @@ def get_sheets_service():
 
 def parse_sheet_data(values):
     """
-    Parse the raw sheet data into the format expected by the dashboard.
-    Adjust this function based on your actual sheet structure.
+    Parse the DAILY sheet data into the format expected by the dashboard.
+
+    DAILY sheet structure:
+    - Column A: Case name (may be empty for continuation rows)
+    - Column B: GS/SDR name (may be empty for continuation rows)
+    - Column C: Activity type (Calls, Emails, LinkedIn, Prospects, Discovery, SQL)
+    - Columns D-H: Week 2 daily data (M, T, W, T, F)
+    - Column I: Week 2 total
+    - Column J: Week 2 percentage
+    - Columns K-O: Week 3 daily data
+    - Column P: Week 3 total
+    - Column Q: Week 3 percentage
+    - And so on for Week 4, Week 5...
     """
-    if not values or len(values) < 2:
+    if not values or len(values) < 5:
         return []
 
-    # First row is headers
-    headers = values[0]
-    cases = []
+    # Find week columns by looking at header rows
+    # Row 1 has week labels, Row 4 has day labels (M, T, W, T, F)
+    # Data starts from row 5
 
-    # Map column indices (adjust based on your sheet structure)
-    # Expected columns: Case, GS, Week2_SQL, Week2_SQLTarget, Week2_Calls, Week2_CallsTarget, etc.
-    col_map = {}
-    for i, h in enumerate(headers):
-        col_map[h.lower().strip()] = i
+    # Build a map of case+gs -> activity data
+    case_data = {}
+    current_case = None
+    current_gs = None
 
-    for row_idx, row in enumerate(values[1:], start=2):
-        if not row or len(row) < 2:
+    for row_idx, row in enumerate(values):
+        if row_idx < 4:  # Skip header rows
+            continue
+        if not row or len(row) < 3:
             continue
 
-        try:
-            # Get basic info
-            case_name = row[col_map.get("case", 0)] if col_map.get("case", 0) < len(row) else ""
-            gs_name = row[col_map.get("gs", 1)] if col_map.get("gs", 1) < len(row) else ""
-
-            if not case_name or not gs_name:
-                continue
-
-            # Build weeks data
-            weeks = {}
-            for week_num in [2, 3, 4, 5]:
-                week_key = f"w{week_num}"
-                weeks[week_num] = {
-                    "sql": safe_int(row, col_map.get(f"{week_key}_sql")),
-                    "sqlTarget": safe_int(row, col_map.get(f"{week_key}_sqltarget")),
-                    "calls": safe_int(row, col_map.get(f"{week_key}_calls")),
-                    "callsTarget": safe_int(row, col_map.get(f"{week_key}_callstarget")),
-                    "emails": safe_int(row, col_map.get(f"{week_key}_emails")),
-                    "emailsTarget": safe_int(row, col_map.get(f"{week_key}_emailstarget")),
-                    "linkedin": safe_int(row, col_map.get(f"{week_key}_linkedin")),
-                    "linkedinTarget": safe_int(row, col_map.get(f"{week_key}_linkedintarget")),
-                }
-
-            # Monthly totals
-            monthly_total = {
-                "sql": safe_int(row, col_map.get("monthly_sql")),
-                "sqlTarget": safe_int(row, col_map.get("monthly_sqltarget")),
-                "activity": safe_int(row, col_map.get("monthly_activity")),
-                "activityTarget": safe_int(row, col_map.get("monthly_activitytarget")),
-            }
+        # Column A: Case, Column B: GS, Column C: Activity
+        case_name = row[0].strip() if len(row) > 0 and row[0] else None
+        gs_name = row[1].strip() if len(row) > 1 and row[1] else None
+        activity = row[2].strip() if len(row) > 2 and row[2] else None
 
-            cases.append({
-                "id": row_idx,
-                "case": case_name,
-                "gs": gs_name,
-                "weeks": weeks,
-                "monthlyTotal": monthly_total
-            })
+        # Update current case/gs if provided
+        if case_name:
+            current_case = case_name
+        if gs_name:
+            current_gs = gs_name
 
-        except Exception as e:
-            print(f"Error parsing row {row_idx}: {e}")
+        if not current_case or not current_gs or not activity:
             continue
 
+        # Create key for this case+gs combination
+        key = f"{current_case}|{current_gs}"
+
+        if key not in case_data:
+            case_data[key] = {
+                "case": current_case,
+                "gs": current_gs,
+                "weeks": {2: {}, 3: {}, 4: {}, 5: {}},
+                "monthlyTotal": {"sql": 0, "sqlTarget": 0, "activity": 0, "activityTarget": 0}
+            }
+
+        # Map activity types to our data structure
+        activity_lower = activity.lower()
+        activity_map = {
+            "calls": "calls",
+            "emails": "emails",
+            "linkedin": "linkedin",
+            "prospects": "prospects",
+            "prospects (activated)": "prospects",
+            "discovery": "discovery",
+            "sql": "sql"
+        }
+
+        activity_key = activity_map.get(activity_lower)
+        if not activity_key:
+            continue
+
+        # Week column positions (0-indexed):
+        # Week 2: D-H (3-7) daily, I (8) total
+        # Week 3: K-O (10-14) daily, P (15) total
+        # Week 4: R-V (17-21) daily, W (22) total
+        # Week 5: Y-AC (24-28) daily, AD (29) total
+        week_configs = [
+            (2, 8),   # Week 2 total in column I (index 8)
+            (3, 15),  # Week 3 total in column P (index 15)
+            (4, 22),  # Week 4 total in column W (index 22)
+            (5, 29),  # Week 5 total in column AD (index 29)
+        ]
+
+        for week_num, total_col in week_configs:
+            total_val = safe_int(row, total_col)
+            if week_num not in case_data[key]["weeks"]:
+                case_data[key]["weeks"][week_num] = {}
+            case_data[key]["weeks"][week_num][activity_key] = total_val
+            case_data[key]["weeks"][week_num][f"{activity_key}Target"] = 0  # Targets not in this sheet
+
+        # Add to monthly total
+        if activity_key == "sql":
+            for week_num, total_col in week_configs:
+                case_data[key]["monthlyTotal"]["sql"] += safe_int(row, total_col)
+        elif activity_key in ["calls", "emails", "linkedin", "prospects"]:
+            for week_num, total_col in week_configs:
+                case_data[key]["monthlyTotal"]["activity"] += safe_int(row, total_col)
+
+    # Convert to list format
+    cases = []
+    for idx, (key, data) in enumerate(case_data.items()):
+        cases.append({
+            "id": idx + 1,
+            "case": data["case"],
+            "gs": data["gs"],
+            "weeks": data["weeks"],
+            "monthlyTotal": data["monthlyTotal"]
+        })
+
     return cases