fixed issues in activity details sheet

app.py

@@ -390,171 +390,104 @@ def load_reward_points_data():
         print(f"❌ Error loading Reward Points data: {str(e)}")
         return None
 
+# Function to get activity details from cached data in breakdown format
+
 # Function to get activity details from cached data in breakdown format
 def get_activity_details(roll_no, reward_points_df):
-    """Get activity details for a specific roll number from cached reward points data in breakdown format"""
+    """Get activity details for a specific roll number from cached reward points data."""
     try:
         if reward_points_df is None or reward_points_df.empty:
             return ""
-        
-        # Normalize roll number for search
+
         roll_no_search = roll_no.strip().upper()
-        
-        # Try to find the roll number column
+
+        # -----------------------------
+        # FIXED ROLL NUMBER DETECTION
+        # -----------------------------
         roll_col = None
+
+        # 1️⃣ Try header match
         for col in reward_points_df.columns:
-            if 'roll' in col.lower() and 'no' in col.lower():
+            cl = col.lower().replace(" ", "")
+            if "roll" in cl or "reg" in cl:
                 roll_col = col
                 break
-        
-        if not roll_col:
-            # Use first column as roll number column
-            roll_col = reward_points_df.columns[0]
-        
-        # Create a copy to avoid modifying the original cached data
+
+        # 2️⃣ Pattern match (fallback)
+        if roll_col is None:
+            for col in reward_points_df.columns:
+                sample = (
+                    reward_points_df[col]
+                    .astype(str)
+                    .str.upper()
+                    .head(40)
+                )
+                if sample.str.match(r"(7376|2025)[A-Z0-9]+").sum() >= 2:
+                    roll_col = col
+                    break
+
+        # 3️⃣ Ultimate fallback
+        if roll_col is None:
+            roll_col = reward_points_df.columns[len(reward_points_df.columns)//2]
+
+        # Normalize roll number column
         df = reward_points_df.copy()
-        
-        # Normalize the roll number column
         df[roll_col] = df[roll_col].astype(str).str.strip().str.upper()
-        
-        # Filter rows by roll number
+
         student_rows = df[df[roll_col] == roll_no_search]
-        
+
+        # Try partial match
         if student_rows.empty:
-            # Try partial matching
             partial_matches = df[df[roll_col].str.contains(roll_no_search, na=False)]
             if not partial_matches.empty:
                 student_rows = partial_matches
-            else:
-                return ""
-        
+
         if student_rows.empty:
-            return ""
-        
-        # Get student info from first record
-        first_record = student_rows.iloc[0]
-        student_name = first_record.get('NAME OF THE STUDENT', 'N/A')
-        student_year = first_record.get('YEAR OF STUDY', 'N/A')
-        student_dept = first_record.get('DEPARTMENT', 'N/A')
-        
-        # Calculate activity summary by type
+            return ""  # No activity rows
+
+        # Build output
+        output = []
         activity_summary = {}
         activity_count = {}
         total_points = 0
-        
+
         for _, row in student_rows.iterrows():
-            activity_type = str(row.get('Activity Type', 'N/A'))
-            reward_points = str(row.get('Reward Points', '0'))
-            
-            # Convert points to float
+            activity_type = str(row.get("Activity Type", "")).strip()
+            reward_points = str(row.get("Reward Points", "0")).replace(",", "")
+
+            # Convert points
             try:
-                points_val = float(reward_points.replace(',', '')) if reward_points else 0
-                total_points += points_val
+                points_val = float(reward_points)
             except:
                 points_val = 0
-            
-            # Track activity summary
-            if activity_type in activity_summary:
-                activity_summary[activity_type] += points_val
-                activity_count[activity_type] += 1
-            else:
-                activity_summary[activity_type] = points_val
-                activity_count[activity_type] = 1
-        
-        # Format output in breakdown style
-        output = []
-        
-        # Define all possible activity categories in order
-        activity_categories = [
-            "INITIAL POINTS / CARRY-OVER",
-            "TECHNICAL EVENTS", 
-            "SKILLS",
-            "ASSIGNMENTS",
-            "INTERVIEW",
-            "TECHNICAL SOCIETY ACTIVITIES",
-            "P SKILL",
-            "TAC",
-            "SPECIAL LAB INITIATIVES", 
-            "EXTRA-CURRICULAR ACTIVITIES",
-            "STUDENT INITIATIVES",
-            "EXTERNAL EVENTS",
-            "EXTERNAL TECHNICAL EVENTS"
-        ]
-        
-        # Map activity types to standard categories (case-insensitive matching)
-        category_mapping = {}
-        for activity_type in activity_summary.keys():
-            activity_upper = activity_type.upper()
-            matched_category = None
-            
-            # Try exact matching first
-            for category in activity_categories:
-                if category.upper() in activity_upper or activity_upper in category.upper():
-                    matched_category = category
-                    break
-            
-            # If no exact match, use the original activity type
-            if not matched_category:
-                matched_category = activity_type
-            
-            category_mapping[activity_type] = matched_category
-        
-        # Group activities by mapped categories
-        final_summary = {}
-        final_count = {}
-        
-        for activity_type, points in activity_summary.items():
-            category = category_mapping[activity_type]
-            if category in final_summary:
-                final_summary[category] += points
-                final_count[category] += activity_count[activity_type]
-            else:
-                final_summary[category] = points
-                final_count[category] = activity_count[activity_type]
-        
-        # Display all categories (including zeros)
-        for category in activity_categories:
-            count = final_count.get(category, 0)
-            points = final_summary.get(category, 0.0)
-            
-        
-        # Add any categories not in the standard list
-        for category, points in final_summary.items():
-            if category not in activity_categories:
-                count = final_count.get(category, 0)
-                output.append(f"📋 **{category}**")
-                output.append(f"   Count: {count}  |  Points: {points:.2f}")
-        
-        # Add summary totals
-        output.append("")
-        
-        # Add detailed activity list if needed
-        if len(student_rows) <= 20:  # Only show detailed list for reasonable number of activities
-            output.append("📋 DETAILED ACTIVITY LIST")
-            output.append("=" * 80)
-            
-            for idx, (_, row) in enumerate(student_rows.iterrows(), 1):
-                activity_type = str(row.get('Activity Type', 'N/A'))
-                activity_name = str(row.get('Activity Name', 'N/A'))
-                reward_points = str(row.get('Reward Points', '0'))
-                
-                try:
-                    points_val = float(reward_points.replace(',', '')) if reward_points else 0
-                except:
-                    points_val = 0
-                
-                # Truncate long names for display
-                display_name = activity_name[:50] + "..." if len(activity_name) > 63 else activity_name
-                output.append(f"{idx:2d}. {activity_type}: {display_name} - {points_val:.2f} pts")
-        
+
+            total_points += points_val
+
+            # Update summary
+            activity_summary[activity_type] = activity_summary.get(activity_type, 0) + points_val
+            activity_count[activity_type] = activity_count.get(activity_type, 0) + 1
+
+        output.append("📋 DETAILED ACTIVITY LIST")
         output.append("=" * 80)
-        
+
+        for idx, (_, row) in enumerate(student_rows.iterrows(), 1):
+            name = str(row.get("Activity Name", "")).strip()
+            points = str(row.get("Reward Points", "0"))
+            activity_type = str(row.get("Activity Type", "")).strip()
+            display = name[:85] + "..." if len(name) > 85 else name
+            output.append(f"{idx:2d}. {activity_type}: {display} - {points} pts")
+
+        output.append("=" * 80)
+        output.append(f"🎯 TOTAL REWARD POINTS FROM ACTIVITIES: {total_points:.2f}")
+        output.append("=" * 80)
+
         return "\n".join(output)
-    
+
     except Exception as e:
         print(f"❌ Error fetching activity details: {str(e)}")
         return ""
 
+
 # Function to get details sheet information
 def get_details_info(spreadsheet):
     try: