From 264102c848ea0f17821e3766cf5e9b9dd05c27bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Fri, 26 May 2023 00:31:11 +0200
Subject: [PATCH] defined lecture group priority
---
lectures/admin.py | 3 +++
.../migrations/0017_merge_20230526_0027.py | 14 +++++++++++
...turegroup_options_lecturegroup_priority.py | 23 +++++++++++++++++++
lectures/models.py | 7 +++++-
4 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 lectures/migrations/0017_merge_20230526_0027.py
create mode 100644 lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py
diff --git a/lectures/admin.py b/lectures/admin.py
index bb880f7..552b6cf 100644
--- a/lectures/admin.py
+++ b/lectures/admin.py
@@ -22,6 +22,8 @@ class LectureGroupAdmin(MarkdownxGuardedModelAdmin):
autocomplete_fields = ("user_groups",)
search_fields = ("name",)
+ list_display = ("name", "priority")
+
class LectureLectorInline(admin.StackedInline):
model = LectureLector
@@ -47,6 +49,7 @@ class LectureAdmin(MarkdownxGuardedModelAdmin):
autocomplete_fields = ("groups",)
search_fields = ("name", "description")
+
list_display = (
"name",
"timestamp",
diff --git a/lectures/migrations/0017_merge_20230526_0027.py b/lectures/migrations/0017_merge_20230526_0027.py
new file mode 100644
index 0000000..808d94a
--- /dev/null
+++ b/lectures/migrations/0017_merge_20230526_0027.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.1.4 on 2023-05-25 22:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('lectures', '0016_alter_lecture_groups'),
+ ('lectures', '0016_alter_lecturegroup_user_groups'),
+ ]
+
+ operations = [
+ ]
diff --git a/lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py b/lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py
new file mode 100644
index 0000000..2eb6da0
--- /dev/null
+++ b/lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.1.4 on 2023-05-25 22:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('lectures', '0017_merge_20230526_0027'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='lecturegroup',
+ options={'ordering': ('priority', 'name'), 'verbose_name': 'Výuková skupina', 'verbose_name_plural': 'Výukové skupiny'},
+ ),
+ migrations.AddField(
+ model_name='lecturegroup',
+ name='priority',
+ field=models.IntegerField(default=0, help_text='Čím nižší číslo, tím výš se skupina zobrazí.', verbose_name='Priorita'),
+ preserve_default=False,
+ ),
+ ]
diff --git a/lectures/models.py b/lectures/models.py
index 08254a4..02314de 100644
--- a/lectures/models.py
+++ b/lectures/models.py
@@ -26,6 +26,11 @@ class LectureGroup(NameStrMixin, models.Model):
help_text="Můžeš použít Markdown.",
)
+ priority = models.IntegerField(
+ verbose_name="Priorita",
+ help_text="Čím nižší číslo, tím výš se skupina zobrazí."
+ )
+
user_groups = models.ManyToManyField(
Group,
blank=True,
@@ -36,7 +41,7 @@ class LectureGroup(NameStrMixin, models.Model):
class Meta:
verbose_name = "Výuková skupina"
verbose_name_plural = "Výukové skupiny"
- ordering = ("name",)
+ ordering = ("priority", "name")
class Lecture(NameStrMixin, models.Model):
--
GitLab