Added study_groups

stude/student_status/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-27 09:44
+# Generated by Django 4.2.2 on 2023-06-27 13:08
 
 from django.conf import settings
 from django.db import migrations, models

stude/student_status/migrations/0002_initial.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.2 on 2023-06-27 13:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('study_groups', '0001_initial'),
+        ('student_status', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='studentstatus',
+            name='study_group',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='study_groups.studygroup'),
+        ),
+    ]

stude/student_status/migrations/0003_alter_studentstatus_subject.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.2 on 2023-06-27 13:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('subjects', '0001_initial'),
+        ('student_status', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='studentstatus',
+            name='subject',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='subjects.subject'),
+        ),
+    ]

stude/student_status/models.py

@@ -1,26 +1,18 @@
 from django.db import models
 from accounts.models import CustomUser
+from study_groups.models import StudyGroup
 
 # Create your models here.
 
 
 class StudentStatus(models.Model):
-    YEAR_LEVELS = (
-        ('1st', '1st year'),
-        ('2nd', '2nd year'),
-        ('3rd', '3rd year'),
-        ('4th', '4th year'),
-        ('5th', '5th Year'),
-        ('Irreg', 'Irregular'),
-    )
-    SEMESTERS = (
-        ('1st', '1st semester'),
-        ('2nd', '2nd semester'),
-    )
     user = models.OneToOneField(
         CustomUser, on_delete=models.CASCADE, primary_key=True)
     x = models.FloatField(null=True)
     y = models.FloatField(null=True)
-    subject = models.CharField(max_length=100, null=True)
+    subject = models.ForeignKey(
+        'subjects.Subject', on_delete=models.CASCADE, null=True)
     active = models.BooleanField(default=False)
     timestamp = models.DateField(auto_now_add=True)
+    study_group = models.ForeignKey(
+        StudyGroup, on_delete=models.SET_NULL, null=True)