finish data structure, make views

.gitignore

@@ -3,3 +3,4 @@ __pycache__/
 webpack-stats.json
 staticfiles
 node_modules
+shared/static/shared/*.{js,css,txt}

groups/admin.py

 from django.contrib import admin
 
-# Register your models here.
+from shared.admin import MarkdownxGuardedModelAdmin
+
+from .models import Group
+
+
+class GroupAdmin(MarkdownxGuardedModelAdmin):
+    autocomplete_fields = ("lectures",)
+
+
+admin.site.register(Group, GroupAdmin)

groups/apps.py

@@ -2,5 +2,6 @@ from django.apps import AppConfig
 
 
 class GroupsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'groups'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "groups"
+    verbose_name = "Skupiny"

groups/models.py

@@ -12,8 +12,7 @@ class Group(models.Model):
     lectures = models.ManyToManyField(
         "lectures.Lecture",
         blank=True,
-        null=True,
-        verbose_name="Události",
+        verbose_name="Lekce",
     )
 
     class Meta:

lectures/admin.py

 from django.contrib import admin
 
+from shared.admin import MarkdownxGuardedModelAdmin
+
+from .models import (
+    Lecture,
+    LectureGroup,
+    LectureLector,
+    LectureMaterial,
+    LectureRecording,
+)
+
 # Register your models here.
+
+
+class IndexHiddenModelAdmin(MarkdownxGuardedModelAdmin):
+    def has_module_permission(self, request):
+        return False
+
+
+class LectureGroupAdmin(MarkdownxGuardedModelAdmin):
+    autocomplete_fields = ("user_groups",)
+    search_fields = ("name",)
+
+
+class LectureLectorInline(admin.TabularInline):
+    model = LectureLector
+    extra = 1
+
+
+class LectureRecordingInline(admin.TabularInline):
+    model = LectureRecording
+    extra = 1
+
+
+class LectureMaterialInline(admin.StackedInline):
+    model = LectureMaterial
+    extra = 1
+
+
+class LectureAdmin(MarkdownxGuardedModelAdmin):
+    inlines = (
+        LectureLectorInline,
+        LectureRecordingInline,
+        LectureMaterialInline,
+    )
+
+    autocomplete_fields = ("groups",)
+    search_fields = ("name", "description")
+    list_display = (
+        "name",
+        "timestamp",
+    )
+
+
+for model in (
+    LectureLector,
+    LectureMaterial,
+    LectureRecording,
+):
+    admin.site.register(model, IndexHiddenModelAdmin)
+
+admin.site.register(Lecture, LectureAdmin)
+admin.site.register(LectureGroup, LectureGroupAdmin)

lectures/apps.py

@@ -2,5 +2,6 @@ from django.apps import AppConfig
 
 
 class LecturesConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'lectures'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "lectures"
+    verbose_name = "Lekce"

lectures/migrations/0001_initial.py

 # Generated by Django 4.1.4 on 2023-04-17 10:56
 
-from django.db import migrations, models
 import django.db.models.deletion
 import markdownx.models
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Lecture',
+            name="Lecture",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('timestamp', models.DateTimeField(blank=True, null=True, verbose_name='Datum a čas konání')),
-                ('type', models.CharField(choices=[('recommended', 'Doporučené'), ('optional', 'Volitelné')], max_length=11, verbose_name='Typ')),
-                ('name', models.CharField(max_length=128, verbose_name='Název')),
-                ('description', markdownx.models.MarkdownxField(blank=True, help_text='Můžeš použít markdown.', null=True, verbose_name='Popis')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "timestamp",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="Datum a čas konání"
+                    ),
+                ),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[
+                            ("recommended", "Doporučené"),
+                            ("optional", "Volitelné"),
+                        ],
+                        max_length=11,
+                        verbose_name="Typ",
+                    ),
+                ),
+                ("name", models.CharField(max_length=128, verbose_name="Název")),
+                (
+                    "description",
+                    markdownx.models.MarkdownxField(
+                        blank=True,
+                        help_text="Můžeš použít markdown.",
+                        null=True,
+                        verbose_name="Popis",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Lekce',
-                'verbose_name_plural': 'Lekce',
+                "verbose_name": "Lekce",
+                "verbose_name_plural": "Lekce",
             },
         ),
         migrations.CreateModel(
-            name='Material',
+            name="Material",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128, verbose_name='Název')),
-                ('link', models.URLField(blank=True, max_length=256, null=True, verbose_name='Odkaz')),
-                ('file', models.FileField(blank=True, null=True, upload_to='', verbose_name='Soubor')),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='lectures.lecture', verbose_name='Událost')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=128, verbose_name="Název")),
+                (
+                    "link",
+                    models.URLField(
+                        blank=True, max_length=256, null=True, verbose_name="Odkaz"
+                    ),
+                ),
+                (
+                    "file",
+                    models.FileField(
+                        blank=True, null=True, upload_to="", verbose_name="Soubor"
+                    ),
+                ),
+                (
+                    "event",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="materials",
+                        to="lectures.lecture",
+                        verbose_name="Událost",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Materiál',
-                'verbose_name_plural': 'Materiály',
+                "verbose_name": "Materiál",
+                "verbose_name_plural": "Materiály",
             },
         ),
         migrations.CreateModel(
-            name='LectureRecording',
+            name="LectureRecording",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128, verbose_name='Název')),
-                ('link', models.URLField(blank=True, max_length=256, null=True, verbose_name='Odkaz')),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='recordings', to='lectures.lecture', verbose_name='Událost')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=128, verbose_name="Název")),
+                (
+                    "link",
+                    models.URLField(
+                        blank=True, max_length=256, null=True, verbose_name="Odkaz"
+                    ),
+                ),
+                (
+                    "event",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="recordings",
+                        to="lectures.lecture",
+                        verbose_name="Událost",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Nahrávka',
-                'verbose_name_plural': 'Nahrávky',
+                "verbose_name": "Nahrávka",
+                "verbose_name_plural": "Nahrávky",
             },
         ),
         migrations.CreateModel(
-            name='LectureLector',
+            name="LectureLector",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128, verbose_name='Jméno')),
-                ('link', models.URLField(blank=True, max_length=256, null=True, verbose_name='Odkaz')),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lectors', to='lectures.lecture', verbose_name='Událost')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=128, verbose_name="Jméno")),
+                (
+                    "link",
+                    models.URLField(
+                        blank=True, max_length=256, null=True, verbose_name="Odkaz"
+                    ),
+                ),
+                (
+                    "event",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="lectors",
+                        to="lectures.lecture",
+                        verbose_name="Událost",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'Lektor',
-                'verbose_name_plural': 'Lektoři',
+                "verbose_name": "Lektor",
+                "verbose_name_plural": "Lektoři",
             },
         ),
     ]

lectures/migrations/0002_lecturematerial_rename_event_lecturelector_lecture_and_more.py

+# Generated by Django 4.1.4 on 2023-04-18 07:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LectureMaterial',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, verbose_name='Název')),
+                ('link', models.URLField(blank=True, max_length=256, null=True, verbose_name='Odkaz')),
+                ('file', models.FileField(blank=True, null=True, upload_to='', verbose_name='Soubor')),
+                ('lecture', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='lectures.lecture', verbose_name='Událost')),
+            ],
+            options={
+                'verbose_name': 'Materiál',
+                'verbose_name_plural': 'Materiály',
+            },
+        ),
+        migrations.RenameField(
+            model_name='lecturelector',
+            old_name='event',
+            new_name='lecture',
+        ),
+        migrations.RenameField(
+            model_name='lecturerecording',
+            old_name='event',
+            new_name='lecture',
+        ),
+        migrations.DeleteModel(
+            name='Material',
+        ),
+    ]

lectures/migrations/0003_alter_lecturematerial_file_and_more.py

+# Generated by Django 4.1.4 on 2023-04-18 07:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0002_lecturematerial_rename_event_lecturelector_lecture_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lecturematerial',
+            name='file',
+            field=models.FileField(blank=True, help_text='Zadej prosím pouze odkaz, nebo soubor.', null=True, upload_to='', verbose_name='Soubor'),
+        ),
+        migrations.AlterField(
+            model_name='lecturematerial',
+            name='link',
+            field=models.URLField(blank=True, help_text='Zadej prosím pouze odkaz, nebo soubor.', max_length=256, null=True, verbose_name='Odkaz'),
+        ),
+    ]

lectures/migrations/0004_alter_lecturematerial_file_and_more.py

+# Generated by Django 4.1.4 on 2023-04-18 07:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0003_alter_lecturematerial_file_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lecturematerial',
+            name='file',
+            field=models.FileField(blank=True, help_text='Pokud máš vložený soubor, nemůžeš definovat odkaz.', null=True, upload_to='', verbose_name='Soubor'),
+        ),
+        migrations.AlterField(
+            model_name='lecturematerial',
+            name='link',
+            field=models.URLField(blank=True, help_text='Pokud máš zadaný odkaz, nemůžeš definovat soubor.', max_length=256, null=True, verbose_name='Odkaz'),
+        ),
+    ]

lectures/migrations/0005_lecturegroup.py

+# Generated by Django 4.1.4 on 2023-04-18 09:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('lectures', '0004_alter_lecturematerial_file_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LectureGroup',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, verbose_name='Jméno')),
+                ('lectures', models.ManyToManyField(blank=True, related_name='groups', to='lectures.lecture', verbose_name='Lekce')),
+                ('user_groups', models.ManyToManyField(to='auth.group', verbose_name='Uživatelské skupiny')),
+            ],
+            options={
+                'verbose_name': 'Skupina',
+                'verbose_name_plural': 'Skupiny',
+            },
+        ),
+    ]

lectures/migrations/0006_alter_lecturegroup_options_and_more.py

+# Generated by Django 4.1.4 on 2023-04-18 10:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('lectures', '0005_lecturegroup'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='lecturegroup',
+            options={'verbose_name': 'Výuková skupina', 'verbose_name_plural': 'Výukové skupiny'},
+        ),
+        migrations.AlterField(
+            model_name='lecturegroup',
+            name='user_groups',
+            field=models.ManyToManyField(blank=True, help_text='Pokud nedefinuješ žádné, lekce ve skupině jsou dostupné všem.', to='auth.group', verbose_name='Uživatelské skupiny'),
+        ),
+        migrations.AlterField(
+            model_name='lecturelector',
+            name='lecture',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lectors', to='lectures.lecture', verbose_name='Lekce'),
+        ),
+        migrations.AlterField(
+            model_name='lecturematerial',
+            name='lecture',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='lectures.lecture', verbose_name='Lekce'),
+        ),
+        migrations.AlterField(
+            model_name='lecturerecording',
+            name='lecture',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='recordings', to='lectures.lecture', verbose_name='Lekce'),
+        ),
+    ]

lectures/migrations/0007_alter_lecture_options.py

+# Generated by Django 4.1.4 on 2023-04-18 10:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0006_alter_lecturegroup_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='lecture',
+            options={'ordering': ('-timestamp',), 'verbose_name': 'Lekce', 'verbose_name_plural': 'Lekce'},
+        ),
+    ]

lectures/migrations/0008_alter_lecture_options.py

+# Generated by Django 4.1.4 on 2023-04-18 10:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0007_alter_lecture_options'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='lecture',
+            options={'ordering': ('-timestamp', '-name'), 'verbose_name': 'Lekce', 'verbose_name_plural': 'Lekce'},
+        ),
+    ]

lectures/migrations/0009_remove_lecturegroup_lectures_lecture_groups.py

+# Generated by Django 4.1.4 on 2023-04-18 10:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0008_alter_lecture_options'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='lecturegroup',
+            name='lectures',
+        ),
+        migrations.AddField(
+            model_name='lecture',
+            name='groups',
+            field=models.ManyToManyField(blank=True, related_name='lectures', to='lectures.lecturegroup', verbose_name='Výukové skupiny'),
+        ),
+    ]

lectures/migrations/0010_alter_lecturegroup_options.py

+# Generated by Django 4.1.4 on 2023-04-18 10:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lectures', '0009_remove_lecturegroup_lectures_lecture_groups'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='lecturegroup',
+            options={'ordering': ('name',), 'verbose_name': 'Výuková skupina', 'verbose_name_plural': 'Výukové skupiny'},
+        ),
+    ]

lectures/models.py

 from datetime import timedelta
 
+from django.contrib.auth.models import Group
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils import timezone
 from markdownx.models import MarkdownxField
 
+from shared.models import NameStrMixin
+
 # Create your models here.
 
 
-class Lecture(models.Model):
+class LectureGroup(NameStrMixin, models.Model):
+    name = models.CharField(
+        max_length=128,
+        verbose_name="Jméno",
+    )
+
+    user_groups = models.ManyToManyField(
+        Group,
+        blank=True,
+        verbose_name="Uživatelské skupiny",
+        help_text=("Pokud nedefinuješ žádné, lekce ve skupině jsou dostupné všem."),
+    )
+
+    class Meta:
+        verbose_name = "Výuková skupina"
+        verbose_name_plural = "Výukové skupiny"
+        ordering = ("name",)
+
+
+class Lecture(NameStrMixin, models.Model):
+    is_current_treshold = timedelta(hours=8)
+
     timestamp = models.DateTimeField(
         verbose_name="Datum a čas konání",
         blank=True,
@@ -19,6 +43,13 @@ class Lecture(models.Model):
         RECOMMENDED = "recommended", "Doporučené"
         OPTIONAL = "optional", "Volitelné"
 
+    groups = models.ManyToManyField(
+        LectureGroup,
+        blank=True,
+        related_name="lectures",
+        verbose_name="Výukové skupiny",
+    )
+
     type = models.CharField(
         choices=TypeChoices.choices,
         max_length=11,
@@ -40,19 +71,20 @@ class Lecture(models.Model):
     @property
     def is_current(self) -> bool:
         # On or after the current time, minus 8 hours
-        return self.timestamp >= (timezone.now() - timedelta(hours=8))
+        return self.timestamp >= (timezone.now() - self.is_current_treshold)
 
     class Meta:
         verbose_name = "Lekce"
         verbose_name_plural = verbose_name
+        ordering = ("-timestamp", "-name")
 
 
-class LectureLector(models.Model):
-    event = models.ForeignKey(
+class LectureLector(NameStrMixin, models.Model):
+    lecture = models.ForeignKey(
         "Lecture",
         on_delete=models.CASCADE,
         related_name="lectors",
-        verbose_name="Událost",
+        verbose_name="Lekce",
     )
 
     name = models.CharField(
@@ -72,12 +104,12 @@ class LectureLector(models.Model):
         verbose_name_plural = "Lektoři"
 
 
-class LectureRecording(models.Model):
-    event = models.ForeignKey(
+class LectureRecording(NameStrMixin, models.Model):
+    lecture = models.ForeignKey(
         "Lecture",
         on_delete=models.CASCADE,
         related_name="recordings",
-        verbose_name="Událost",
+        verbose_name="Lekce",
     )
 
     name = models.CharField(
@@ -97,12 +129,12 @@ class LectureRecording(models.Model):
         verbose_name_plural = "Nahrávky"
 
 
-class Material(models.Model):
-    event = models.ForeignKey(
+class LectureMaterial(NameStrMixin, models.Model):
+    lecture = models.ForeignKey(
         "Lecture",
         on_delete=models.CASCADE,
         related_name="materials",
-        verbose_name="Událost",
+        verbose_name="Lekce",
     )
 
     name = models.CharField(
@@ -115,25 +147,28 @@ class Material(models.Model):
         blank=True,
         null=True,
         verbose_name="Odkaz",
+        help_text="Pokud máš zadaný odkaz, nemůžeš definovat soubor.",
     )
 
     file = models.FileField(
         blank=True,
         null=True,
         verbose_name="Soubor",
+        help_text="Pokud máš vložený soubor, nemůžeš definovat odkaz.",
     )
 
     def clean(self) -> None:
         BOTH_FILE_AND_LINK_DEFINED_ERROR = (
-            "Definuj prosím pouze odkaz, nebo soubor. "
-            "Nemůžeš mít oboje najednou."
+            "Definuj prosím pouze odkaz, nebo soubor. Nemůžeš mít oboje najednou."
         )
 
         if self.file and self.link:
-            raise ValidationError({
+            raise ValidationError(
+                {
                     "link": BOTH_FILE_AND_LINK_DEFINED_ERROR,
                     "file": BOTH_FILE_AND_LINK_DEFINED_ERROR,
-            })
+                }
+            )
 
     class Meta:
         verbose_name = "Materiál"

lectures/templates/lectures/index.html

+{% extends "shared/includes/base.html" %}
+{% load markdownify %}
+
+{% block content %}
+    a
+{% endblock %}

lectures/urls.py

+from django.urls import path
+
+from . import models, views
+
+app_name = "lectures"
+urlpatterns = [
+    path("", views.view_avilable_groups, name="view_avilable_groups"),
+]

lectures/views.py

-from django.shortcuts import render
+from django.db import models
+from django.shortcuts import get_object_or_404, render
+from guardian.shortcuts import get_objects_for_user
 
-# Create your views here.
+from .models import LectureGroup
+
+
+def view_avilable_groups(request):
+    lecture_groups = (
+        get_objects_for_user(request.user, "lectures.view_lecturegroup")
+        .filter(user_groups__in=request.user.groups.all())
+        .distinct()
+        .all()
+    )
+
+    return render(
+        request,
+        "lectures/view_groups.html",
+        {
+            "title": "Výukové skupiny",
+            "site_url": "https://ucebnice.pirati.cz",  # TODO
+            "description": "Kurzy a školení zaměřené na politickou práci a organizaci kampaní.",
+            "header_name": "Pirátský e-Learning",
+            "lecture_groups": lecture_groups,
+        },
+    )
+
+
+def view_lectures(request, group_id: int):
+    group = get_object_or_404(
+        get_objects_for_user(request.user, "lectures.view_lecturegroup"),
+        id=group_id,
+    )
+
+    lectures = (
+        get_objects_for_user(request.user, "lectures.view_lecture")
+        .filter(groups=group)
+        .all()
+    )
+
+    return render(
+        request,
+        "lectures/view_lectures.html",
+        {
+            "title": f"Výuka pro {group.name}",
+            "site_url": "https://ucebnice.pirati.cz",  # TODO
+            "description": f"e-Learningová výuka pro skupinu {group.name}.",
+            "header_name": group.name,
+            "lectures": lectures,
+        },
+    )