Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit e7a4cad

Browse files
Thibaud-CollynThibaud-Collyn
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 3d3e7a6 + bfc9268 commit e7a4cad

File tree

7 files changed

+73
-170
lines changed

7 files changed

+73
-170
lines changed

‎backend/pigeonhole/apps/courses/migrations/0001_initial.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# Generated by Django 4.2.11 on 2024-04-01 15:13
1+
# Generated by Django 4.2.11 on 2024-04-08 14:52
22

33
from django.db import migrations, models
44

55

66
class Migration(migrations.Migration):
7-
87
initial = True
98

109
dependencies = [

‎backend/pigeonhole/apps/groups/migrations/0001_initial.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# Generated by Django 4.2.11 on 2024-04-01 15:13
1+
# Generated by Django 4.2.11 on 2024-04-08 14:52
22

33
from django.db import migrations, models
44
import django.db.models.deletion
55

66

77
class Migration(migrations.Migration):
8-
98
initial = True
109

1110
dependencies = [

‎backend/pigeonhole/apps/groups/migrations/0002_initial.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# Generated by Django 4.2.11 on 2024-04-01 15:13
1+
# Generated by Django 4.2.11 on 2024-04-08 14:52
22

33
from django.conf import settings
44
from django.db import migrations, models
55

66

77
class Migration(migrations.Migration):
8-
98
initial = True
109

1110
dependencies = [

‎backend/pigeonhole/apps/projects/migrations/0001_initial.py

+8-17
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
# Generated by Django 4.2.11 on 2024-04-01 15:13
1+
# Generated by Django 4.2.11 on 2024-04-08 14:52
22

33
from django.db import migrations, models
44
import django.db.models.deletion
55

66

77
class Migration(migrations.Migration):
8-
98
initial = True
109

1110
dependencies = [
@@ -16,8 +15,7 @@ class Migration(migrations.Migration):
1615
migrations.CreateModel(
1716
name='Project',
1817
fields=[
19-
('project_id', models.BigAutoField(primary_key=True,
20-
serialize=False)),
18+
('project_id', models.BigAutoField(primary_key=True, serialize=False)),
2119
('name', models.CharField(max_length=256)),
2220
('description', models.TextField()),
2321
('deadline', models.DateTimeField()),
@@ -26,25 +24,18 @@ class Migration(migrations.Migration):
2624
('number_of_groups', models.IntegerField(default=5)),
2725
('group_size', models.IntegerField(default=1)),
2826
('file_structure', models.CharField(max_length=1024, null=True)),
29-
('course_id', models.ForeignKey(
30-
on_delete=django.db.models.deletion.CASCADE,
31-
to='courses.course')),
27+
('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.course')),
3228
],
3329
),
3430
migrations.CreateModel(
3531
name='Test',
3632
fields=[
37-
('project_id',
38-
models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
39-
primary_key=True, serialize=False,
40-
to='projects.project')),
33+
('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True,
34+
serialize=False, to='projects.project')),
4135
('test_nr', models.IntegerField()),
42-
('test_file_type',
43-
models.FileField(max_length=255,
44-
null=True,
45-
upload_to='uploads/projects/<django.db.'
46-
'models.fields.related.ForeignKey>/'
47-
'<django.db.models.fields.IntegerField>')),
36+
('test_file_type', models.FileField(max_length=255, null=True,
37+
upload_to='uploads/projects/<django.db.models.fields.related.'
38+
'ForeignKey>/<django.db.models.fields.IntegerField>')),
4839
],
4940
),
5041
]

‎backend/pigeonhole/apps/submissions/migrations/0001_initial.py

+17-40
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,33 @@
1-
# Generated by Django 4.2.11 on 2024-04-01 15:13
1+
# Generated by Django 4.2.11 on 2024-04-08 14:52
22

3-
import backend.pigeonhole.apps.submissions.models
4-
from django.db import migrations, models
53
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
import backend.pigeonhole.apps.submissions.models
67

78

89
class Migration(migrations.Migration):
910
initial = True
1011

1112
dependencies = [
12-
("groups", "0001_initial"),
13+
('groups', '0001_initial'),
1314
]
1415

1516
operations = [
1617
migrations.CreateModel(
17-
name="Submissions",
18+
name='Submissions',
1819
fields=[
19-
(
20-
"submission_id",
21-
models.BigAutoField(primary_key=True, serialize=False),
22-
),
23-
("submission_nr", models.IntegerField(blank=True)),
24-
(
25-
"file",
26-
models.FileField(
27-
max_length=255,
28-
null=True,
29-
upload_to=backend.
30-
pigeonhole.apps.submissions.models.get_upload_to,
31-
),
32-
),
33-
("timestamp", models.DateTimeField(auto_now_add=True)),
34-
(
35-
"output_test",
36-
models.FileField(
37-
blank=True,
38-
max_length=255,
39-
null=True,
40-
upload_to="uploads/submissions/outputs/"
41-
"<django.db.models.fields.related.Foreign"
42-
"Key>/<django.db.models.fields.Integer"
43-
"Field>/output_test/",
44-
),
45-
),
46-
(
47-
"group_id",
48-
models.ForeignKey(
49-
blank=True,
50-
on_delete=django.db.models.deletion.CASCADE,
51-
to="groups.group",
52-
),
53-
),
20+
('submission_id', models.BigAutoField(primary_key=True, serialize=False)),
21+
('submission_nr', models.IntegerField(blank=True)),
22+
('file', models.FileField(max_length=255, null=True,
23+
upload_to=backend.pigeonhole.apps.submissions.models.get_upload_to)),
24+
('timestamp', models.DateTimeField(auto_now_add=True)),
25+
('output_test', models.FileField(blank=True, max_length=255, null=True,
26+
upload_to='uploads/submissions/outputs/<django.db.models.fields.'
27+
'related.ForeignKey>/<django.db.models.fields.'
28+
'IntegerField>/output_test/')),
29+
('group_id',
30+
models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='groups.group')),
5431
],
5532
),
5633
]

‎backend/pigeonhole/apps/users/migrations/0001_initial.py

+43-107
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.11 on 2024-04-01 15:13
1+
# Generated by Django 4.2.11 on 2024-04-08 14:52
22

33
import django.contrib.auth.models
44
import django.contrib.auth.validators
@@ -10,121 +10,57 @@ class Migration(migrations.Migration):
1010
initial = True
1111

1212
dependencies = [
13-
("courses", "0001_initial"),
14-
("auth", "0012_alter_user_first_name_max_length"),
13+
('courses', '0001_initial'),
14+
('auth', '0012_alter_user_first_name_max_length'),
1515
]
1616

1717
operations = [
1818
migrations.CreateModel(
19-
name="User",
19+
name='User',
2020
fields=[
21-
("password", models.CharField(max_length=128,
22-
verbose_name="password")),
23-
(
24-
"last_login",
25-
models.DateTimeField(
26-
blank=True, null=True, verbose_name="last login"
27-
),
28-
),
29-
(
30-
"is_superuser",
31-
models.BooleanField(
32-
default=False,
33-
help_text="Designates that this user has all"
34-
"permissions without explicitly assigning them.",
35-
verbose_name="superuser status",
36-
),
37-
),
38-
(
39-
"username",
40-
models.CharField(
41-
error_messages={
42-
"unique": "A user with that "
43-
"username already exists."
44-
},
45-
help_text="Required. 150 characters or"
46-
" fewer. Letters, digits and @/./+/-/_ only.",
47-
max_length=150,
48-
unique=True,
49-
validators=[
50-
django.contrib.auth.
51-
validators.UnicodeUsernameValidator()
52-
],
53-
verbose_name="username",
54-
),
55-
),
56-
(
57-
"is_staff",
58-
models.BooleanField(
59-
default=False,
60-
help_text="Designates whether the user "
61-
"can log into this admin site.",
62-
verbose_name="staff status",
63-
),
64-
),
65-
(
66-
"is_active",
67-
models.BooleanField(
68-
default=True,
69-
help_text="Designates whether this user should be "
70-
"treated as active. Unselect this instead of"
71-
" deleting accounts.",
72-
verbose_name="active",
73-
),
74-
),
75-
(
76-
"date_joined",
77-
models.DateTimeField(
78-
default=django.utils.timezone.now,
79-
verbose_name="date joined"
80-
),
81-
),
82-
("id", models.BigAutoField(primary_key=True, serialize=False)),
83-
("email", models.EmailField(max_length=254, unique=True)),
84-
("first_name", models.CharField(max_length=30)),
85-
("last_name", models.CharField(max_length=150)),
86-
(
87-
"role",
88-
models.IntegerField(
89-
choices=[(1, "Admin"), (2, "Teacher"), (3, "Student")],
90-
default=3,
91-
),
92-
),
93-
("course", models.ManyToManyField(blank=True,
94-
to="courses.course")),
95-
(
96-
"groups",
97-
models.ManyToManyField(
98-
blank=True,
99-
help_text="The groups this user belongs to. A user "
100-
"will get all permissions granted to"
101-
" each of their groups.",
102-
related_name="user_set",
103-
related_query_name="user",
104-
to="auth.group",
105-
verbose_name="groups",
106-
),
107-
),
108-
(
109-
"user_permissions",
110-
models.ManyToManyField(
111-
blank=True,
112-
help_text="Specific permissions for this user.",
113-
related_name="user_set",
114-
related_query_name="user",
115-
to="auth.permission",
116-
verbose_name="user permissions",
117-
),
118-
),
21+
('password', models.CharField(max_length=128, verbose_name='password')),
22+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
23+
('is_superuser', models.BooleanField(default=False,
24+
help_text='Designates that this user has all permissions '
25+
'without explicitly assigning them.',
26+
verbose_name='superuser status')),
27+
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'},
28+
help_text='Required. 150 characters or fewer. Letters, digits '
29+
'and @/./+/-/_ only.',
30+
max_length=150, unique=True,
31+
validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
32+
verbose_name='username')),
33+
('is_staff', models.BooleanField(default=False,
34+
help_text='Designates whether the user can log into this admin site.',
35+
verbose_name='staff status')),
36+
('is_active', models.BooleanField(default=True,
37+
help_text='Designates whether this user should be treated as active. '
38+
'Unselect this instead of deleting accounts.',
39+
verbose_name='active')),
40+
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
41+
('id', models.BigAutoField(primary_key=True, serialize=False)),
42+
('email', models.EmailField(max_length=254, unique=True)),
43+
('first_name', models.CharField(max_length=30)),
44+
('last_name', models.CharField(max_length=150)),
45+
('role', models.IntegerField(choices=[(1, 'Admin'), (2, 'Teacher'), (3, 'Student')], default=3)),
46+
('course', models.ManyToManyField(blank=True, to='courses.course')),
47+
('groups', models.ManyToManyField(blank=True,
48+
help_text='The groups this user belongs to. A user will get all '
49+
'permissions granted to each of their groups.',
50+
related_name='user_set', related_query_name='user', to='auth.group',
51+
verbose_name='groups')),
52+
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.',
53+
related_name='user_set', related_query_name='user',
54+
to='auth.permission', verbose_name='user permissions')),
11955
],
12056
options={
121-
"verbose_name": "user",
122-
"verbose_name_plural": "users",
123-
"db_table": "auth_user",
124-
"abstract": False,
57+
'verbose_name': 'user',
58+
'verbose_name_plural': 'users',
59+
'db_table': 'auth_user',
60+
'abstract': False,
12561
},
12662
managers=[
127-
("objects", django.contrib.auth.models.UserManager()),
63+
('objects', django.contrib.auth.models.UserManager()),
12864
],
12965
),
13066
]

‎scripts/mockdata.py

+2
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ def run():
214214
name='SELab 2 project',
215215
course_id=course_5,
216216
deadline='2021-12-12 12:12:14',
217+
visible=True,
217218
number_of_groups=1,
218219
group_size=8
219220
)
@@ -222,6 +223,7 @@ def run():
222223
name='AI project',
223224
course_id=course_1,
224225
deadline='2021-12-12 12:12:14',
226+
visible=True,
225227
number_of_groups=4,
226228
group_size=2
227229
)

0 commit comments

Comments
 (0)