From a9871076982bf7fd606685521889bbd08863dd7e Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 6 Oct 2024 14:44:13 +0200
Subject: [PATCH] Fix subject model
---
.../0022_alter_comparisonresult_subject.py | 20 +++++++++++++++++++
aleksis/apps/evalu/models.py | 2 +-
fixtures/v1.yaml | 4 ++--
pyproject.toml | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 aleksis/apps/evalu/migrations/0022_alter_comparisonresult_subject.py
diff --git a/aleksis/apps/evalu/migrations/0022_alter_comparisonresult_subject.py b/aleksis/apps/evalu/migrations/0022_alter_comparisonresult_subject.py
new file mode 100644
index 0000000..c8fac8f
--- /dev/null
+++ b/aleksis/apps/evalu/migrations/0022_alter_comparisonresult_subject.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.1.1 on 2024-10-06 12:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('cursus', '0004_alter_subject_colour_bg_alter_subject_colour_fg_and_more'),
+ ('evalu', '0021_evaluationgroup_finished_evaluationgroup_finished_at'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='comparisonresult',
+ name='subject',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='evalu_results', to='cursus.subject', verbose_name='Subject'),
+ ),
+ ]
diff --git a/aleksis/apps/evalu/models.py b/aleksis/apps/evalu/models.py
index 65843b8..4b99078 100644
--- a/aleksis/apps/evalu/models.py
+++ b/aleksis/apps/evalu/models.py
@@ -17,7 +17,7 @@ from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric import padding, rsa
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey
-from aleksis.apps.chronos.models import Subject
+from aleksis.apps.cursus.models import Subject
from aleksis.apps.evalu.managers import (
EvaluationGroupManager,
EvaluationGroupQuerySet,
diff --git a/fixtures/v1.yaml b/fixtures/v1.yaml
index 0c8540a..20574d7 100644
--- a/fixtures/v1.yaml
+++ b/fixtures/v1.yaml
@@ -257,13 +257,13 @@
first_name: Student
last_name: C
email: student.C@example.com
-- model: chronos.subject
+- model: cursus.subject
pk: 1
fields:
site: 1
short_name: Mu
name: Music
-- model: chronos.subject
+- model: cursus.subject
pk: 2
fields:
site: 1
diff --git a/pyproject.toml b/pyproject.toml
index 99d6b48..787656d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-EvaLU"
-version = "3.0.0.dev0"
+version = "3.0.0.dev1"
packages = [
{ include = "aleksis" }
]
--
GitLab