WIP
This commit is contained in:
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
@@ -22,4 +22,7 @@ class WorkoutExerciseAdmin(admin.ModelAdmin):
|
|||||||
@admin.register(CompletedWorkout)
|
@admin.register(CompletedWorkout)
|
||||||
class CompletedWorkoutAdmin(admin.ModelAdmin):
|
class CompletedWorkoutAdmin(admin.ModelAdmin):
|
||||||
list_display = ("registered_user", "workout", "workout_start_time", "difficulty", "notes", "total_time", "created_at",)
|
list_display = ("registered_user", "workout", "workout_start_time", "difficulty", "notes", "total_time", "created_at",)
|
||||||
|
|
||||||
|
@admin.register(PlannedWorkout)
|
||||||
|
class PlannedWorkoutAdmin(admin.ModelAdmin):
|
||||||
|
list_display = ("registered_user", "workout", "on_date",)
|
||||||
18
workout/migrations/0009_alter_plannedworkout_on_date.py
Normal file
18
workout/migrations/0009_alter_plannedworkout_on_date.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.2.2 on 2023-07-02 04:15
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('workout', '0008_plannedworkout'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='plannedworkout',
|
||||||
|
name='on_date',
|
||||||
|
field=models.DateTimeField(),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
workout/migrations/0010_alter_plannedworkout_on_date.py
Normal file
18
workout/migrations/0010_alter_plannedworkout_on_date.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.2.2 on 2023-07-02 04:16
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('workout', '0009_alter_plannedworkout_on_date'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='plannedworkout',
|
||||||
|
name='on_date',
|
||||||
|
field=models.DateField(),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -79,7 +79,7 @@ class CompletedWorkout(models.Model):
|
|||||||
class PlannedWorkout(models.Model):
|
class PlannedWorkout(models.Model):
|
||||||
created_at = models.DateTimeField(auto_now_add=True)
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
updated_at = models.DateTimeField(auto_now=True)
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
on_date = models.DateTimeField(auto_now=True)
|
on_date = models.DateField(auto_now=False,null=False, blank=False)
|
||||||
workout = models.ForeignKey(
|
workout = models.ForeignKey(
|
||||||
Workout,
|
Workout,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
|
|||||||
@@ -72,4 +72,10 @@ class GetCompleteWorkoutSerializer(serializers.ModelSerializer):
|
|||||||
class POSTCompleteWorkoutSerializer(serializers.ModelSerializer):
|
class POSTCompleteWorkoutSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Workout
|
model = Workout
|
||||||
exclude = ['registered_user']
|
exclude = ['registered_user']
|
||||||
|
|
||||||
|
class PlannedWorkoutSerializer(serializers.ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = PlannedWorkout
|
||||||
|
exclude = ['registered_user']
|
||||||
|
depth = 1
|
||||||
@@ -8,4 +8,5 @@ urlpatterns = [
|
|||||||
path('complete/', views.complete_workout, name='user complete workout'),
|
path('complete/', views.complete_workout, name='user complete workout'),
|
||||||
path('completed/', views.workouts_completed_by_logged_in_user, name='user completed workouts'),
|
path('completed/', views.workouts_completed_by_logged_in_user, name='user completed workouts'),
|
||||||
path('create/', views.add_workout, name='create new workout'),
|
path('create/', views.add_workout, name='create new workout'),
|
||||||
|
path('planned_workouts/', views.workouts_planned_by_logged_in_user, name='planned workout for user'),
|
||||||
]
|
]
|
||||||
@@ -90,4 +90,13 @@ def add_workout(request):
|
|||||||
completed_workout.save()
|
completed_workout.save()
|
||||||
|
|
||||||
return Response(serializer.data, status=status.HTTP_201_CREATED)
|
return Response(serializer.data, status=status.HTTP_201_CREATED)
|
||||||
return Response(serializer.errors, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
|
return Response(serializer.errors, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
|
||||||
|
|
||||||
|
@api_view(['GET'])
|
||||||
|
@authentication_classes([TokenAuthentication])
|
||||||
|
@permission_classes([IsAuthenticated])
|
||||||
|
def workouts_planned_by_logged_in_user(request):
|
||||||
|
registered_user = RegisteredUser.objects.get(user=request.user)
|
||||||
|
workouts = PlannedWorkout.objects.filter(registered_user=registered_user)
|
||||||
|
serializer = PlannedWorkoutSerializer(workouts, many=True)
|
||||||
|
return Response(serializer.data, status=status.HTTP_201_CREATED)
|
||||||
Reference in New Issue
Block a user