work

azube/asgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'azube.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "azube.settings")
 
 application = get_asgi_application()

azube/settings.py

@@ -20,7 +20,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure--nw#rw&yl=j$7c3xdg3dh&p=9o=4hngx6+px7s^py6-r6%c#6*'
+SECRET_KEY = "django-insecure--nw#rw&yl=j$7c3xdg3dh&p=9o=4hngx6+px7s^py6-r6%c#6*"
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -31,53 +31,53 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
+    "django.contrib.admin",
-    'django.contrib.auth',
+    "django.contrib.auth",
-    'django.contrib.contenttypes',
+    "django.contrib.contenttypes",
-    'django.contrib.sessions',
+    "django.contrib.sessions",
-    'django.contrib.messages',
+    "django.contrib.messages",
-    'django.contrib.staticfiles',
+    "django.contrib.staticfiles",
-    "core"
+    "core",
 ]
 
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
+    "django.middleware.security.SecurityMiddleware",
-    'django.contrib.sessions.middleware.SessionMiddleware',
+    "django.contrib.sessions.middleware.SessionMiddleware",
-    'django.middleware.common.CommonMiddleware',
+    "django.middleware.common.CommonMiddleware",
-    'django.middleware.csrf.CsrfViewMiddleware',
+    "django.middleware.csrf.CsrfViewMiddleware",
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
-    'django.contrib.messages.middleware.MessageMiddleware',
+    "django.contrib.messages.middleware.MessageMiddleware",
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'azube.urls'
+ROOT_URLCONF = "azube.urls"
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
-        'DIRS': [],
+        "DIRS": [],
-        'APP_DIRS': True,
+        "APP_DIRS": True,
-        'OPTIONS': {
+        "OPTIONS": {
-            'context_processors': [
+            "context_processors": [
-                'django.template.context_processors.debug',
+                "django.template.context_processors.debug",
-                'django.template.context_processors.request',
+                "django.template.context_processors.request",
-                'django.contrib.auth.context_processors.auth',
+                "django.contrib.auth.context_processors.auth",
-                'django.contrib.messages.context_processors.messages',
+                "django.contrib.messages.context_processors.messages",
             ],
         },
     },
 ]
 
-WSGI_APPLICATION = 'azube.wsgi.application'
+WSGI_APPLICATION = "azube.wsgi.application"
 
 
 # Database
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 
 DATABASES = {
-    'default': {
+    "default": {
-        'ENGINE': 'django.db.backends.sqlite3',
+        "ENGINE": "django.db.backends.sqlite3",
-        'NAME': BASE_DIR / 'db.sqlite3',
+        "NAME": BASE_DIR / "db.sqlite3",
     }
 }
 
@@ -87,16 +87,16 @@ DATABASES = {
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
     },
 ]
 
@@ -104,9 +104,9 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"
 
 USE_I18N = True
 
@@ -116,9 +116,9 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
 
-STATIC_URL = 'static/'
+STATIC_URL = "static/"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

azube/urls.py

@@ -14,10 +14,8 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 from django.contrib import admin
 from django.urls import path, include
 
-urlpatterns = [
+urlpatterns = [path("admin/", admin.site.urls), path("", include("core.urls"))]
-    path('admin/', admin.site.urls),
-    path('', include('core.urls'))
-]

azube/wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'azube.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "azube.settings")
 
 application = get_wsgi_application()

core/apps.py

@@ -2,5 +2,5 @@ from django.apps import AppConfig
 
 
 class MainAppConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
+    default_auto_field = "django.db.models.BigAutoField"
-    name = 'core'
+    name = "core"

core/azure_auth.py

@@ -1,6 +1,9 @@
 import json
 import base64
 
+from core.models import Berichtsheft
+
+
 class AzureUser:
     display_name: str
     id: str
@@ -15,7 +18,9 @@ class AzureUser:
             self.id = request.headers["X-MS-CLIENT-PRINCIPAL-NAME"]
 
             # X-MS-CLIENT-PRINCIPAL
-            claims_json = json.loads(base64.decode(request.headers["X-MS-CLIENT-PRINCIPAL"]))
+            claims_json = json.loads(
+                base64.decode(request.headers["X-MS-CLIENT-PRINCIPAL"])
+            )
             claims = {}
 
             for claim in claims_json["claims"]:
@@ -26,3 +31,5 @@ class AzureUser:
             self.display_name = "Anon"
             self.id = "anon"
 
+    def reports(self):
+        return Berichtsheft.objects.filter(user=self.id)

core/doc_gen.py

@@ -1,5 +1,6 @@
 import json
 
+
 def gen_doc(template: str, vars: dict) -> str:
     definition = json.loads(open(f"{template}.json").read())
     content = open(f"{template}.html").read()

core/migrations/0001_initial.py

@@ -15,15 +15,30 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Berichtsheft',
+            name="Berichtsheft",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
-                ('year', models.PositiveIntegerField()),
+                    "id",
-                ('week', models.PositiveSmallIntegerField()),
+                    models.BigAutoField(
-                ('content', models.JSONField()),
+                        auto_created=True,
-                ('approved_by', models.JSONField()),
+                        primary_key=True,
-                ('created', models.DateTimeField(auto_now_add=True)),
+                        serialize=False,
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='berichtshefte', to=settings.AUTH_USER_MODEL)),
+                        verbose_name="ID",
+                    ),
+                ),
+                ("year", models.PositiveIntegerField()),
+                ("week", models.PositiveSmallIntegerField()),
+                ("content", models.JSONField()),
+                ("approved_by", models.JSONField()),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="berichtshefte",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
     ]

core/migrations/0002_alter_berichtsheft_id.py

@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0001_initial'),
+        ("core", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='berichtsheft',
+            model_name="berichtsheft",
-            name='id',
+            name="id",
             field=models.AutoField(primary_key=True, serialize=False),
         ),
     ]

core/migrations/0003_group_azureuser_alter_berichtsheft_user.py

@@ -10,54 +10,137 @@ import django.utils.timezone
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
+        ("auth", "0012_alter_user_first_name_max_length"),
-        ('core', '0002_alter_berichtsheft_id'),
+        ("core", "0002_alter_berichtsheft_id"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Group',
+            name="Group",
-            fields=[
+            fields=[],
-            ],
             options={
-                'proxy': True,
+                "proxy": True,
-                'indexes': [],
+                "indexes": [],
-                'constraints': [],
+                "constraints": [],
             },
-            bases=('auth.group',),
+            bases=("auth.group",),
             managers=[
-                ('objects', django.contrib.auth.models.GroupManager()),
+                ("objects", django.contrib.auth.models.GroupManager()),
             ],
         ),
         migrations.CreateModel(
-            name='AzureUser',
+            name="AzureUser",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
-                ('password', models.CharField(max_length=128, verbose_name='password')),
+                    "id",
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                    models.BigAutoField(
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                        auto_created=True,
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                        primary_key=True,
-                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                        serialize=False,
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                        verbose_name="ID",
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                    ),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                (
-                ('groups', models.ManyToManyField(blank=True, related_name='azure_user_groups', to='auth.group')),
+                    "last_login",
-                ('user_permissions', models.ManyToManyField(blank=True, related_name='azure_user_permissions', to='auth.permission')),
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="last login"
+                    ),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        error_messages={
+                            "unique": "A user with that username already exists."
+                        },
+                        help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        max_length=150,
+                        unique=True,
+                        validators=[
+                            django.contrib.auth.validators.UnicodeUsernameValidator()
+                        ],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="first name"
+                    ),
+                ),
+                (
+                    "last_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="last name"
+                    ),
+                ),
+                (
+                    "email",
+                    models.EmailField(
+                        blank=True, max_length=254, verbose_name="email address"
+                    ),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="date joined"
+                    ),
+                ),
+                (
+                    "groups",
+                    models.ManyToManyField(
+                        blank=True, related_name="azure_user_groups", to="auth.group"
+                    ),
+                ),
+                (
+                    "user_permissions",
+                    models.ManyToManyField(
+                        blank=True,
+                        related_name="azure_user_permissions",
+                        to="auth.permission",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'user',
+                "verbose_name": "user",
-                'verbose_name_plural': 'users',
+                "verbose_name_plural": "users",
-                'abstract': False,
+                "abstract": False,
             },
             managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+                ("objects", django.contrib.auth.models.UserManager()),
             ],
         ),
         migrations.AlterField(
-            model_name='berichtsheft',
+            model_name="berichtsheft",
-            name='user',
+            name="user",
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='berichtshefte', to='core.azureuser'),
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="berichtshefte",
+                to="core.azureuser",
+            ),
         ),
     ]

core/migrations/0004_remove_berichtsheft_approved_by.py

@@ -6,12 +6,12 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0003_group_azureuser_alter_berichtsheft_user'),
+        ("core", "0003_group_azureuser_alter_berichtsheft_user"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='berichtsheft',
+            model_name="berichtsheft",
-            name='approved_by',
+            name="approved_by",
         ),
     ]

core/migrations/0005_user_alter_berichtsheft_user_delete_azureuser.py

@@ -9,43 +9,123 @@ import django.utils.timezone
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
+        ("auth", "0012_alter_user_first_name_max_length"),
-        ('core', '0004_remove_berichtsheft_approved_by'),
+        ("core", "0004_remove_berichtsheft_approved_by"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='User',
+            name="User",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
-                ('password', models.CharField(max_length=128, verbose_name='password')),
+                    "id",
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                    models.BigAutoField(
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                        auto_created=True,
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                        primary_key=True,
-                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                        serialize=False,
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                        verbose_name="ID",
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                    ),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                (
-                ('groups', models.ManyToManyField(blank=True, related_name='user_groups', to='auth.group')),
+                    "last_login",
-                ('user_permissions', models.ManyToManyField(blank=True, related_name='user_permissions', to='auth.permission')),
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="last login"
+                    ),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        error_messages={
+                            "unique": "A user with that username already exists."
+                        },
+                        help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        max_length=150,
+                        unique=True,
+                        validators=[
+                            django.contrib.auth.validators.UnicodeUsernameValidator()
+                        ],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="first name"
+                    ),
+                ),
+                (
+                    "last_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="last name"
+                    ),
+                ),
+                (
+                    "email",
+                    models.EmailField(
+                        blank=True, max_length=254, verbose_name="email address"
+                    ),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="date joined"
+                    ),
+                ),
+                (
+                    "groups",
+                    models.ManyToManyField(
+                        blank=True, related_name="user_groups", to="auth.group"
+                    ),
+                ),
+                (
+                    "user_permissions",
+                    models.ManyToManyField(
+                        blank=True,
+                        related_name="user_permissions",
+                        to="auth.permission",
+                    ),
+                ),
             ],
             options={
-                'verbose_name': 'user',
+                "verbose_name": "user",
-                'verbose_name_plural': 'users',
+                "verbose_name_plural": "users",
-                'abstract': False,
+                "abstract": False,
             },
             managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+                ("objects", django.contrib.auth.models.UserManager()),
             ],
         ),
         migrations.AlterField(
-            model_name='berichtsheft',
+            model_name="berichtsheft",
-            name='user',
+            name="user",
             field=models.TextField(),
         ),
         migrations.DeleteModel(
-            name='AzureUser',
+            name="AzureUser",
         ),
     ]

core/migrations/0006_berichtsheft_num.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-12-03 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0005_user_alter_berichtsheft_user_delete_azureuser"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="berichtsheft",
+            name="num",
+            field=models.PositiveBigIntegerField(default=0),
+        ),
+    ]

core/models.py

@@ -2,35 +2,43 @@ from django.db import models
 from django.contrib.auth.models import AbstractUser
 from django.contrib.auth.models import Group as BuiltinGroup
 
+
 class User(AbstractUser):
     groups = models.ManyToManyField(
-        'auth.Group',
+        "auth.Group",
-        related_name='user_groups',
+        related_name="user_groups",
         blank=True,
     )
     user_permissions = models.ManyToManyField(
-        'auth.Permission',
+        "auth.Permission",
-        related_name='user_permissions',
+        related_name="user_permissions",
         blank=True,
     )
 
+
 class Group(BuiltinGroup):
     class Meta:
         proxy = True
 
+
 class Berichtsheft(models.Model):
     id = models.AutoField(primary_key=True)
     user = models.TextField()
+    num = models.PositiveBigIntegerField(default=0)
     year = models.PositiveIntegerField()
     week = models.PositiveSmallIntegerField()
     content = models.JSONField()
     created = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        return f"Berichtsheft: {self.user.username}, Year: {self.year}, Week: {self.week}"
+        return (
+            f"Berichtsheft: {self.user.username}, Year: {self.year}, Week: {self.week}"
+        )
+
 
 class Approval:
     id = models.AutoField(primary_key=True)
     user = models.TextField()
-    report = models.ForeignKey(Berichtsheft, on_delete=models.CASCADE, related_name="report")
+    report = models.ForeignKey(
-
+        Berichtsheft, on_delete=models.CASCADE, related_name="report"
+    )

core/report_templates.py

@@ -0,0 +1,29 @@
+class ReportTemplates:
+    report_global = {
+        "vars": [
+            {"name": "name", "display_name": "Name"},
+            {"name": "num_doc", "display_name": "Berichtsheft Nummer"},
+            {"name": "year", "display_name": "Jahr"},
+            {"name": "week", "display_name": "Kalenderwoche"},
+            {"name": "start_date", "display_name": "Von"},
+            {"name": "end_date", "display_name": "bis"},
+            {"name": "department", "display_name": "Abteilung"},
+        ]
+    }
+
+    def get_template(id) -> dict:
+        match id:
+            case "weekly":
+                weekly = {
+                    "vars": [
+                        {
+                            "name": "company_text",
+                            "display_name": "Betriebliche Tätigkeiten",
+                        },
+                        {"name": "week_topic", "display_name": "Thema der Woche"},
+                        {"name": "school_text", "display_name": "Berufsschule"},
+                    ]
+                }
+
+                weekly["vars"].extend(ReportTemplates.report_global["vars"])
+                return weekly

core/templates/write.html

@@ -21,13 +21,29 @@
             value = "{{ year }}"
              {% endif %}
 
+             {% if var.name == "start_date" %}
+             value = "{{ start_date|date:"d.m.Y" }}"
+             {% endif %}
 
+             {% if var.name == "end_date" %}
+             value = "{{ end_date|date:"d.m.Y" }}"
+             {% endif %}
+
+             {% if var.name == "num_doc" %}
+             value = "{{ current_num }}"
+             {% endif %}
+
+             {% if var.name == "name" %}
+             value = "{{ user.display_name }}"
+        {% endif %}
 
             > 
         </div>
         {% endfor %}
 
         <button> Submit </button>
+
+        {% csrf_token %}
     </form>
 
     </body>

core/urls.py

@@ -2,7 +2,7 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.index, name='index'),
+    path("", views.index, name="index"),
-    path('write', views.write_new_report, name='write'),
+    path("write", views.write_new_report, name="write"),
-    path("test", views.test, name="test")
+    path("test", views.test, name="test"),
 ]

core/util.py

@@ -0,0 +1,32 @@
+import datetime
+
+
+def next_date(year: int, week: int) -> (int, int):
+    if week >= 52:
+        return (year + 1, 1)
+    else:
+        return (year, week + 1)
+
+
+def first_day_of_iso_week(year, week):
+    # Create a date object for January 4th of the given year
+    # This date is always in the first week of the year according to ISO 8601
+    jan4 = datetime.datetime(year, 1, 4)
+
+    # Get the ISO week number and the weekday of January 4th
+    start_iso_week, start_iso_day = jan4.isocalendar()[1:3]
+
+    # Calculate the difference in weeks, then adjust for the start of the week
+    weeks_diff = week - start_iso_week
+    days_to_monday = datetime.timedelta(days=(1 - start_iso_day))
+
+    # Calculate the first day of the given ISO week
+    return jan4 + days_to_monday + datetime.timedelta(weeks=weeks_diff)
+
+
+def get_week_range(p_year, p_week):
+    firstdayofweek = datetime.datetime.strptime(
+        f"{p_year}-W{int(p_week)}-1", "%Y-W%W-%w"
+    ).date()
+    lastdayofweek = firstdayofweek + datetime.timedelta(days=6.9)
+    return firstdayofweek, lastdayofweek

core/views.py

@@ -1,47 +1,59 @@
 from django.shortcuts import render
+
+from core.report_templates import ReportTemplates
+from core.util import get_week_range, next_date
 from .azure_auth import AzureUser
 from .models import Berichtsheft
 import datetime
-import json
 
 # Create your views here.
 
-def next_date(year: int, week: int) -> (int, int):
-    if week >= 52:
-        return (year + 1, 1)
-    else:
-        return (year, week + 1)
 
 def write_new_report(request):
     user = AzureUser(request)
 
     # TODO : Get template for user
-    definition = json.loads(open("report_weekly.json").read())
+    definition = ReportTemplates.get_template("weekly")
 
     # Get the latest year and week
-    latest = Berichtsheft.objects.filter(user=user).order_by('-year', '-week').first()
+    latest = user.reports().order_by("-year", "-week").first()
     if latest is not None:
         current_year, current_week = next_date(latest.year, latest.week)
     else:
         current_year, current_week, _ = datetime.datetime.today().isocalendar()
 
-    # Get cookies for persistent saves
+    start_date, end_date = get_week_range(current_year, current_week)
 
+    if latest is not None:
+        current_num = latest.num + 1
+    else:
+        current_num = 1
+
+    # TODO : Cookies for persistent saves
+
+    return render(
+        request,
+        "write.html",
+        {
+            "user": user,
+            "year": current_year,
+            "week": current_week,
+            "start_date": start_date,
+            "end_date": end_date,
+            "current_num": current_num,
+            "definition": definition,
+        },
+    )
 
-    return render(request, "write.html", {
-        "user": user,
-        "year": current_year,
-        "week": current_week,
-        "definition": definition
-    })
 
 def index(request):
     user = AzureUser(request)
 
     # Get all berichtshefte
-    all_reports = Berichtsheft.objects.filter(user=user)
+    all_reports = user.reports()
 
     return render(request, "index.html", {"user": user, "reports": all_reports})
 
+
 def test(request):
     return render(request, "test.html", {})

manage.py

@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'azube.settings')
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "azube.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -18,5 +18,5 @@ def main():
     execute_from_command_line(sys.argv)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

report_weekly.json

@@ -1,44 +0,0 @@
-{
-    "vars": [
-        {
-            "name": "name",
-            "display_name": "Name"
-        },
-        {
-            "name": "num_doc",
-            "display_name": "Berichtsheft Nummer"
-        },
-        {
-            "name": "year",
-            "display_name": "Jahr"
-        },
-        {
-            "name": "week",
-            "display_name": "Kalenderwoche"
-        },
-        {
-            "name": "start_date",
-            "display_name": "Von"
-        },
-        {
-            "name": "end_date",
-            "display_name": "bis"
-        },
-        {
-            "name": "department",
-            "display_name": "Abteilung"
-        },
-        {
-            "name": "company_text",
-            "display_name": "Betriebliche Tätigkeiten"
-        },
-        {
-            "name": "week_topic",
-            "display_name": "Thema der Woche"
-        },
-        {
-            "name": "school_text",
-            "display_name": "Berufsschule"
-        }
-    ]
-}