This commit is contained in:
Trey t
2023-07-26 13:11:17 -05:00
parent 25a50c452e
commit 6273ae9222
18 changed files with 16698 additions and 12 deletions

View File

@@ -15,7 +15,7 @@ class SupersetExerciseInline(admin.StackedInline):
@admin.register(Superset)
class SupersetAdmin(ImportExportModelAdmin):
list_display = ("name", "workout", "order", "rounds", "get_workout_id",)
list_display = ("name", "workout", "order", "rounds", "get_workout_id", "estimated_time",)
ordering = ("order",)
inlines = [
SupersetExerciseInline,

View File

@@ -0,0 +1,20 @@
# Generated by Django 4.2.2 on 2023-07-25 15:55
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('workout', '0011_alter_completedworkout_notes'),
('superset', '0005_supersetexercise_order'),
]
operations = [
migrations.AlterField(
model_name='superset',
name='workout',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='superset_workout', to='workout.workout'),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 4.2.2 on 2023-07-25 16:01
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('superset', '0006_alter_superset_workout'),
]
operations = [
migrations.AddField(
model_name='superset',
name='estimated_time',
field=models.FloatField(blank=True, max_length=255, null=True),
),
]

View File

@@ -10,11 +10,13 @@ class Superset(models.Model):
workout = models.ForeignKey(
Workout,
on_delete=models.CASCADE
on_delete=models.CASCADE,
related_name='superset_workout'
)
rounds = models.IntegerField(max_length=3, blank=False, null=False)
order = models.IntegerField(max_length=3, blank=False, null=False)
estimated_time = models.FloatField(max_length=255, blank=True, null=True)
def __str__(self):
return self.name #+ " : " + self.description + " | by: " + self.registered_user.nick_name