keannu125/StudE-Backend
1
0
Fork 0
mirror of https://github.com/lemeow125/StudE-Backend.git synced 2025-06-28 16:25:44 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Overhauled the entire subjects app to be more simplified and to remove anomalies when filtering in queries

Browse source
This commit is contained in:
Keannu Christian Bernasol 2023-07-26 12:14:19 +08:00
parent 4b82ffbbc2
commit 0eff07a1ae
25 changed files with 122 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

9
stude/accounts/migrations/0001_initial.py
View file

@ -1,9 +1,10 @@
# Generated by Django 4.2.3 on 2023-07-18 07:43
# Generated by Django 4.2.3 on 2023-07-26 03:53
import accounts.models
import django.contrib.auth.models
import django.contrib.auth.validators
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
@ -12,6 +13,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('courses', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'),
('semesters', '0001_initial'),
]
operations = [
@ -34,6 +38,9 @@ class Migration(migrations.Migration):
('is_banned', models.BooleanField(default=False)),
('student_id_number', models.CharField(max_length=16, validators=[accounts.models.validate_student_id])),
('avatar', models.ImageField(null=True, upload_to=accounts.models.CustomUser._get_upload_to)),
('course', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='courses.course')),
('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')),
('semester', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='semesters.semester')),
],
options={
'verbose_name': 'user',

25
stude/accounts/migrations/0002_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.3 on 2023-07-18 07:43
# Generated by Django 4.2.3 on 2023-07-26 03:53
from django.db import migrations, models
import django.db.models.deletion
@ -9,34 +9,17 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('auth', '0012_alter_user_first_name_max_length'),
('year_levels', '0001_initial'),
('accounts', '0001_initial'),
('semesters', '0001_initial'),
('courses', '0002_initial'),
('subjects', '0001_initial'),
('accounts', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'),
]
operations = [
migrations.AddField(
model_name='customuser',
name='course',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='courses.course'),
),
migrations.AddField(
model_name='customuser',
name='groups',
field=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'),
),
migrations.AddField(
model_name='customuser',
name='semester',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='semesters.semester'),
),
migrations.AddField(
model_name='customuser',
name='subjects',
field=models.ManyToManyField(to='subjects.subject'),
field=models.ManyToManyField(to='subjects.subjectinstance'),
),
migrations.AddField(
model_name='customuser',

2
stude/accounts/models.py
View file

@ -53,7 +53,7 @@ class CustomUser(AbstractUser):
on_delete=models.SET_NULL,
null=True
)
subjects = models.ManyToManyField('subjects.Subject')
subjects = models.ManyToManyField('subjects.SubjectInstance')
@property
def full_name(self):