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

Commit 97a4f9e

Browse files
committed
Submissions can now contain a file with the output of the tests
1 parent 5fab977 commit 97a4f9e

File tree

8 files changed

+47
-15
lines changed

8 files changed

+47
-15
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.0.2 on 2024-03-02 20:15
1+
# Generated by Django 5.0.2 on 2024-03-02 21:03
22

33
from django.db import migrations, models
44

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.0.2 on 2024-03-02 20:15
1+
# Generated by Django 5.0.2 on 2024-03-02 21:03
22

33
import django.db.models.deletion
44
from django.db import migrations, models
@@ -17,6 +17,8 @@ class Migration(migrations.Migration):
1717
fields=[
1818
('group_id', models.BigAutoField(primary_key=True, serialize=False)),
1919
('group_nr', models.IntegerField()),
20+
('feedback', models.TextField(null=True)),
21+
('final_score', models.IntegerField()),
2022
('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.project')),
2123
],
2224
),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.0.2 on 2024-03-02 20:15
1+
# Generated by Django 5.0.2 on 2024-03-02 21:03
22

33
from django.db import migrations, models
44

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.0.2 on 2024-03-02 20:15
1+
# Generated by Django 5.0.2 on 2024-03-02 21:03
22

33
import django.db.models.deletion
44
from django.db import migrations, models
@@ -19,8 +19,6 @@ class Migration(migrations.Migration):
1919
('name', models.CharField(max_length=256)),
2020
('description', models.TextField()),
2121
('visible', models.BooleanField(default=False)),
22-
('feedback', models.TextField(null=True)),
23-
('final_score', models.IntegerField()),
2422
('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.course')),
2523
],
2624
),

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.0.2 on 2024-03-02 20:15
1+
# Generated by Django 5.0.2 on 2024-03-02 21:03
22

33
import django.db.models.deletion
44
from django.db import migrations, models
@@ -21,6 +21,9 @@ class Migration(migrations.Migration):
2121
upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models.fields'
2222
'.IntegerField>/')),
2323
('timestamp', models.DateTimeField(auto_now_add=True)),
24+
('output_test', models.FileField(
25+
upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models.fields'
26+
'.IntegerField>/output_test/')),
2427
('group_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.group')),
2528
],
2629
),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Generated by Django 5.0.2 on 2024-03-02 21:07
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
dependencies = [
8+
('submissions', '0001_initial'),
9+
]
10+
11+
operations = [
12+
migrations.AlterField(
13+
model_name='submissions',
14+
name='file',
15+
field=models.FileField(null=True,
16+
upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models'
17+
'.fields.IntegerField>/'),
18+
),
19+
migrations.AlterField(
20+
model_name='submissions',
21+
name='output_test',
22+
field=models.FileField(null=True,
23+
upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models'
24+
'.fields.IntegerField>/output_test/'),
25+
),
26+
]

backend/pigeonhole/apps/submissions/models.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ class Submissions(models.Model):
99
submission_id = models.BigAutoField(primary_key=True)
1010
group_id = models.ForeignKey(Group, on_delete=models.CASCADE, blank=False)
1111
submission_nr = models.IntegerField()
12-
file = models.FileField(upload_to='uploads/' + str(group_id) + '/' + str(submission_nr) + '/')
12+
file = models.FileField(upload_to='uploads/' + str(group_id) + '/' + str(submission_nr) + '/',
13+
null=True, blank=False)
1314
timestamp = models.DateTimeField(auto_now_add=True)
15+
output_test = models.FileField(upload_to='uploads/' + str(group_id) + '/' + str(submission_nr) + '/output_test/',
16+
null=True, blank=False)
1417

1518
objects = models.Manager()
1619

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.0.2 on 2024-03-02 20:15
1+
# Generated by Django 5.0.2 on 2024-03-02 21:03
22

33
import django.contrib.auth.models
44
import django.contrib.auth.validators
@@ -24,12 +24,12 @@ class Migration(migrations.Migration):
2424
('password', models.CharField(max_length=128, verbose_name='password')),
2525
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
2626
('is_superuser', models.BooleanField(default=False,
27-
help_text='Designates that this user has all '
28-
'permissions without explicitly assigning them.',
27+
help_text='Designates that this user has all permissions '
28+
'without explicitly assigning them.',
2929
verbose_name='superuser status')),
3030
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'},
31-
help_text='Required. 150 characters or '
32-
'fewer. Letters, digits and @/./+/-/_ only.',
31+
help_text='Required. 150 characters or fewer. Letters, digits '
32+
'and @/./+/-/_ only.',
3333
max_length=150, unique=True,
3434
validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
3535
verbose_name='username')),
@@ -40,8 +40,8 @@ class Migration(migrations.Migration):
4040
help_text='Designates whether the user can log into this admin site.',
4141
verbose_name='staff status')),
4242
('is_active', models.BooleanField(default=True,
43-
help_text='Designates whether this user should be treated as '
44-
'active. Unselect this instead of deleting accounts.',
43+
help_text='Designates whether this user should be treated as active. '
44+
'Unselect this instead of deleting accounts.',
4545
verbose_name='active')),
4646
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
4747
('groups', models.ManyToManyField(blank=True,

0 commit comments

Comments
 (0)