Updated models to include new fields

housewars/migrations/0020_teacher.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.0.4 on 2022-08-30 14:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('housewars', '0019_alter_pointsentry_comment'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Teacher',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=100)),
+                ('last_name', models.CharField(max_length=100)),
+                ('grade', models.IntegerField(choices=[(9, '9th/Freshman'), (10, '10th/Sophomore'), (11, '11th/Junior'), (12, '12th/Senior')])),
+                ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='housewars.activity')),
+                ('house', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='housewars.house')),
+            ],
+        ),
+    ]

housewars/migrations/0021_alter_teacher_activity_alter_teacher_house.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.4 on 2022-08-30 21:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('housewars', '0020_teacher'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='teacher',
+            name='activity',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.DO_NOTHING, to='housewars.activity'),
+        ),
+        migrations.AlterField(
+            model_name='teacher',
+            name='house',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='housewars.house'),
+        ),
+    ]

housewars/migrations/0022_alter_teacher_activity_alter_teacher_house.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.4 on 2022-08-30 22:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('housewars', '0021_alter_teacher_activity_alter_teacher_house'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='teacher',
+            name='activity',
+            field=models.OneToOneField(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='activity', to='housewars.activity'),
+        ),
+        migrations.AlterField(
+            model_name='teacher',
+            name='house',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='house', to='housewars.house'),
+        ),
+    ]

housewars/migrations/0023_alter_teacher_activity_alter_teacher_house.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.4 on 2022-08-30 22:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('housewars', '0022_alter_teacher_activity_alter_teacher_house'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='teacher',
+            name='activity',
+            field=models.OneToOneField(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='teacher', to='housewars.activity'),
+        ),
+        migrations.AlterField(
+            model_name='teacher',
+            name='house',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='teacher', to='housewars.house'),
+        ),
+    ]

housewars/migrations/0024_remove_pointsentry_comment_pointsentry_password.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.0.4 on 2022-08-31 02:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('housewars', '0023_alter_teacher_activity_alter_teacher_house'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='pointsentry',
+            name='comment',
+        ),
+        migrations.AddField(
+            model_name='pointsentry',
+            name='password',
+            field=models.CharField(blank=True, default=None, max_length=15, null=True),
+        ),
+    ]

housewars/models/PointsEntry.py

@@ -10,7 +10,8 @@ class PointsEntry(models.Model):
     activity = models.ForeignKey(Activity, on_delete=models.CASCADE)
     house = models.ForeignKey(House, on_delete=models.CASCADE)
     points = models.IntegerField(default=0)
-    comment = models.TextField(blank=True, default='')
+    password = models.CharField(
+        max_length=15, default=None, blank=True, null=True)
 
     def save(self, *args, **kwargs):
         self.full_clean()

housewars/models/Teacher.py

@@ -0,0 +1,26 @@
+from django.db import models
+from . import House, Activity
+
+
+class Teacher(models.Model):
+    GradeChoices = (
+        (9, '9th/Freshman'),
+        (10, '10th/Sophomore'),
+        (11, '11th/Junior'),
+        (12, '12th/Senior'),
+    )
+
+    first_name = models.CharField(max_length=100)
+    last_name = models.CharField(max_length=100)
+    house = models.ForeignKey(
+        House, related_name='teacher', default=None, blank=True, null=True, on_delete=models.SET_NULL)
+    grade = models.IntegerField(choices=GradeChoices)
+    activity = models.OneToOneField(
+        Activity, related_name='teacher', default=None, blank=True, null=True, on_delete=models.SET_NULL)
+
+    def __str__(self):
+        return f"{self.first_name} {self.last_name}"
+
+    def save(self, *args, **kwargs):
+        self.full_clean()
+        return super().save(*args, **kwargs)

housewars/models/__init__.py

@@ -1,4 +1,5 @@
 from .Activity import Activity
 from .House import House
+from .Teacher import Teacher
 from .PointsEntry import PointsEntry
 from .UserEntry import UserEntry