Compare commits
2 Commits
198ceeafc0
...
1c8f6c1152
Author | SHA1 | Date |
---|---|---|
Gregory Trullemans | 1c8f6c1152 | |
Gregory Trullemans | af701a1938 |
|
@ -406,14 +406,14 @@ def heightweight_create_or_update(request, heightweight_id=None, gymnast_id=None
|
||||||
<ul>
|
<ul>
|
||||||
<li>Height: {heightweight.height} cm</li>
|
<li>Height: {heightweight.height} cm</li>
|
||||||
<li>Weight: {heightweight.weight} kg</li>
|
<li>Weight: {heightweight.weight} kg</li>
|
||||||
<li>BMI: {heightweight.bmi}</li>
|
<li>BMI: {heightweight.bmi:.2f}</li>
|
||||||
</ul>"""
|
</ul>"""
|
||||||
|
|
||||||
Email.objects.create(receivers=receivers, title=title, body=body)
|
Email.objects.create(receivers=receivers, title=title, body=body)
|
||||||
|
|
||||||
send_mail(
|
send_mail(
|
||||||
title,
|
title,
|
||||||
f"Un nouveau poids/taille enregistré pour {heightweight.gymnast} ({date}) : {heightweight.height} cm / {heightweight.weight} kg (BMI: {heightweight.bmi}).", # pylint: disable=line-too-long
|
f"Un nouveau poids/taille enregistré pour {heightweight.gymnast} ({date}) : {heightweight.height} cm / {heightweight.weight} kg (BMI: {heightweight.bmi:.2f}).", # pylint: disable=line-too-long
|
||||||
settings.EMAIL_HOST_USER,
|
settings.EMAIL_HOST_USER,
|
||||||
receivers,
|
receivers,
|
||||||
fail_silently=False,
|
fail_silently=False,
|
||||||
|
|
|
@ -7,16 +7,24 @@ from django_admin_listfilter_dropdown.filters import (
|
||||||
)
|
)
|
||||||
|
|
||||||
from .models import (
|
from .models import (
|
||||||
TouchPosition,
|
|
||||||
Skill,
|
Skill,
|
||||||
Passe,
|
|
||||||
Routine,
|
Routine,
|
||||||
|
Educative,
|
||||||
RoutineSkill,
|
RoutineSkill,
|
||||||
TrainingProgram,
|
TouchPosition,
|
||||||
|
TrainingRound,
|
||||||
|
GymnastTraining,
|
||||||
PrerequisiteClosure,
|
PrerequisiteClosure,
|
||||||
|
GymnastTrainingRound,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# @admin.register(Educative)
|
||||||
|
# class EducativeAdmin(admin.ModelAdmin):
|
||||||
|
# model = Educative
|
||||||
|
# list_display = ("long_label", "short_label", "difficulty", "level", "rank")
|
||||||
|
|
||||||
|
|
||||||
@admin.register(TouchPosition)
|
@admin.register(TouchPosition)
|
||||||
class TouchPositionAdmin(admin.ModelAdmin):
|
class TouchPositionAdmin(admin.ModelAdmin):
|
||||||
model = TouchPosition
|
model = TouchPosition
|
||||||
|
@ -194,9 +202,9 @@ class PrerequisiteClosureAdmin(admin.ModelAdmin):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Passe)
|
@admin.register(TrainingRound)
|
||||||
class PasseAdmin(admin.ModelAdmin):
|
class TrainingRoundAdmin(admin.ModelAdmin):
|
||||||
model = Passe
|
model = TrainingRound
|
||||||
|
|
||||||
fields = (
|
fields = (
|
||||||
"label",
|
"label",
|
||||||
|
@ -214,6 +222,14 @@ class PasseAdmin(admin.ModelAdmin):
|
||||||
)
|
)
|
||||||
filter_horizontal = ("educatives",)
|
filter_horizontal = ("educatives",)
|
||||||
|
|
||||||
|
# def save_model(self, request, obj, form, change):
|
||||||
|
# if obj.educatives:
|
||||||
|
# form.cleaned_data["educatives"] = obj.educatives.all().values_list(
|
||||||
|
# "id", flat=True
|
||||||
|
# )
|
||||||
|
|
||||||
|
# super(TrainingRoundAdmin, self).save_model(request, obj, form, change)
|
||||||
|
|
||||||
class Media:
|
class Media:
|
||||||
js = (
|
js = (
|
||||||
"js/core/jquery-3.6.0.min.js",
|
"js/core/jquery-3.6.0.min.js",
|
||||||
|
@ -221,30 +237,59 @@ class PasseAdmin(admin.ModelAdmin):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(TrainingProgram)
|
@admin.register(GymnastTraining)
|
||||||
class TrainingProgramAdmin(admin.ModelAdmin):
|
class GymnastTrainingAdmin(admin.ModelAdmin):
|
||||||
model = TrainingProgram
|
model = GymnastTraining
|
||||||
|
|
||||||
fields = (
|
fields = (
|
||||||
"gymnast",
|
"label",
|
||||||
"date",
|
"date",
|
||||||
"rank",
|
"gymnast",
|
||||||
"passe",
|
# "trainingrounds",
|
||||||
"repetition",
|
"difficulty",
|
||||||
"number_of_skill",
|
"number_of_skill",
|
||||||
|
"score",
|
||||||
|
)
|
||||||
|
|
||||||
|
list_display = (
|
||||||
|
"label",
|
||||||
|
"date",
|
||||||
|
"gymnast",
|
||||||
|
# "trainingrounds",
|
||||||
|
"difficulty",
|
||||||
|
"number_of_skill",
|
||||||
|
"score",
|
||||||
|
)
|
||||||
|
|
||||||
|
list_filter = (
|
||||||
|
("gymnast", RelatedDropdownFilter),
|
||||||
|
("trainingrounds", RelatedDropdownFilter),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(GymnastTrainingRound)
|
||||||
|
class GymnastTrainingRoundAdmin(admin.ModelAdmin):
|
||||||
|
model = TrainingRound
|
||||||
|
|
||||||
|
fields = (
|
||||||
|
"gymnast_training",
|
||||||
|
"training_round",
|
||||||
|
"repetition",
|
||||||
|
"rank",
|
||||||
|
"number_of_skill",
|
||||||
|
"score",
|
||||||
"difficulty",
|
"difficulty",
|
||||||
# "score",
|
|
||||||
)
|
)
|
||||||
list_display = (
|
list_display = (
|
||||||
"date",
|
"gymnast_training",
|
||||||
"gymnast",
|
"training_round",
|
||||||
"passe",
|
|
||||||
"rank",
|
|
||||||
"repetition",
|
"repetition",
|
||||||
|
"rank",
|
||||||
"number_of_skill",
|
"number_of_skill",
|
||||||
|
"score",
|
||||||
"difficulty",
|
"difficulty",
|
||||||
)
|
)
|
||||||
list_filter = (
|
list_filter = (
|
||||||
("gymnast", RelatedDropdownFilter),
|
("gymnast_training", RelatedDropdownFilter),
|
||||||
("date", DropdownFilter),
|
("training_round", RelatedDropdownFilter),
|
||||||
)
|
)
|
||||||
|
|
|
@ -9,7 +9,7 @@ from .models import (
|
||||||
Skill,
|
Skill,
|
||||||
Routine,
|
Routine,
|
||||||
RoutineSkill,
|
RoutineSkill,
|
||||||
Passe,
|
TrainingRound,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ class CombinationSkillForm(forms.ModelForm):
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class PasseForm(forms.ModelForm):
|
class TrainingRoundForm(forms.ModelForm):
|
||||||
|
|
||||||
educatives = forms.ModelMultipleChoiceField(
|
educatives = forms.ModelMultipleChoiceField(
|
||||||
required=False,
|
required=False,
|
||||||
|
@ -91,7 +91,7 @@ class PasseForm(forms.ModelForm):
|
||||||
js = ["/admin/jsi18n/"]
|
js = ["/admin/jsi18n/"]
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Passe
|
model = TrainingRound
|
||||||
fields = ("label", "regexp", "educatives", "informations")
|
fields = ("label", "regexp", "educatives", "informations")
|
||||||
|
|
||||||
widgets = {
|
widgets = {
|
||||||
|
@ -116,7 +116,7 @@ class PasseForm(forms.ModelForm):
|
||||||
def clean_regexp(self):
|
def clean_regexp(self):
|
||||||
"""Vérifie que la regexp entrée par l'utilisateur est valide."""
|
"""Vérifie que la regexp entrée par l'utilisateur est valide."""
|
||||||
regexp = self.cleaned_data["regexp"]
|
regexp = self.cleaned_data["regexp"]
|
||||||
if not Passe.is_valid_regexp(regexp):
|
if not TrainingRound.is_valid_regexp(regexp):
|
||||||
raise ValidationError("Entered regexp not valid.")
|
raise ValidationError("Entered regexp not valid.")
|
||||||
|
|
||||||
return regexp
|
return regexp
|
||||||
|
@ -131,18 +131,22 @@ class PasseForm(forms.ModelForm):
|
||||||
- x| " il y ait 1! Educatives
|
- x| " il y ait 1! Educatives
|
||||||
"""
|
"""
|
||||||
cleaned_data = super().clean()
|
cleaned_data = super().clean()
|
||||||
regexp = ["regexp"]
|
regexp = cleaned_data["regexp"]
|
||||||
|
|
||||||
if regexp is not None:
|
if regexp is not None:
|
||||||
|
# print
|
||||||
arguments = regexp.split(" ")
|
arguments = regexp.split(" ")
|
||||||
educatives = cleaned_data["educatives"]
|
educatives = cleaned_data["educatives"]
|
||||||
|
print("----------------------------------------------------------------")
|
||||||
|
print(educatives)
|
||||||
|
print("----------------------------------------------------------------")
|
||||||
|
|
||||||
if Passe.is_valid_routine_type(arguments[0]) and educatives is not None:
|
if TrainingRound.is_valid_routine_type(arguments[0]) and educatives:
|
||||||
raise ValidationError(
|
raise ValidationError(
|
||||||
"Educatives must be empty with the entered Regexp."
|
"Educatives must be empty with the entered Regexp."
|
||||||
)
|
)
|
||||||
|
|
||||||
if Passe.is_valid_subset(arguments[0]) and educatives is None:
|
if TrainingRound.is_valid_subset(arguments[0]) and educatives is None:
|
||||||
raise ValidationError(
|
raise ValidationError(
|
||||||
"Educatives can't be empty with the entered Regexp."
|
"Educatives can't be empty with the entered Regexp."
|
||||||
)
|
)
|
||||||
|
@ -158,3 +162,13 @@ class PasseForm(forms.ModelForm):
|
||||||
)
|
)
|
||||||
|
|
||||||
return cleaned_data
|
return cleaned_data
|
||||||
|
|
||||||
|
# def save_model(self, request, obj, form, change):
|
||||||
|
# obj.save()
|
||||||
|
# for educative in form.cleaned_data["educatives"]:
|
||||||
|
# print(educative)
|
||||||
|
# book = Book.objects.get(pk=bk.id)
|
||||||
|
# book.quantity -= 1
|
||||||
|
# if book.quantity == 0:
|
||||||
|
# book.sold = True;
|
||||||
|
# book.save()
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
# Generated by Django 4.2 on 2024-03-13 11:38
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("objective", "0021_alter_passe_educatives"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="trainingprogram",
|
||||||
|
unique_together=None,
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name="trainingprogram",
|
||||||
|
name="gymnast",
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name="trainingprogram",
|
||||||
|
name="passe",
|
||||||
|
),
|
||||||
|
migrations.DeleteModel(
|
||||||
|
name="Passe",
|
||||||
|
),
|
||||||
|
migrations.DeleteModel(
|
||||||
|
name="TrainingProgram",
|
||||||
|
),
|
||||||
|
]
|
|
@ -1,4 +1,4 @@
|
||||||
from django.db import models
|
from django.db import models, transaction
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
@ -8,6 +8,7 @@ from jarvis.tools.models import (
|
||||||
Seasonisable,
|
Seasonisable,
|
||||||
max_even_if_none,
|
max_even_if_none,
|
||||||
)
|
)
|
||||||
|
from .signals import *
|
||||||
|
|
||||||
# from jarvis.followup.models import ROUTINE_TYPE_CHOICE
|
# from jarvis.followup.models import ROUTINE_TYPE_CHOICE
|
||||||
|
|
||||||
|
@ -466,7 +467,7 @@ class RoutineSkill(models.Model):
|
||||||
return f"{self.rank} - {self.routine.short_label} : {self.skill.short_label}"
|
return f"{self.rank} - {self.routine.short_label} : {self.skill.short_label}"
|
||||||
|
|
||||||
|
|
||||||
class Passe(Markdownizable):
|
class TrainingRound(Markdownizable):
|
||||||
"""Classe représentant les passages (à faire pendant un entraînement)."""
|
"""Classe représentant les passages (à faire pendant un entraînement)."""
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -476,124 +477,151 @@ class Passe(Markdownizable):
|
||||||
|
|
||||||
label = models.CharField(max_length=30)
|
label = models.CharField(max_length=30)
|
||||||
educatives = models.ManyToManyField(
|
educatives = models.ManyToManyField(
|
||||||
Educative, related_name="passes", blank=True, symmetrical=False
|
Educative, related_name="trainingrounds", blank=True, symmetrical=False
|
||||||
)
|
)
|
||||||
regexp = models.CharField(max_length=50, null=True, blank=True)
|
regexp = models.CharField(max_length=50, null=True, blank=True)
|
||||||
number_of_skill = models.PositiveSmallIntegerField(default=0)
|
number_of_skill = models.PositiveSmallIntegerField(default=0)
|
||||||
difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
||||||
# TODO: number_of_skill doit être calculé correctement dans tous les cas.
|
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
@staticmethod
|
||||||
"""Sauve les informations de la personne et initialise les champs nettoyés.
|
def number_of_skill_from_subset(subset, educative=None):
|
||||||
On part du principe que self.regexp est correct.
|
""" """
|
||||||
|
if not TrainingRound.is_valid_subset(subset):
|
||||||
|
return 0, 0, 0
|
||||||
|
|
||||||
|
subset = subset.replace("[", "").replace("]", "")
|
||||||
|
ranks = subset.split("-")
|
||||||
|
|
||||||
|
if ranks[0] == "":
|
||||||
|
start = 0
|
||||||
|
else:
|
||||||
|
start = int(ranks[0])
|
||||||
|
|
||||||
|
if ranks[1] == "":
|
||||||
|
if educative is not None:
|
||||||
|
end = educative.jumps.all().count()
|
||||||
|
else:
|
||||||
|
end = 10
|
||||||
|
else:
|
||||||
|
end = int(ranks[1])
|
||||||
|
|
||||||
|
number_of_skill = (end - start) + 1
|
||||||
|
|
||||||
|
return start, end, number_of_skill
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def difficulty_from_regexp(educative, start, end):
|
||||||
|
""" """
|
||||||
|
difficulty = 0
|
||||||
|
list_of_skill = educative.skill_links.filter(rank__gte=start, rank__lte=end)
|
||||||
|
# .aggregate(total=Sum("value"))
|
||||||
|
|
||||||
|
for routine_skill in list_of_skill:
|
||||||
|
difficulty += routine_skill.skill.difficulty
|
||||||
|
|
||||||
|
return difficulty
|
||||||
|
|
||||||
|
def update_traininground(self):
|
||||||
|
"""Update `number_of_skill` et `difficulty`.
|
||||||
|
S'il n'y a pas d'educatives, la difficulté ne peut pas être calculée.
|
||||||
"""
|
"""
|
||||||
self.difficulty = 0
|
difficulty = 0
|
||||||
self.number_of_skill = 0
|
number_of_skill = 0
|
||||||
super().save(*args, **kwargs)
|
|
||||||
# print("Dans le save")
|
|
||||||
|
|
||||||
if self.educatives.count() == 0:
|
if self.educatives.count() == 0:
|
||||||
# print("educative is none")
|
|
||||||
present = False
|
|
||||||
operation_list = self.regexp.split(" ")
|
operation_list = self.regexp.split(" ")
|
||||||
for item in ROUTINE_TYPE_CHOICE:
|
|
||||||
if item[1] == operation_list[0]:
|
|
||||||
present = True
|
|
||||||
break
|
|
||||||
|
|
||||||
if present and len(operation_list) == 2:
|
if len(operation_list) == 2:
|
||||||
# print("present")
|
_, _, number_of_skill = TrainingRound.number_of_skill_from_subset(
|
||||||
content = operation_list[1].replace("[", "").replace("]", "")
|
operation_list[1]
|
||||||
ranks = content.split("-")
|
)
|
||||||
|
|
||||||
if ranks[0] == "":
|
|
||||||
self.number_of_skill += int(ranks[1])
|
|
||||||
elif ranks[1] == "":
|
|
||||||
self.number_of_skill += (10 - int(ranks[0])) + 1
|
|
||||||
else:
|
|
||||||
self.number_of_skill += (int(ranks[1]) - int(ranks[0])) + 1
|
|
||||||
else:
|
else:
|
||||||
self.number_of_skill += 10
|
number_of_skill += 10
|
||||||
|
|
||||||
else:
|
else:
|
||||||
for educative in self.educatives.all():
|
for educative in self.educatives.all():
|
||||||
is_skill = False
|
is_skill = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
educative = Routine.objects.get(pk=educative)
|
educ = Routine.objects.get(pk=educative)
|
||||||
except Routine.DoesNotExist:
|
except Routine.DoesNotExist:
|
||||||
educative = Skill.objects.get(pk=educative)
|
educ = Skill.objects.get(pk=educative)
|
||||||
is_skill = True
|
is_skill = True
|
||||||
|
|
||||||
if is_skill:
|
if is_skill:
|
||||||
self.difficulty += educative.difficulty
|
difficulty += educ.difficulty
|
||||||
self.number_of_skill += 1
|
number_of_skill += 1
|
||||||
|
elif (
|
||||||
|
self.regexp is not None
|
||||||
|
and self.regexp != "WC"
|
||||||
|
and not re.match(r"[1-9]+\|", self.regexp)
|
||||||
|
):
|
||||||
|
(
|
||||||
|
start,
|
||||||
|
end,
|
||||||
|
number_of_skill,
|
||||||
|
) = TrainingRound.number_of_skill_from_subset(self.regexp)
|
||||||
|
difficulty = TrainingRound.difficulty_from_regexp(educ, start, end)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
if self.regexp is not None:
|
number_of_skill += educ.jumps.all().count()
|
||||||
regexp = self.regexp.replace("[", "").replace("]", "")
|
difficulty += educ.difficulty
|
||||||
position = regexp.find("-")
|
|
||||||
|
|
||||||
start = regexp[:position]
|
self.difficulty = difficulty
|
||||||
if start == "":
|
self.number_of_skill = number_of_skill
|
||||||
start = 0
|
self.save()
|
||||||
else:
|
|
||||||
start = int(start)
|
|
||||||
|
|
||||||
end = regexp[position + 1 :]
|
# def save(self, *args, **kwargs):
|
||||||
if end == "":
|
# """Sauve les informations de la personne et initialise les champs nettoyés.
|
||||||
end = educative.jumps.all().count()
|
# On part du principe que self.regexp est correct.
|
||||||
else:
|
|
||||||
end = int(end)
|
|
||||||
|
|
||||||
self.number_of_skill += end - (start - 1)
|
# https://stackoverflow.com/questions/13751217/can-the-super-save-method-be-used-several-times-in-a-model
|
||||||
list_of_skill = educative.skill_links.filter(
|
# """
|
||||||
rank__gte=start, rank__lte=end
|
# # print("Object:" + str(self))
|
||||||
)
|
# instance = super().save(*args, **kwargs)
|
||||||
# .aggregate(total=Sum("value"))
|
# # print("Calling update_fileds on commit transaction.")
|
||||||
tmp_difficulty = 0
|
# transaction.on_commit(self.update_fields)
|
||||||
for routine_skill in list_of_skill:
|
# # print("Fields updated.")
|
||||||
tmp_difficulty += routine_skill.skill.difficulty
|
# return instance
|
||||||
self.difficulty += tmp_difficulty
|
|
||||||
|
|
||||||
else:
|
|
||||||
self.number_of_skill += educative.jumps.all().count()
|
|
||||||
self.difficulty += educative.difficulty
|
|
||||||
|
|
||||||
super().save(*args, **kwargs)
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.label} ({self.number_of_skill} | {self.difficulty})"
|
return f"{self.label} ({self.number_of_skill} | {self.difficulty})"
|
||||||
|
|
||||||
|
def is_regexp_wc(self):
|
||||||
|
""" """
|
||||||
|
return self.regexp == "WC"
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def is_valid_regexp_one_arg(arg):
|
def is_valid_regexp_one_arg(regexp):
|
||||||
"""Vérifie une regexp avec un paramètre."""
|
"""Vérifie une regexp avec un paramètre."""
|
||||||
if arg == "WC":
|
if regexp == "WC":
|
||||||
return True
|
return True
|
||||||
|
|
||||||
if re.match(r"[1-9]+\|", arg):
|
if re.match(r"[1-9]+\|", regexp):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
if not Passe.is_valid_dot(arg):
|
if not TrainingRound.is_valid_dot(regexp):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
value = arg.replace(".", "")
|
value = regexp.replace(".", "")
|
||||||
is_valid_routine = Passe.is_valid_routine_type(value)
|
is_valid_routine = TrainingRound.is_valid_routine_type(value)
|
||||||
|
|
||||||
if is_valid_routine:
|
if is_valid_routine:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
return Passe.is_valid_subset(arg)
|
return TrainingRound.is_valid_subset(regexp)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def is_valid_regexp_two_args(arg1, arg2):
|
def is_valid_regexp_two_args(arg1, arg2):
|
||||||
"""Vérifie une regexp avec deux paramètres."""
|
"""Vérifie une regexp avec deux paramètres."""
|
||||||
if not Passe.is_valid_dot(arg1):
|
if not TrainingRound.is_valid_dot(arg1):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
value = arg1.replace(".", "")
|
value = arg1.replace(".", "")
|
||||||
is_valid_routine = Passe.is_valid_routine_type(value)
|
is_valid_routine = TrainingRound.is_valid_routine_type(value)
|
||||||
|
|
||||||
if is_valid_routine:
|
if is_valid_routine:
|
||||||
return Passe.is_valid_subset(arg2)
|
return TrainingRound.is_valid_subset(arg2)
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@ -617,13 +645,13 @@ class Passe(Markdownizable):
|
||||||
"""Recoit une chaine de caractère et vérifie si elle est présente dans la liste
|
"""Recoit une chaine de caractère et vérifie si elle est présente dans la liste
|
||||||
ROUTINE_TYPE_CHOICE (Educative vide !)
|
ROUTINE_TYPE_CHOICE (Educative vide !)
|
||||||
"""
|
"""
|
||||||
is_valid = False
|
is_valid_routine = False
|
||||||
for item in ROUTINE_TYPE_CHOICE:
|
for item in ROUTINE_TYPE_CHOICE:
|
||||||
if item[1] == routine_type:
|
if item[1] == routine_type:
|
||||||
is_valid = True
|
is_valid_routine = True
|
||||||
break
|
break
|
||||||
|
|
||||||
return is_valid
|
return is_valid_routine
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def is_valid_subset(subset):
|
def is_valid_subset(subset):
|
||||||
|
@ -663,6 +691,7 @@ class Passe(Markdownizable):
|
||||||
"""Vérifie le champ regexp
|
"""Vérifie le champ regexp
|
||||||
|
|
||||||
Exemples :
|
Exemples :
|
||||||
|
- "" True
|
||||||
- Q1R1 True
|
- Q1R1 True
|
||||||
- Q1R2 [2-8] True
|
- Q1R2 [2-8] True
|
||||||
- Q2R1 [-5] True
|
- Q2R1 [-5] True
|
||||||
|
@ -678,87 +707,76 @@ class Passe(Markdownizable):
|
||||||
- WC True
|
- WC True
|
||||||
- 1| True
|
- 1| True
|
||||||
"""
|
"""
|
||||||
|
if regexp == "" or regexp is None:
|
||||||
|
return True
|
||||||
|
|
||||||
|
print("---" + regexp + "---")
|
||||||
|
|
||||||
argument_list = regexp.split(" ")
|
argument_list = regexp.split(" ")
|
||||||
|
|
||||||
if len(argument_list) >= 3:
|
if len(argument_list) >= 3:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if len(argument_list) == 2:
|
if len(argument_list) == 2:
|
||||||
return Passe.is_valid_regexp_two_args(argument_list[0], argument_list[1])
|
return TrainingRound.is_valid_regexp_two_args(
|
||||||
|
argument_list[0], argument_list[1]
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
return Passe.is_valid_regexp_one_arg(argument_list[0])
|
return TrainingRound.is_valid_regexp_one_arg(argument_list[0])
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
class TrainingProgram(Seasonisable, Markdownizable):
|
class GymnastTraining(Seasonisable, Markdownizable):
|
||||||
"""Classe représentant ?????
|
"""Classe représentant un entraînement."""
|
||||||
|
|
||||||
TODO:
|
label = models.CharField()
|
||||||
- renommer (supprimer/remettre) TrainingProgram en TrainingPasse
|
gymnast = models.ForeignKey(
|
||||||
- supprimer Seasonisable
|
"people.Gymnast",
|
||||||
- supprimer Markdownizable
|
on_delete=models.CASCADE,
|
||||||
- supprimer le champ Gymnast
|
related_name="trainings",
|
||||||
- supprimer score
|
)
|
||||||
- supprimer rank ??? (--> dans la M2M)
|
trainingrounds = models.ManyToManyField(
|
||||||
- supprimer difficulty ??? (--> dans la M2M)
|
TrainingRound, through="GymnastTrainingRound", verbose_name="trainings"
|
||||||
"""
|
)
|
||||||
|
difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
||||||
|
number_of_skill = models.PositiveSmallIntegerField(default=0)
|
||||||
|
score = models.PositiveSmallIntegerField(default=1)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"Training on {self.date} for {self.gymnast}: {self.number_of_skill} | {self.difficulty}"
|
||||||
|
|
||||||
|
|
||||||
|
class GymnastTrainingRound(Markdownizable):
|
||||||
|
"""Classe représentant un passage."""
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = "Training Program"
|
verbose_name = "Gymnast Training Round"
|
||||||
verbose_name_plural = "Trainings Programs"
|
verbose_name_plural = "Gymnast Training Rounds"
|
||||||
ordering = [
|
ordering = [
|
||||||
"rank",
|
"rank",
|
||||||
]
|
]
|
||||||
unique_together = ["date", "gymnast", "rank"]
|
unique_together = ["gymnast_training", "rank"]
|
||||||
|
|
||||||
gymnast = models.ForeignKey("people.Gymnast", on_delete=models.CASCADE) # TO DELETE
|
gymnast_training = models.ForeignKey(
|
||||||
passe = models.ForeignKey(Passe, on_delete=models.CASCADE)
|
GymnastTraining,
|
||||||
|
on_delete=models.CASCADE,
|
||||||
|
related_name="training_rounds",
|
||||||
|
)
|
||||||
|
training_round = models.ForeignKey(TrainingRound, on_delete=models.CASCADE)
|
||||||
repetition = models.PositiveSmallIntegerField(default=1)
|
repetition = models.PositiveSmallIntegerField(default=1)
|
||||||
number_of_skill = models.PositiveSmallIntegerField(default=0)
|
rank = models.PositiveSmallIntegerField(default=1)
|
||||||
difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
|
||||||
rank = models.PositiveSmallIntegerField(default=1) # TO DELETE
|
|
||||||
score = models.PositiveSmallIntegerField(blank=True, null=True) # TO DELETE
|
|
||||||
updated_at = models.DateTimeField(auto_now=True)
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
|
number_of_skill = models.PositiveSmallIntegerField(default=0)
|
||||||
|
score = models.PositiveSmallIntegerField(blank=True, null=True)
|
||||||
|
difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return (
|
return f"{self.gymnast_training} {self.gymnast_training.date} - {self.rank} : {self.training_round} {self.repetition}"
|
||||||
f"{self.gymnast} {self.date} - {self.rank} : {self.passe} {self.repetition}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
"""Sauve les informations de la personne et initialise les champs nettoyés."""
|
"""Sauve les informations de la personne et initialise les champs nettoyés."""
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
self.difficulty = self.passe.difficulty * self.repetition
|
self.difficulty = self.training_round.difficulty * self.repetition
|
||||||
self.number_of_skill = self.passe.number_of_skill * self.repetition
|
self.number_of_skill = self.training_round.number_of_skill * self.repetition
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
# class TrainingPasseLink(models.Model):
|
|
||||||
# """Modèle M2M entre Training et TrainingPasse."""
|
|
||||||
|
|
||||||
# training = models.ForeignKey(
|
|
||||||
# Training,
|
|
||||||
# on_delete=models.CASCADE,
|
|
||||||
# default=None,
|
|
||||||
# related_name="program_passe_links",
|
|
||||||
# )
|
|
||||||
# program_passe = models.ForeignKey(
|
|
||||||
# TrainingPasse,
|
|
||||||
# on_delete=models.CASCADE,
|
|
||||||
# default=None,
|
|
||||||
# related_name="training_links",
|
|
||||||
# )
|
|
||||||
# rank = models.PositiveSmallIntegerField(default=1)
|
|
||||||
# number_of_skill = models.PositiveSmallIntegerField(default=0)
|
|
||||||
# difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
|
||||||
# score = models.PositiveSmallIntegerField(blank=True, null=True)
|
|
||||||
|
|
||||||
|
|
||||||
# class Training(Seasonisable, Markdownizable):
|
|
||||||
# """Classe représentant un entraînement."""
|
|
||||||
|
|
||||||
# gymnast = models.ForeignKey("people.Gymnast", on_delete=models.CASCADE)
|
|
||||||
# difficulty = models.DecimalField(max_digits=4, decimal_places=1, default=0.0)
|
|
||||||
# number_of_skill = models.PositiveSmallIntegerField(default=0)
|
|
||||||
# score = models.PositiveSmallIntegerField(default=1)
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
# from django.db.models.signals import post_save
|
||||||
|
# from django.dispatch import receiver
|
||||||
|
# from .models import TrainingRound
|
||||||
|
|
||||||
|
|
||||||
|
# @receiver(post_save, sender=TrainingRound)
|
||||||
|
# def compute_traininground_fields(**kwargs):
|
||||||
|
# print("In the post_save function.")
|
||||||
|
# # job = kwargs.get("instance")
|
||||||
|
# # logger.info("POST_SAVE : Job : %s" % job)
|
||||||
|
# # find people to email based on `job` instance
|
|
@ -8,29 +8,29 @@
|
||||||
<div class="col-12 col-sm-12 col-md-8 col-lg-8 col-xl-6">
|
<div class="col-12 col-sm-12 col-md-8 col-lg-8 col-xl-6">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% if trainingprogram_list %}
|
{% if gymnast_training %}
|
||||||
<table class="table table-striped tablesorter" id="trainingprogram_table">
|
<table class="table table-striped tablesorter" id="trainingprogram_table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="5" class="text-center">{% if gymnast %}{{ gymnast }} - {% endif %}{{ date|date:"l j F Y" }}</th>
|
<th colspan="5" class="text-center">{{ gymnast_training.gymnast }} - {{ gymnast_training.date|date:"l j F Y" }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for trainingprogram in trainingprogram_list %}
|
{% for round in training_rounds %}
|
||||||
<tr role="row" class="{% cycle 'odd' 'even' %}">
|
<tr role="row" class="{% cycle 'odd' 'even' %}">
|
||||||
<td><b>{{ trainingprogram.rank }}</b></td>
|
<td><b>{{ round.rank }}</b></td>
|
||||||
<td class="text-center"><a href="{% url 'passe_details' trainingprogram.passe.id gymnast.id date %}">{{ trainingprogram.passe.label }}</a>{% if trainingprogram.repetition != 1 %} {{ trainingprogram.repetition }}{% endif %}</td>
|
<td class="text-center"><a href="{% url 'traininground_details' round.id %}">{{ round.training_round.label }}</a>{% if round.repetition != 1 %} {{ round.repetition }}{% endif %}</td>
|
||||||
<td class="text-center">{{ trainingprogram.number_of_skill}}</td>
|
<td class="text-center">{{ round.number_of_skill}}</td>
|
||||||
<td class="text-center">{{ trainingprogram.difficulty }}</td>
|
<td class="text-center">{{ round.difficulty }}</td>
|
||||||
{% if request.user|has_group:"trainer" %}
|
{% if request.user|has_group:"trainer" %}
|
||||||
<td class="text-center p-2">
|
<td class="text-center p-2">
|
||||||
<a href="#" class="up" data-tp_id="{{ trainingprogram.id }}" data-rank="{{ trainingprogram.rank }}">
|
<a href="#" class="up" data-tp_id="{{ round.id }}" data-rank="{{ round.rank }}">
|
||||||
<button type="submit" value="" class="btn btn-icon btn-warning mr-2">
|
<button type="submit" value="" class="btn btn-icon btn-warning mr-2">
|
||||||
<i class="fas fa-chevron-up"></i>
|
<i class="fas fa-chevron-up"></i>
|
||||||
</button>
|
</button>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href="#" class="down" data-tp_id="{{ trainingprogram.id }}" data-rank="{{ trainingprogram.rank }}">
|
<a href="#" class="down" data-tp_id="{{ round.id }}" data-rank="{{ round.rank }}">
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning mr-2">
|
<button type="submit" value="add" class="btn btn-icon btn-warning mr-2">
|
||||||
<i class="fas fa-chevron-down"></i>
|
<i class="fas fa-chevron-down"></i>
|
||||||
</button>
|
</button>
|
||||||
|
@ -42,8 +42,8 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" class="text-right"><b>TOTAL</b></td>
|
<td colspan="2" class="text-right"><b>TOTAL</b></td>
|
||||||
<td class="text-center"><b>{{ number_of_skill }}</b></td>
|
<td class="text-center"><b>{{ gymnast_training.number_of_skill }}</b></td>
|
||||||
<td class="text-center"><b>{{ difficulty }}</b></td>
|
<td class="text-center"><b>{{ gymnast_training.difficulty }}</b></td>
|
||||||
{% if request.user|has_group:"trainer" %}
|
{% if request.user|has_group:"trainer" %}
|
||||||
<td></td>
|
<td></td>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -67,7 +67,7 @@ $(document).ready(function(){
|
||||||
|
|
||||||
if ($(this).is(".up")) {
|
if ($(this).is(".up")) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "{% url 'switch_trainingprogram_line' %}",
|
url: "{% url 'switch_traininground' %}",
|
||||||
method: "POST",
|
method: "POST",
|
||||||
data: {
|
data: {
|
||||||
tpid: $(this).data('tp_id'),
|
tpid: $(this).data('tp_id'),
|
||||||
|
@ -85,7 +85,7 @@ $(document).ready(function(){
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "{% url 'switch_trainingprogram_line' %}",
|
url: "{% url 'switch_traininground' %}",
|
||||||
method: "POST",
|
method: "POST",
|
||||||
data: {
|
data: {
|
||||||
tpid: $(this).data('tp_id'),
|
tpid: $(this).data('tp_id'),
|
|
@ -8,7 +8,7 @@
|
||||||
<h4 class="">{% if passe_id %}Edit{% else %}Add{% endif %} Passe</h4>
|
<h4 class="">{% if passe_id %}Edit{% else %}Add{% endif %} Passe</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form action="{% if passe_id %}{% url 'passe_update' passe_id %}{% else %}{% url 'passe_create' %}{% endif %}" method="post" class="form-horizontal" id="formulaire" name="formulaire">
|
<form action="{% if passe_id %}{% url 'traininground_update' passe_id %}{% else %}{% url 'traininground_create' %}{% endif %}" method="post" class="form-horizontal" id="formulaire" name="formulaire">
|
||||||
|
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% for hidden in form.hidden_fields %}
|
{% for hidden in form.hidden_fields %}
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
<div class="form-group row {% if form.long_label.errors %}has-error has-feedback{% endif %}">
|
<div class="form-group row {% if form.long_label.errors %}has-error has-feedback{% endif %}">
|
||||||
<label for="id_label" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Label</label>
|
<label for="id_label" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Label<span class="text-danger"><b>*</b></span></label>
|
||||||
<div class="col-8 col-sm-10 col-md-10 col-lg-10 col-xl-10">
|
<div class="col-8 col-sm-10 col-md-10 col-lg-10 col-xl-10">
|
||||||
{{ form.label }}
|
{{ form.label }}
|
||||||
{% if form.label.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.label.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
{% if form.label.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.label.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group row {% if form.regexp.errors %}has-error has-feedback{% endif %}">
|
<div class="form-group row {% if form.regexp.errors %}has-error has-feedback{% endif %}">
|
||||||
<label for="id_regexp" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">{{ form.regexp.label }}<span class="text-danger"><b>*</b></span></label>
|
<label for="id_regexp" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">{{ form.regexp.label }}</label>
|
||||||
<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-3">
|
<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-3">
|
||||||
{{ form.regexp }}
|
{{ form.regexp }}
|
||||||
{% if form.regexp.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.regexp.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
{% if form.regexp.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.regexp.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% load has_group %}
|
{% load has_group %}
|
||||||
|
|
||||||
{% block page_title %}Passe details{% endblock %}
|
{% block page_title %}Training Round details{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="row justify-content-center">
|
<div class="row justify-content-center">
|
||||||
|
@ -9,8 +9,8 @@
|
||||||
<div class="card">
|
<div class="card">
|
||||||
|
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<h4 class="mb-0">Passe details</h3>
|
<h4 class="mb-0">Training round details</h3>
|
||||||
<h5 class="card-category mb-0">{{ passe.label }} {% if passe.regexp %}{{ passe.regexp }}{% endif %}</a> {{ passe.repetition }}</h4>
|
<h5 class="card-category mb-0">{{ traininground.label }} {% if traininground.regexp and traininground.label != traininground.label %}{{ traininground.regexp }}{% endif %}</a> {{ traininground.repetition }}</h4>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
@ -19,34 +19,48 @@
|
||||||
<div class="form-group row mb-0">
|
<div class="form-group row mb-0">
|
||||||
<label for="id_label" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Label</label>
|
<label for="id_label" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Label</label>
|
||||||
<div class="col-8 col-sm-6 col-md-7 col-lg-8 col-xl-9 pt-2">
|
<div class="col-8 col-sm-6 col-md-7 col-lg-8 col-xl-9 pt-2">
|
||||||
{{ passe.label }}
|
{{ traininground.label }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if content %}
|
||||||
<div class="form-group row mb-0">
|
<div class="form-group row mb-0">
|
||||||
<label for="id_educative" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Content</label>
|
<label for="id_educative" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Content</label>
|
||||||
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
||||||
<ul class="mb-0 ml-4 pl-0">
|
|
||||||
{% if routine and not skill_link_list %}
|
{% if routine and not skill_link_list %}
|
||||||
|
<ul class="mb-0 ml-4 pl-0">
|
||||||
<li><a href="{% url 'educative_details' routine.id %}">{{ routine }}</a></li>
|
<li><a href="{% url 'educative_details' routine.id %}">{{ routine }}</a></li>
|
||||||
|
</ul>
|
||||||
{% elif routine and skill_link_list %}
|
{% elif routine and skill_link_list %}
|
||||||
|
<ul class="mb-0 ml-4 pl-0">
|
||||||
{% for routine_skill in skill_link_list %}
|
{% for routine_skill in skill_link_list %}
|
||||||
<li><a href="{% url 'educative_details' routine_skill.skill.id %}">{{ routine_skill.rank }} - {{ routine_skill.skill.notation }}</a></li>
|
<li><a href="{% url 'educative_details' routine_skill.skill.id %}">{{ routine_skill.rank }} - {{ routine_skill.skill.notation }}</a></li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
{% for educative in passe.educatives.all %}
|
{% if is_wc %}
|
||||||
<li><a href="{% url 'educative_details' educative.id %}">{{ educative }}</a></li>
|
{% for educative in traininground.educatives.all %}
|
||||||
{% endfor %}
|
<a href="{% url 'educative_details' educative.id %}">{{ educative.notation }}</a> -
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
<ul class="mb-0 ml-4 pl-0">
|
||||||
|
{% for educative in traininground.educatives.all %}
|
||||||
|
<li><a href="{% url 'educative_details' educative.id %}">{{ educative }}</a></li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if passe.regexp and passe.regexp != passe.label %}
|
{% if traininground.regexp and traininground.regexp != traininground.label %}
|
||||||
<div class="form-group row mb-0">
|
<div class="form-group row mb-0">
|
||||||
<label for="id_regexp" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Regexp</label>
|
<label for="id_regexp" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Regexp</label>
|
||||||
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
||||||
{{ passe.regexp }}
|
{{ traininground.regexp }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -54,22 +68,22 @@
|
||||||
<div class="form-group row mb-0">
|
<div class="form-group row mb-0">
|
||||||
<label for="id_regexp" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Number of Skill</label>
|
<label for="id_regexp" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Number of Skill</label>
|
||||||
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
||||||
{{ number_of_educative }}
|
{{ traininground.number_of_skill }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group row mb-0">
|
<div class="form-group row mb-0">
|
||||||
<label for="id_regexp" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Difficulty</label>
|
<label for="id_regexp" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Difficulty</label>
|
||||||
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
<div class="col-8 col-sm-8 col-md-7 col-lg-8 col-xl-9 pt-2">
|
||||||
{{ difficulty }}
|
{{ traininground.difficulty }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if information %}
|
{% if traininground.information %}
|
||||||
<div class="form-group row mb-0">
|
<div class="form-group row mb-0">
|
||||||
<label for="id_informations" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Informations</label>
|
<label for="id_informations" class="col-4 col-sm-6 col-md-5 col-lg-4 col-xl-3 col-form-label">Informations</label>
|
||||||
<div class="col-8 col-sm-9 col-md-9 col-lg-9 col-xl-9 {% if form.id_information.errors %}has-danger{% endif %}">
|
<div class="col-8 col-sm-9 col-md-9 col-lg-9 col-xl-9 {% if form.id_information.errors %}has-danger{% endif %}">
|
||||||
{{ informations }}
|
{{ traininground.informations }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
|
@ -5,7 +5,7 @@ from jarvis.objective.models import (
|
||||||
TouchPosition,
|
TouchPosition,
|
||||||
Routine,
|
Routine,
|
||||||
RoutineSkill,
|
RoutineSkill,
|
||||||
Passe,
|
TrainingRound,
|
||||||
)
|
)
|
||||||
from jarvis.core.global_vars import ROUTINE_TYPE_CHOICE
|
from jarvis.core.global_vars import ROUTINE_TYPE_CHOICE
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ class ToolsModels(TestCase):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PasseTestCase(TestCase):
|
class TrainingRoundTestCase(TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
"""
|
"""
|
||||||
Structure finale :
|
Structure finale :
|
||||||
|
@ -126,134 +126,134 @@ class PasseTestCase(TestCase):
|
||||||
|
|
||||||
def test_is_valid_dot(self):
|
def test_is_valid_dot(self):
|
||||||
arg = ""
|
arg = ""
|
||||||
self.assertEqual(Passe.is_valid_dot(arg), True)
|
self.assertEqual(TrainingRound.is_valid_dot(arg), True)
|
||||||
arg = "Q1R1"
|
arg = "Q1R1"
|
||||||
self.assertEqual(Passe.is_valid_dot(arg), True)
|
self.assertEqual(TrainingRound.is_valid_dot(arg), True)
|
||||||
arg = ".Q1R1"
|
arg = ".Q1R1"
|
||||||
self.assertEqual(Passe.is_valid_dot(arg), True)
|
self.assertEqual(TrainingRound.is_valid_dot(arg), True)
|
||||||
arg = "Q1R1."
|
arg = "Q1R1."
|
||||||
self.assertEqual(Passe.is_valid_dot(arg), True)
|
self.assertEqual(TrainingRound.is_valid_dot(arg), True)
|
||||||
arg = "Q1.R1"
|
arg = "Q1.R1"
|
||||||
self.assertEqual(Passe.is_valid_dot(arg), False)
|
self.assertEqual(TrainingRound.is_valid_dot(arg), False)
|
||||||
arg = ".Q1.R1."
|
arg = ".Q1.R1."
|
||||||
self.assertEqual(Passe.is_valid_dot(arg), False)
|
self.assertEqual(TrainingRound.is_valid_dot(arg), False)
|
||||||
|
|
||||||
def test_is_valid_subset(self):
|
def test_is_valid_subset(self):
|
||||||
subset = ""
|
subset = ""
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[2-8]"
|
subset = "[2-8]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), True)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), True)
|
||||||
subset = "[2--8]"
|
subset = "[2--8]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[-5]"
|
subset = "[-5]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), True)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), True)
|
||||||
subset = "[3-]"
|
subset = "[3-]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), True)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), True)
|
||||||
subset = "[8-2]"
|
subset = "[8-2]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[-]"
|
subset = "[-]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[1-]"
|
subset = "[1-]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[-1]"
|
subset = "[-1]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[4]"
|
subset = "[4]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[6-6]"
|
subset = "[6-6]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "4"
|
subset = "4"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[6-6"
|
subset = "[6-6"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[66]"
|
subset = "[66]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "4-8"
|
subset = "4-8"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "6-]"
|
subset = "6-]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[4-"
|
subset = "[4-"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "[6"
|
subset = "[6"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "Q1R1 [4-8]"
|
subset = "Q1R1 [4-8]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
subset = "Q1R1 [-8]"
|
subset = "Q1R1 [-8]"
|
||||||
self.assertEqual(Passe.is_valid_subset(subset), False)
|
self.assertEqual(TrainingRound.is_valid_subset(subset), False)
|
||||||
|
|
||||||
def test_is_valid_routine_type(self):
|
def test_is_valid_routine_type(self):
|
||||||
for item in ROUTINE_TYPE_CHOICE:
|
for item in ROUTINE_TYPE_CHOICE:
|
||||||
self.assertEqual(Passe.is_valid_routine_type(item[1]), True)
|
self.assertEqual(TrainingRound.is_valid_routine_type(item[1]), True)
|
||||||
|
|
||||||
routine_type = ""
|
routine_type = ""
|
||||||
self.assertEqual(Passe.is_valid_routine_type(routine_type), False)
|
self.assertEqual(TrainingRound.is_valid_routine_type(routine_type), False)
|
||||||
routine_type = ".Q1R1"
|
routine_type = ".Q1R1"
|
||||||
self.assertEqual(Passe.is_valid_routine_type(routine_type), False)
|
self.assertEqual(TrainingRound.is_valid_routine_type(routine_type), False)
|
||||||
routine_type = "SFS."
|
routine_type = "SFS."
|
||||||
self.assertEqual(Passe.is_valid_routine_type(routine_type), False)
|
self.assertEqual(TrainingRound.is_valid_routine_type(routine_type), False)
|
||||||
routine_type = "Q1R1 [4-8]"
|
routine_type = "Q1R1 [4-8]"
|
||||||
self.assertEqual(Passe.is_valid_routine_type(routine_type), False)
|
self.assertEqual(TrainingRound.is_valid_routine_type(routine_type), False)
|
||||||
routine_type = "SFS [-8]"
|
routine_type = "SFS [-8]"
|
||||||
self.assertEqual(Passe.is_valid_routine_type(routine_type), False)
|
self.assertEqual(TrainingRound.is_valid_routine_type(routine_type), False)
|
||||||
|
|
||||||
def test_is_valid_regexp_one_arg(self):
|
def test_is_valid_regexp_one_arg(self):
|
||||||
arg = ""
|
arg = ""
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), False)
|
||||||
arg = "WC"
|
arg = "WC"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), True)
|
||||||
arg = "1|"
|
arg = "1|"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), True)
|
||||||
arg = ".Q1R1"
|
arg = ".Q1R1"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), True)
|
||||||
arg = "Q1R2."
|
arg = "Q1R2."
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), True)
|
||||||
arg = ".Q1R1 [4-8"
|
arg = ".Q1R1 [4-8"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), False)
|
||||||
arg = "Q1R2. [4-8"
|
arg = "Q1R2. [4-8"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), False)
|
||||||
arg = "Q1R1 [4-8]"
|
arg = "Q1R1 [4-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), False)
|
||||||
arg = "Q1R1 [8-4]"
|
arg = "Q1R1 [8-4]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_one_arg(arg), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_one_arg(arg), False)
|
||||||
|
|
||||||
def test_is_valid_regexp_two_args(self):
|
def test_is_valid_regexp_two_args(self):
|
||||||
arg1 = ""
|
arg1 = ""
|
||||||
arg2 = ""
|
arg2 = ""
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), False)
|
||||||
arg1 = "Q1R1"
|
arg1 = "Q1R1"
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), False)
|
||||||
arg2 = "[4-8]"
|
arg2 = "[4-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), True)
|
||||||
arg2 = "[8-8]"
|
arg2 = "[8-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), False)
|
||||||
arg2 = "[8-4]"
|
arg2 = "[8-4]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), False)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), False)
|
||||||
arg2 = "[-8]"
|
arg2 = "[-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), True)
|
||||||
arg2 = "[4-]"
|
arg2 = "[4-]"
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), True)
|
||||||
arg1 = "Q1R1."
|
arg1 = "Q1R1."
|
||||||
self.assertEqual(Passe.is_valid_regexp_two_args(arg1, arg2), True)
|
self.assertEqual(TrainingRound.is_valid_regexp_two_args(arg1, arg2), True)
|
||||||
|
|
||||||
def test_is_valid_regexp(self):
|
def test_is_valid_regexp(self):
|
||||||
regexp = ""
|
regexp = ""
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), False)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), False)
|
||||||
regexp = "Q1R1 [4-8]"
|
regexp = "Q1R1 [4-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), True)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), True)
|
||||||
regexp = "Q1R1 [8-8]"
|
regexp = "Q1R1 [8-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), False)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), False)
|
||||||
regexp = "Q1R1 [8-4]"
|
regexp = "Q1R1 [8-4]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), False)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), False)
|
||||||
regexp = "Q1R1 [-8]"
|
regexp = "Q1R1 [-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), True)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), True)
|
||||||
regexp = "Q1R1 [4-]"
|
regexp = "Q1R1 [4-]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), True)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), True)
|
||||||
regexp = "Q1R1. [4-8]"
|
regexp = "Q1R1. [4-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), True)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), True)
|
||||||
regexp = "Q1R1. [4-]"
|
regexp = "Q1R1. [4-]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), True)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), True)
|
||||||
regexp = ".Q1R1 [-8]"
|
regexp = ".Q1R1 [-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), True)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), True)
|
||||||
regexp = "Q1R1. [8-8]"
|
regexp = "Q1R1. [8-8]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), False)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), False)
|
||||||
regexp = ".Q1R1 [8-4]"
|
regexp = ".Q1R1 [8-4]"
|
||||||
self.assertEqual(Passe.is_valid_regexp(regexp), False)
|
self.assertEqual(TrainingRound.is_valid_regexp(regexp), False)
|
||||||
|
|
|
@ -90,35 +90,35 @@ urlpatterns = [
|
||||||
),
|
),
|
||||||
path(r"combination/", views.combination_listing, name="combination_listing"),
|
path(r"combination/", views.combination_listing, name="combination_listing"),
|
||||||
#
|
#
|
||||||
# PASSES
|
# TRAININGROUND
|
||||||
#
|
#
|
||||||
path(
|
path(
|
||||||
r"passe/<int:passe_id>/gymnast/<int:gymnast_id>/date/<str:date>/",
|
r"traininground/<int:traininground_id>/",
|
||||||
views.passe_details,
|
views.traininground_details,
|
||||||
name="passe_details",
|
name="traininground_details",
|
||||||
),
|
),
|
||||||
path(r"passe/", views.passe_listing, name="passe_listing"),
|
path(r"traininground/", views.traininground_listing, name="traininground_listing"),
|
||||||
path(
|
path(
|
||||||
r"passe/add/",
|
r"traininground/add/",
|
||||||
views.passe_create_or_update,
|
views.traininground_create_or_update,
|
||||||
name="passe_create",
|
name="traininground_create",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
r"passe/edit/<int:passe_id>/",
|
r"traininground/edit/<int:passe_id>/",
|
||||||
views.passe_create_or_update,
|
views.traininground_create_or_update,
|
||||||
name="passe_update",
|
name="traininground_update",
|
||||||
),
|
),
|
||||||
#
|
#
|
||||||
# TRAININGPROGRAM
|
# GYMNASTTRAINING
|
||||||
#
|
#
|
||||||
path(
|
path(
|
||||||
r"trainingprogram/detail/date/<str:date>/gymnast/<int:gymnast_id>/",
|
r"gymnasttraining/detail/<int:gymnast_training_id>/",
|
||||||
views.trainingprogram_details,
|
views.gymnast_training_details,
|
||||||
name="trainingprogram_details",
|
name="gymnast_training_details",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
r"trainingprogram/switch_trainingprogram_line/",
|
r"gymnasttraining/switch_traininground/",
|
||||||
views.switch_trainingprogram_line,
|
views.switch_traininground,
|
||||||
name="switch_trainingprogram_line",
|
name="switch_traininground",
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -5,25 +5,24 @@ from django.shortcuts import render, get_object_or_404
|
||||||
from django.views.decorators.http import require_http_methods
|
from django.views.decorators.http import require_http_methods
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
import pendulum
|
|
||||||
|
|
||||||
from jarvis.core.global_vars import ROUTINE_TYPE_CHOICE
|
from jarvis.core.global_vars import ROUTINE_TYPE_CHOICE
|
||||||
from jarvis.people.models import Gymnast
|
from jarvis.people.models import Gymnast
|
||||||
from jarvis.followup.models import GymnastHasRoutine
|
from jarvis.followup.models import GymnastHasRoutine
|
||||||
|
|
||||||
from .forms import (
|
from .forms import (
|
||||||
SkillForm,
|
SkillForm,
|
||||||
PasseForm,
|
TrainingRoundForm,
|
||||||
CombinationForm,
|
CombinationForm,
|
||||||
CombinationSkillForm,
|
CombinationSkillForm,
|
||||||
)
|
)
|
||||||
from .models import (
|
from .models import (
|
||||||
Skill,
|
Skill,
|
||||||
Passe,
|
TrainingRound,
|
||||||
Routine,
|
Routine,
|
||||||
Educative,
|
Educative,
|
||||||
RoutineSkill,
|
RoutineSkill,
|
||||||
TrainingProgram,
|
GymnastTraining,
|
||||||
|
GymnastTrainingRound,
|
||||||
PrerequisiteClosure,
|
PrerequisiteClosure,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -514,55 +513,43 @@ def unlink_skill_from_combination(request):
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def passe_listing(request):
|
def traininground_listing(request):
|
||||||
"""Liste des passages."""
|
"""Liste des passages."""
|
||||||
passe_listing = Passe.objects.all()
|
passe_listing = TrainingRound.objects.all()
|
||||||
context = {"passe_listing": passe_listing}
|
context = {"passe_listing": passe_listing}
|
||||||
return render(request, "passes/list.html", context)
|
return render(request, "trainingrounds/list.html", context)
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def passe_details(request, passe_id, gymnast_id, date):
|
def traininground_details(request, traininground_id, date=None):
|
||||||
"""Détails d'un passage."""
|
"""Détails d'un passage."""
|
||||||
|
|
||||||
is_skill = False
|
is_skill = False
|
||||||
passe = get_object_or_404(Passe, pk=passe_id)
|
traininground = get_object_or_404(TrainingRound, pk=traininground_id)
|
||||||
educative_list = passe.educatives.all()
|
educative_list = traininground.educatives.all()
|
||||||
# TODO: décryptage de la regexp
|
|
||||||
regexp = passe.regexp
|
|
||||||
routine = None
|
routine = None
|
||||||
skill_link_list = None
|
skill_link_list = None
|
||||||
|
|
||||||
if regexp is not None:
|
traininground.update_traininground()
|
||||||
operation_list = regexp.split(" ")
|
|
||||||
routine_type = None
|
|
||||||
|
|
||||||
for item in ROUTINE_TYPE_CHOICE:
|
# Decryptage de la regexp
|
||||||
if item[1] == operation_list[0]:
|
if traininground.regexp is not None and traininground.regexp != "":
|
||||||
routine_type = item[0]
|
arguments = traininground.regexp.split(" ")
|
||||||
break
|
if TrainingRound.is_valid_routine_type(arguments[0]) and date is not None:
|
||||||
|
# get routine_type
|
||||||
if routine_type is not None:
|
routine_type = 0
|
||||||
# Récupération de la série
|
|
||||||
ghr = GymnastHasRoutine.objects.filter(
|
ghr = GymnastHasRoutine.objects.filter(
|
||||||
gymnast=gymnast_id,
|
gymnast=traininground.gymnast,
|
||||||
date_begin__lte=date,
|
date_begin__lte=date,
|
||||||
# date_end__gte=date,
|
|
||||||
routine_type=routine_type,
|
routine_type=routine_type,
|
||||||
)
|
).first()
|
||||||
|
|
||||||
print(ghr.query)
|
routine = ghr.routine
|
||||||
|
|
||||||
if ghr.count() > 1:
|
|
||||||
print("Plus d'une série trouvée...")
|
|
||||||
|
|
||||||
print(ghr)
|
|
||||||
|
|
||||||
routine = ghr.first().routine
|
|
||||||
skill_link_list = routine.skill_links.all()
|
skill_link_list = routine.skill_links.all()
|
||||||
if len(operation_list) == 2:
|
if len(arguments) == 2:
|
||||||
content = operation_list[1].replace("[", "").replace("]", "")
|
content = arguments[1].replace("[", "").replace("]", "")
|
||||||
ranks = content.split("-")
|
ranks = content.split("-")
|
||||||
|
|
||||||
if ranks[0] != "":
|
if ranks[0] != "":
|
||||||
|
@ -571,94 +558,72 @@ def passe_details(request, passe_id, gymnast_id, date):
|
||||||
if ranks[1] != "":
|
if ranks[1] != "":
|
||||||
skill_link_list = skill_link_list.filter(rank__lte=ranks[1])
|
skill_link_list = skill_link_list.filter(rank__lte=ranks[1])
|
||||||
|
|
||||||
number_of_educative = skill_link_list.count()
|
content = False
|
||||||
print(number_of_educative)
|
if skill_link_list or routine or educative_list:
|
||||||
|
content = True
|
||||||
else:
|
|
||||||
number_of_educative = educative_list.count()
|
|
||||||
|
|
||||||
context = {
|
context = {
|
||||||
"passe": passe,
|
|
||||||
"is_skill": is_skill,
|
"is_skill": is_skill,
|
||||||
|
"traininground": traininground,
|
||||||
"educative_list": educative_list,
|
"educative_list": educative_list,
|
||||||
"routine": routine,
|
"routine": routine,
|
||||||
"skill_link_list": skill_link_list,
|
"skill_link_list": skill_link_list,
|
||||||
"difficulty": passe.difficulty,
|
"content": content,
|
||||||
"number_of_skill": passe.number_of_skill,
|
"is_wc": traininground.is_regexp_wc
|
||||||
"number_of_educative": number_of_educative,
|
# "number_of_educative": number_of_educative,
|
||||||
}
|
}
|
||||||
return render(request, "passes/details.html", context)
|
return render(request, "trainingrounds/details.html", context)
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET", "POST"])
|
@require_http_methods(["GET", "POST"])
|
||||||
def passe_create_or_update(request, passe_id=None):
|
def traininground_create_or_update(request, traininground_id=None):
|
||||||
"""Création d'un passage.
|
"""Création d'un passage.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
passe_id (int) identifiant d'un object de classe <Passe>.
|
traininground_id (int) identifiant d'un object de classe <TrainingRound>.
|
||||||
"""
|
"""
|
||||||
if passe_id:
|
if traininground_id:
|
||||||
passe = get_object_or_404(Passe, pk=passe_id)
|
traininground = get_object_or_404(TrainingRound, pk=traininground_id)
|
||||||
else:
|
else:
|
||||||
passe = None
|
traininground = None
|
||||||
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
form = PasseForm(request.POST, instance=passe)
|
form = TrainingRoundForm(request.POST, instance=traininground)
|
||||||
|
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
passe = form.save()
|
traininground = form.save()
|
||||||
return HttpResponseRedirect(reverse("passe_details", args=(passe.pk,)))
|
return HttpResponseRedirect(
|
||||||
|
reverse("traininground_details", args=(traininground.pk,))
|
||||||
|
)
|
||||||
|
# print(form.errors)
|
||||||
|
return render(request, "trainingrounds/create.html", {"form": form})
|
||||||
|
|
||||||
return render(request, "passes/create.html", {"form": form})
|
form = TrainingRoundForm(instance=traininground)
|
||||||
|
context = {"form": form, "traininground_id": traininground_id}
|
||||||
form = PasseForm(instance=passe)
|
return render(request, "trainingrounds/create.html", context)
|
||||||
context = {"form": form, "passe_id": passe_id}
|
|
||||||
return render(request, "passes/create.html", context)
|
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def trainingprogram_details(request, date=None, gymnast_id=None):
|
def gymnast_training_details(request, gymnast_training_id):
|
||||||
"""Détails d'un entraînement."""
|
"""Détails d'un entraînement."""
|
||||||
|
|
||||||
gymnast = None
|
gymnast_training = get_object_or_404(GymnastTraining, pk=gymnast_training_id)
|
||||||
trainingprogram_id = None
|
training_rounds = gymnast_training.training_rounds.all()
|
||||||
if trainingprogram_id is not None:
|
|
||||||
trainingprogram = get_object_or_404(TrainingProgram, pk=trainingprogram_id)
|
|
||||||
trainingprogram_list = None
|
|
||||||
else:
|
|
||||||
trainingprogram = None
|
|
||||||
trainingprogram_list = TrainingProgram.objects.all()
|
|
||||||
parsed_date = pendulum.parse(date).date()
|
|
||||||
if date is not None:
|
|
||||||
trainingprogram_list = trainingprogram_list.filter(date=parsed_date)
|
|
||||||
|
|
||||||
if gymnast_id is not None:
|
|
||||||
gymnast = get_object_or_404(Gymnast, pk=gymnast_id)
|
|
||||||
trainingprogram_list = trainingprogram_list.filter(gymnast=gymnast_id)
|
|
||||||
|
|
||||||
difficulty = 0
|
|
||||||
number_of_skill = 0
|
|
||||||
for trainingprogram in trainingprogram_list:
|
|
||||||
difficulty += trainingprogram.difficulty
|
|
||||||
number_of_skill += trainingprogram.number_of_skill
|
|
||||||
|
|
||||||
context = {
|
context = {
|
||||||
"gymnast": gymnast,
|
"gymnast": gymnast_training.gymnast,
|
||||||
"date": parsed_date,
|
"gymnast_training": gymnast_training,
|
||||||
"difficulty": difficulty,
|
"training_rounds": training_rounds,
|
||||||
"number_of_skill": number_of_skill,
|
|
||||||
"trainingprogram": trainingprogram,
|
|
||||||
"trainingprogram_list": trainingprogram_list,
|
|
||||||
}
|
}
|
||||||
return render(request, "trainingprograms/details.html", context)
|
return render(request, "gymnasttrainings/details.html", context)
|
||||||
|
|
||||||
|
|
||||||
@require_http_methods(["POST"])
|
@require_http_methods(["POST"])
|
||||||
def switch_trainingprogram_line(request):
|
def switch_traininground(request):
|
||||||
"""
|
"""
|
||||||
Recoit dans request deux identifiants de trainingprogram qu'il faut échanger () :
|
Recoit dans request deux identifiants de trainingprogram qu'il faut échanger :
|
||||||
- tp_id (int) identifiant d'une instance de TraiingProgram
|
- tp_id (int) identifiant d'une instance de TraiingProgram
|
||||||
- direction (str) la direction du changement (0: haut, 1: bas)
|
- direction (str) la direction du changement (0: haut, 1: bas)
|
||||||
|
|
||||||
|
@ -669,31 +634,31 @@ def switch_trainingprogram_line(request):
|
||||||
target_trainingprogram_id = request.POST.get("tpid", None)
|
target_trainingprogram_id = request.POST.get("tpid", None)
|
||||||
direction = int(request.POST.get("direction", 0))
|
direction = int(request.POST.get("direction", 0))
|
||||||
|
|
||||||
target_trainingprogram = get_object_or_404(
|
target_trainingpround = get_object_or_404(
|
||||||
TrainingProgram, pk=target_trainingprogram_id
|
GymnastTrainingRound, pk=target_trainingprogram_id
|
||||||
)
|
)
|
||||||
|
|
||||||
if direction == 0:
|
if direction == 0:
|
||||||
source_trainingprogram = (
|
source_traininground = (
|
||||||
TrainingProgram.objects.filter(rank__lt=target_trainingprogram.rank)
|
GymnastTrainingRound.objects.filter(rank__lt=target_trainingpround.rank)
|
||||||
.order_by("-id")
|
.order_by("-id")
|
||||||
.first()
|
.first()
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
source_trainingprogram = (
|
source_traininground = (
|
||||||
TrainingProgram.objects.filter(rank__gt=target_trainingprogram.rank)
|
GymnastTrainingRound.objects.filter(rank__gt=target_trainingpround.rank)
|
||||||
.order_by("id")
|
.order_by("id")
|
||||||
.first()
|
.first()
|
||||||
)
|
)
|
||||||
|
|
||||||
saved_source_rank = source_trainingprogram.rank
|
saved_source_rank = source_traininground.rank
|
||||||
saved_target_rank = target_trainingprogram.rank
|
saved_target_rank = target_trainingpround.rank
|
||||||
source_trainingprogram.rank = 32767
|
source_traininground.rank = 32767
|
||||||
source_trainingprogram.save()
|
source_traininground.save()
|
||||||
target_trainingprogram.rank = saved_source_rank
|
target_trainingpround.rank = saved_source_rank
|
||||||
target_trainingprogram.save()
|
target_trainingpround.save()
|
||||||
source_trainingprogram.rank = saved_target_rank
|
source_traininground.rank = saved_target_rank
|
||||||
source_trainingprogram.save()
|
source_traininground.save()
|
||||||
|
|
||||||
return HttpResponse(200)
|
return HttpResponse(200)
|
||||||
except Exception:
|
except Exception:
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
# Generated by Django 4.2 on 2024-03-13 11:38
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("people", "0011_gymnast_trainers"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name="gymnast",
|
||||||
|
options={
|
||||||
|
"ordering": ["first_name", "last_name"],
|
||||||
|
"verbose_name": "Gymnast",
|
||||||
|
"verbose_name_plural": "Gymnasts",
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
|
@ -82,9 +82,9 @@
|
||||||
<h4>Training Program</h4>
|
<h4>Training Program</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% if date_list %}
|
{% if training_list %}
|
||||||
{% for date in date_list %}
|
{% for training in training_list %}
|
||||||
<a href="{% url 'trainingprogram_details' date gymnast_id %}">{{ date|date:"l j F Y" }}</a>
|
<a href="{% url 'gymnast_training_details' training.id %}">{{ training.date|date:"l j F Y" }}</a><br />
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Pas de training planifié.</p>
|
<p>Pas de training planifié.</p>
|
||||||
|
|
|
@ -20,7 +20,8 @@ import pendulum
|
||||||
|
|
||||||
from jarvis.followup.models import Event
|
from jarvis.followup.models import Event
|
||||||
from jarvis.followup.forms import GymnastHasRoutineForm
|
from jarvis.followup.forms import GymnastHasRoutineForm
|
||||||
from jarvis.objective.models import TrainingProgram
|
|
||||||
|
from jarvis.objective.models import GymnastTraining
|
||||||
from jarvis.followup.models import (
|
from jarvis.followup.models import (
|
||||||
Note,
|
Note,
|
||||||
Plan,
|
Plan,
|
||||||
|
@ -257,12 +258,7 @@ def gymnast_display_scores_chrono(request, gymnast_id):
|
||||||
).order_by("date")
|
).order_by("date")
|
||||||
base_queryset = chrono_list.values("date").annotate(score_avg=Avg("tof"))
|
base_queryset = chrono_list.values("date").annotate(score_avg=Avg("tof"))
|
||||||
today = pendulum.now().date()
|
today = pendulum.now().date()
|
||||||
date_list = (
|
training_list = GymnastTraining.objects.filter(gymnast=gymnast_id, date__gte=today)
|
||||||
TrainingProgram.objects.filter(gymnast=gymnast_id, date__gte=today)
|
|
||||||
.values_list("date", flat=True)
|
|
||||||
.order_by("date")
|
|
||||||
.distinct()
|
|
||||||
)
|
|
||||||
|
|
||||||
context = {
|
context = {
|
||||||
"intensity_list": intensity_list,
|
"intensity_list": intensity_list,
|
||||||
|
@ -271,7 +267,7 @@ def gymnast_display_scores_chrono(request, gymnast_id):
|
||||||
"chrono_r1": base_queryset.filter(chrono_type=1),
|
"chrono_r1": base_queryset.filter(chrono_type=1),
|
||||||
"chrono_r2": base_queryset.filter(chrono_type=2),
|
"chrono_r2": base_queryset.filter(chrono_type=2),
|
||||||
"chrono_rf": base_queryset.filter(chrono_type=3),
|
"chrono_rf": base_queryset.filter(chrono_type=3),
|
||||||
"date_list": date_list,
|
"training_list": training_list,
|
||||||
"gymnast_id": gymnast_id,
|
"gymnast_id": gymnast_id,
|
||||||
}
|
}
|
||||||
return render(request, "gymnasts/tabs/tab_intensity_and_chronos.html", context)
|
return render(request, "gymnasts/tabs/tab_intensity_and_chronos.html", context)
|
||||||
|
|
Loading…
Reference in New Issue