Jadyn/accessible theme

src/crowdprinter/admin.py

@@ -1,10 +1,12 @@
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
 from django.utils.html import format_html
 
 from .models import PrintAttempt
 from .models import Printer
 from .models import PrintJob
 from .models import PrintJobFile
+from .models import User
 
 
 @admin.register(Printer)
@@ -61,3 +63,8 @@ def job_link(self, obj):
 
     job_link.admin_order_field = "job"
     job_link.short_description = "job"
+
+
+@admin.register(User)
+class UserAdmin(UserAdmin):
+    fieldsets = UserAdmin.fieldsets + ((None, {"fields": ("max_attempts",)}),)

src/crowdprinter/migrations/0001_initial.py

@@ -1,6 +1,9 @@
-# Generated by Django 2.1.5 on 2019-01-26 12:10
+# Generated by Django 5.1.2 on 2024-12-09 17:17
 
+import django.contrib.auth.models
+import django.contrib.auth.validators
 import django.db.models.deletion
+import django.utils.timezone
 from django.conf import settings
 from django.db import migrations
 from django.db import models
@@ -11,10 +14,145 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("auth", "0012_alter_user_first_name_max_length"),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name="Printer",
+            fields=[
+                ("slug", models.SlugField(primary_key=True, serialize=False)),
+                ("name", models.CharField(max_length=64)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="PrintJob",
+            fields=[
+                ("slug", models.SlugField(primary_key=True, serialize=False)),
+                ("file_stl", models.FileField(blank=True, null=True, upload_to="")),
+                ("file_render", models.FileField(null=True, upload_to="")),
+                (
+                    "priority",
+                    models.PositiveIntegerField(
+                        default=100,
+                        help_text="Zahl von 0 bis 100. Jobs mit kleinen Zahlen werden weiter oben angezeigt.",
+                    ),
+                ),
+                ("count_needed", models.PositiveIntegerField(default=1)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="User",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "last_login",
+                    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,
+                        help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+                        related_name="user_set",
+                        related_query_name="user",
+                        to="auth.group",
+                        verbose_name="groups",
+                    ),
+                ),
+                (
+                    "user_permissions",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="Specific permissions for this user.",
+                        related_name="user_set",
+                        related_query_name="user",
+                        to="auth.permission",
+                        verbose_name="user permissions",
+                    ),
+                ),
+            ],
+            options={
+                "db_table": "auth_user",
+            },
+            managers=[
+                ("objects", django.contrib.auth.models.UserManager()),
+            ],
+        ),
         migrations.CreateModel(
             name="PrintAttempt",
             fields=[
@@ -28,31 +166,55 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("started", models.DateField(auto_now_add=True)),
-                ("finished", models.DateField(blank=True, null=True)),
+                ("ended", models.DateField(blank=True, null=True)),
+                ("finished", models.BooleanField(default=False)),
+                ("dropped_off", models.BooleanField(default=False)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "job",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="attempts",
+                        to="crowdprinter.printjob",
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name="PrintJob",
+            name="PrintJobFile",
             fields=[
-                ("slug", models.SlugField(primary_key=True, serialize=False)),
-                ("stl", models.FileField(upload_to="")),
-                ("render", models.FileField(null=True, upload_to="")),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("file_3mf", models.FileField(blank=True, null=True, upload_to="")),
+                ("file_gcode", models.FileField(upload_to="")),
+                (
+                    "job",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="files",
+                        to="crowdprinter.printjob",
+                    ),
+                ),
+                (
+                    "printer",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="crowdprinter.printer",
+                    ),
+                ),
             ],
         ),
-        migrations.AddField(
-            model_name="printattempt",
-            name="job",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="attempts",
-                to="crowdprinter.PrintJob",
-            ),
-        ),
-        migrations.AddField(
-            model_name="printattempt",
-            name="user",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
-            ),
-        ),
     ]

src/crowdprinter/migrations/0002_user_max_attempts.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.2 on 2024-12-09 17:59
+
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("crowdprinter", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="max_attempts",
+            field=models.IntegerField(
+                blank=True,
+                help_text="Maximale anzahl gleichzeitiger Drucke. 0 für unbegrenzt, leer = Default(3)",
+                null=True,
+            ),
+        ),
+    ]