From 69cd14b4404b4eefcf690b8aa6487654d2ebf998 Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Tue, 18 Oct 2022 08:21:27 +0200
Subject: [PATCH] Update admin and closure tree

---
 ultron/objective/admin.py                     |  2 +-
 .../commands/rebuild_closure_table_tree.py    |  2 ++
 ..._notation_alter_skill_rotation_and_more.py | 33 +++++++++++++++++++
 ultron/people/views.py                        |  5 ---
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 ultron/objective/migrations/0014_alter_skill_notation_alter_skill_rotation_and_more.py

diff --git a/ultron/objective/admin.py b/ultron/objective/admin.py
index 5ec266a364..aed1aac7f3 100644
--- a/ultron/objective/admin.py
+++ b/ultron/objective/admin.py
@@ -73,7 +73,7 @@ class SkillAdmin(admin.ModelAdmin):
     )
 
     ordering = ("long_label", "short_label")
-    search_fields = ("rank", "long_label", "short_label")
+    search_fields = ("rank", "long_label", "short_label", "notation")
     list_filter = (
         "is_competitive",
         ('difficulty', DropdownFilter),
diff --git a/ultron/objective/management/commands/rebuild_closure_table_tree.py b/ultron/objective/management/commands/rebuild_closure_table_tree.py
index 3b8df80ca2..6e2e6aead3 100644
--- a/ultron/objective/management/commands/rebuild_closure_table_tree.py
+++ b/ultron/objective/management/commands/rebuild_closure_table_tree.py
@@ -13,8 +13,10 @@ from ultron.objective.models import Educative, PrerequisiteClosure
 class Command(BaseCommand):
     def handle(self, *args, **options):
         educative_list = Educative.objects.all()
+        count = 0
 
         for educative in educative_list:
+            count += 1
             updated = False
             max_level = 0
             max_rank = 0
diff --git a/ultron/objective/migrations/0014_alter_skill_notation_alter_skill_rotation_and_more.py b/ultron/objective/migrations/0014_alter_skill_notation_alter_skill_rotation_and_more.py
new file mode 100644
index 0000000000..3c8c543d22
--- /dev/null
+++ b/ultron/objective/migrations/0014_alter_skill_notation_alter_skill_rotation_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.1.1 on 2022-10-18 04:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("objective", "0013_alter_skill_position"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="skill",
+            name="notation",
+            field=models.CharField(max_length=10),
+        ),
+        migrations.AlterField(
+            model_name="skill",
+            name="rotation",
+            field=models.PositiveSmallIntegerField(verbose_name="¼ de rotation"),
+        ),
+        migrations.AlterField(
+            model_name="skill",
+            name="simplified_notation",
+            field=models.CharField(max_length=10, verbose_name="Notation simplifiée"),
+        ),
+        migrations.AlterField(
+            model_name="skill",
+            name="twist",
+            field=models.PositiveSmallIntegerField(verbose_name="½ Vrille"),
+        ),
+    ]
diff --git a/ultron/people/views.py b/ultron/people/views.py
index b2702e1752..b50697f2ce 100644
--- a/ultron/people/views.py
+++ b/ultron/people/views.py
@@ -460,11 +460,6 @@ def gymnast_display_skill(request, gymnast_id):
     context = gymnast.get_informations_from_type("level")
     context.update(gymnast.get_informations_from_type("rank"))
 
-    # planned_skill = (
-    #     Plan.objects.filter(gymnast=gymnast.id, educative__in=(Skill.objects.all()))
-    #     .order_by("-date", 'educative__long_label')
-    # )
-
     planned_skill = (
         Plan.objects.filter(gymnast=gymnast.id, educative__in=(Skill.objects.all())).select_related('educative', 'educative__skill')
         .order_by("-date", 'educative__long_label')