Fixed History Tab to show exercises now

Author: KushK04

KonditionExpo/app/(tabs)/history.tsx

@@ -11,10 +11,30 @@ import {
   Alert,
 } from 'react-native';
 import { router } from 'expo-router';
-import { apiService, WorkoutResponse } from '@/services/api';
+import { apiService } from '@/services/api';
 import { useAuth } from '@/contexts/AuthContext';
 import axios from 'axios';
 
+export type Exercise = {
+  id: string;
+  name: string;
+  sets?: number;
+  reps?: number;
+  weight?: number;
+  category: string;
+};
+
+export type WorkoutResponse = {
+  id: string;
+  name: string;
+  description?: string;
+  is_completed: boolean;
+  created_at: string;
+  completed_date?: string;
+  duration_minutes?: number;
+  exercises: Exercise[];  // <-- include this
+};
+
 const WorkoutHistoryScreen = () => {
   const { user } = useAuth();
   const [workouts, setWorkouts] = useState<WorkoutResponse[]>([]);
@@ -34,7 +54,7 @@ const WorkoutHistoryScreen = () => {
 
       //const workoutData = await apiService.getWorkouts(); - Uses old api.ts, idk
 
-      const response = await axios.get('http://localhost:8000/api/v1/workouts/', {
+      const response = await axios.get('http://localhost:8000/api/v1/workouts/exercises/', {
         headers: {
           Authorization: `Bearer ${token}`,
         },
@@ -95,54 +115,66 @@ const WorkoutHistoryScreen = () => {
     return workout.is_completed ? '#4CAF50' : '#FF9800';
   };
 
-  const handleWorkoutPress = (workout: WorkoutResponse) => {
+  /*const handleWorkoutPress = (workout: WorkoutResponse) => {
     // Navigate to the detailed workout view
     router.push({
       pathname: '/workout-detail',
       params: { workoutId: workout.id }
     });
-  };
+  }; Not needed */
 
   const renderWorkoutItem = (workout: WorkoutResponse) => (
-    <TouchableOpacity
-      key={workout.id}
-      style={styles.workoutCard}
-      onPress={() => handleWorkoutPress(workout)}
-    >
+    <View key={workout.id} style={styles.workoutCard}>
+      {/* Workout Header */}
       <View style={styles.workoutHeader}>
         <Text style={styles.workoutName}>{workout.name}</Text>
         <View style={[styles.statusBadge, { backgroundColor: getStatusColor(workout) }]}>
           <Text style={styles.statusText}>{getCompletionStatus(workout)}</Text>
         </View>
       </View>
-      
+  
+      {/* Workout Date */}
       <Text style={styles.workoutDate}>
         {formatDate(workout.completed_date || workout.created_at)}
       </Text>
-      
+  
+      {/* Workout Metadata */}
       <View style={styles.workoutDetails}>
         <View style={styles.detailItem}>
           <Text style={styles.detailLabel}>Duration</Text>
           <Text style={styles.detailValue}>{formatDuration(workout.duration_minutes)}</Text>
         </View>
-        
+  
         <View style={styles.detailItem}>
           <Text style={styles.detailLabel}>Exercises</Text>
-          <Text style={styles.detailValue}>{workout.exercise_count || 0}</Text>
+          <Text style={styles.detailValue}>{workout.exercises?.length || 0}</Text>
         </View>
       </View>
-      
+  
+      {/* Workout Description */}
       {workout.description && (
         <Text style={styles.workoutDescription} numberOfLines={2}>
           {workout.description}
         </Text>
       )}
-      
-      <View style={styles.viewDetailsContainer}>
-        <Text style={styles.viewDetailsText}>Tap to view exercises →</Text>
-      </View>
-    </TouchableOpacity>
+  
+      {/* Exercise List */}
+      {workout.exercises?.length > 0 && (
+        <View style={{ marginTop: 12 }}>
+          <Text style={{ fontWeight: '600', color: '#444', marginBottom: 4 }}>Exercises:</Text>
+          {workout.exercises.map((ex) => (
+            <View key={ex.id} style={{ marginBottom: 6, paddingLeft: 8 }}>
+              <Text style={{ color: '#333' }}>
+                • {ex.name} — {ex.sets || 0} × {ex.reps || 0} @ {ex.weight || 0} lbs
+              </Text>
+            </View>
+          ))}
+        </View>
+      )}
+    </View>
   );
+  
+  
 
   const renderEmptyState = () => (
     <View style={styles.emptyState}>

backend/app/api/routes/workouts.py

@@ -16,6 +16,7 @@
     ExerciseCreate,
     ExerciseUpdate,
     ExercisePublic,
+    WorkoutWithExercisesPublic
 )
 from app.crudFuncs import create_or_update_personal_best, update_personal_bests_after_workout
 
@@ -191,6 +192,25 @@ def get_workout(
 
     return workout
 
+@router.get("/exercises/", response_model=List[WorkoutWithExercisesPublic])
+def get_workouts_with_exercises(
+    session: SessionDep,
+    current_user: CurrentUser,
+) -> Any:
+    """
+    Get all workouts with their exercises for the current user.
+    """
+    # Fetch workouts
+    stmt = select(Workout).where(Workout.user_id == current_user.id)
+    workouts = session.exec(stmt).all()
+
+    # Load and attach exercises manually
+    for workout in workouts:
+        workout.exercises = session.exec(
+            select(Exercise).where(Exercise.workout_id == workout.id)
+        ).all()
+
+    return workouts
 
 @router.put("/{workout_id}", response_model=WorkoutPublic)
 def update_workout(

backend/app/models/__init__.py

@@ -42,6 +42,7 @@
     PersonalBest,
     PersonalBestCreate,
     PersonalBestPublic,
+    WorkoutWithExercisesPublic
 )
 # not needed - from app.models.personal_best import PersonalBest, PersonalBestCreate
 
@@ -93,5 +94,6 @@
     "ExercisePublic",
     "PersonalBest",
     "PersonalBestCreate",
-    "PersonalBestPublic"
+    "PersonalBestPublic",
+    "WorkoutWithExercisesPublic"
 ]

backend/app/models/workout.py

@@ -132,6 +132,19 @@ class ExercisePublic(SQLModel):
     created_at: datetime
     updated_at: Optional[datetime] = None
 
+#Workout with Exercise Public Schema
+class WorkoutWithExercisesPublic(SQLModel):
+    id: uuid.UUID
+    user_id: uuid.UUID
+    name: str
+    description: Optional[str] = None
+    scheduled_date: Optional[datetime] = None
+    completed_date: Optional[datetime] = None
+    duration_minutes: Optional[int] = None
+    is_completed: bool
+    created_at: datetime
+    updated_at: Optional[datetime] = None
+    exercises: List[ExercisePublic] = []
 
 #Personal Bests Model - Related to Workouts
 class PersonalBest(SQLModel, table=True):