diff --git a/README.md b/README.md
index ae0bfdf..566590c 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ services:
### Installation de weasyprint
En plus du `pip install weasyprint` et `pip install django-weasyprint`, il faut installer weasyprint (via homebrew, …)
puis, **pour les mac M1** exécuter les commandes :
-```
+```bash
sudo ln -s /opt/homebrew/opt/glib/lib/libgobject-2.0.0.dylib /usr/local/lib/gobject-2.0
sudo ln -s /opt/homebrew/opt/pango/lib/libpango-1.0.dylib /usr/local/lib/pango-1.0
sudo ln -s /opt/homebrew/opt/harfbuzz/lib/libharfbuzz.dylib /usr/local/lib/harfbuzz
@@ -71,12 +71,12 @@ Pour transferer des données d'un site à un autre, le plus simple est d'utilise
Pour ne pas récupérer les user, les authorisation et les content-type, utilisez la commande :
-```
+```bash
python manage.py dumpdata --natural-foreign --exclude contenttypes --exclude auth.permission --exclude admin.logentry --exclude sessions.session --indent 4 > save.json
```
Pour charger les données, tapez ensuite :
-```
+```bash
python manage.py loaddata save.json
```
## Applications
diff --git a/jarvis/core/templates/base.html b/jarvis/core/templates/base.html
index 7e147f9..12f563b 100644
--- a/jarvis/core/templates/base.html
+++ b/jarvis/core/templates/base.html
@@ -1,5 +1,6 @@
{% load static %}
{% load menuitems %}
+{% load submenuitems %}
{% load has_group %}
@@ -75,8 +76,21 @@
{% menuitem 'home' 'fal fa-chart-pie' 'Dashboard' %}
{% menuitem 'gymnast_list' 'tim-icons icon-badge' 'Gymnasts' %}
- {% menuitem 'skill_list' 'tim-icons icon-molecule-40' 'Skills' %}
- {% menuitem 'routine_list' 'tim-icons icon-components' 'Routines' %}
+ {% menuitem 'skill_list' 'fal fa-hexagon' 'Skills' %}
+ -
+
+
+
Combinations
+
+
+
+ {% submenuitem 'competition_routine_listing' 'CR' 'Competition Routine' %}
+ {% submenuitem 'routine_listing' 'R' 'Routine' %}
+ {% submenuitem 'educative_combination_listing' 'E' 'Educative' %}
+ {% submenuitem 'combination_list' 'C' 'Combination' %}
+
+
+
{% menuitem 'event_list' 'fal fa-calendar-alt' 'Events' %}
{% if request.user|has_group:"trainer" %}
{% menuitem 'accident_list' 'fal fa-comment-alt-medical' 'Accidents' %}
diff --git a/jarvis/followup/templates/routinedone/list.html b/jarvis/followup/templates/routinedone/list.html
index ea97bf1..628101f 100644
--- a/jarvis/followup/templates/routinedone/list.html
+++ b/jarvis/followup/templates/routinedone/list.html
@@ -46,7 +46,7 @@
{{ routine_done.get_routine_type_display }} |
{% if routine_done.routine %}
- {{ routine_done.routine.long_label }}
+ {{ routine_done.routine.long_label }}
{% else %}
-
{% endif %}
diff --git a/jarvis/objective/admin.py b/jarvis/objective/admin.py
index 5d6fbb8..e024220 100644
--- a/jarvis/objective/admin.py
+++ b/jarvis/objective/admin.py
@@ -118,12 +118,14 @@ class RoutineAdmin(admin.ModelAdmin):
"age_girl_chained",
"age_girl_masterised",
"is_active",
+ "is_routine",
"is_competitive",
)
list_display = (
"long_label",
"short_label",
"is_competitive",
+ "is_routine",
"is_active",
"level",
"rank",
@@ -131,8 +133,9 @@ class RoutineAdmin(admin.ModelAdmin):
)
list_filter = (
("level", DropdownFilter),
- "difficulty",
+ ("difficulty", DropdownFilter),
"is_competitive",
+ "is_routine",
"is_active",
)
search_fields = (
diff --git a/jarvis/objective/migrations/0016_routine_is_routine.py b/jarvis/objective/migrations/0016_routine_is_routine.py
new file mode 100644
index 0000000..c678973
--- /dev/null
+++ b/jarvis/objective/migrations/0016_routine_is_routine.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2 on 2023-05-01 07:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("objective", "0015_alter_skill_position"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="routine",
+ name="is_routine",
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/jarvis/objective/models.py b/jarvis/objective/models.py
index 43d4ec9..f769c0d 100644
--- a/jarvis/objective/models.py
+++ b/jarvis/objective/models.py
@@ -258,6 +258,7 @@ class Routine(Educative):
Skill, through="RoutineSkill", verbose_name="routine"
)
is_active = models.BooleanField(default=True)
+ is_routine = models.BooleanField(default=False)
is_competitive = models.BooleanField(default=False)
def __str__(self):
diff --git a/jarvis/objective/templates/routines/compose.html b/jarvis/objective/templates/combinations/compose.html
similarity index 95%
rename from jarvis/objective/templates/routines/compose.html
rename to jarvis/objective/templates/combinations/compose.html
index 9be54e7..1bc95ed 100644
--- a/jarvis/objective/templates/routines/compose.html
+++ b/jarvis/objective/templates/combinations/compose.html
@@ -14,7 +14,7 @@
{% for link in skill_link_list %}
-
-
|