Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
26fd434f
Commit
26fd434f
authored
4 years ago
by
Jakob Dieterle
Committed by
Jakob Dieterle
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
exams now manytomany field, problems resolved
parent
7e9264d1
No related branches found
Branches containing commit
No related tags found
1 merge request
!244
Resolve "Make exam a many to many field on StudentInfo model"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/models/student_info.py
+22
-0
22 additions, 0 deletions
core/models/student_info.py
core/serializers/student.py
+5
-0
5 additions, 0 deletions
core/serializers/student.py
with
27 additions
and
0 deletions
core/models/student_info.py
+
22
−
0
View file @
26fd434f
...
...
@@ -26,6 +26,7 @@ def random_matrikel_no() -> str:
return
str
(
10_000_000
+
randrange
(
90_000_000
))
<<<<<<<
HEAD
<<<<<<<
HEAD
class
ExamInfo
(
models
.
Model
):
exam
=
models
.
ForeignKey
(
ExamType
,
...
...
@@ -34,6 +35,10 @@ class ExamInfo(models.Model):
=======
class
StudentsExam
(
models
.
Model
):
exam
=
models
.
ForeignKey
(
'
ExamType
'
,
=======
class
ExamInfo
(
models
.
Model
):
exam
=
models
.
ForeignKey
(
ExamType
,
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
on_delete
=
models
.
CASCADE
,
related_name
=
'
exam
'
,
>>>>>>>
added
new
many
-
to
-
many
field
and
wrapper
class
...
...
@@ -41,11 +46,15 @@ class StudentsExam(models.Model):
student
=
models
.
ForeignKey
(
'
StudentInfo
'
,
on_delete
=
models
.
CASCADE
,
<<<<<<<
HEAD
<<<<<<<
HEAD
related_name
=
'
exams
'
,
=======
related_name
=
'
students
'
,
>>>>>>>
added
new
many
-
to
-
many
field
and
wrapper
class
=======
related_name
=
'
exams
'
,
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
null
=
False
)
total_score
=
models
.
PositiveIntegerField
(
default
=
0
)
...
...
@@ -83,11 +92,15 @@ class StudentInfo(models.Model):
associated user model.
Attributes:
<<<<<<< HEAD
<<<<<<< HEAD
exams (ManyToManyField):
=======
exam (ManyToManyField):
>>>
>>>>
added
new
many
-
to
-
many
field
and
wrapper
class
=======
exams
(
ManyToManyField
):
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
Module
the
student
wants
te
be
graded
in
,
or
different
exercise
assignments
for
one
module
.
...
...
@@ -105,6 +118,7 @@ class StudentInfo(models.Model):
max_length
=
30
,
default
=
random_matrikel_no
)
<<<<<<<
HEAD
<<<<<<<
HEAD
=======
exams
=
models
.
ManyToManyField
(
StudentsExam
,
...
...
@@ -112,11 +126,14 @@ class StudentInfo(models.Model):
related_name
=
'
exams
'
,
)
>>>>>>>
added
new
many
-
to
-
many
field
and
wrapper
class
=======
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
user
=
models
.
OneToOneField
(
get_user_model
(),
on_delete
=
models
.
CASCADE
,
related_name
=
'
student
'
)
def
add_exam
(
self
,
exam
):
<<<<<<<
HEAD
<<<<<<<
HEAD
exam_info
=
ExamInfo
(
exam
=
exam
,
student
=
self
)
exam_info
.
save
()
...
...
@@ -126,6 +143,11 @@ class StudentInfo(models.Model):
students_exam
.
exam
=
exam
students_exam
.
student
=
self
self
.
exams
.
add
(
students_exam
)
=======
exam_info
=
ExamInfo
(
exam
=
exam
,
student
=
self
)
exam_info
.
save
()
self
.
exams
.
add
(
exam_info
)
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
@classmethod
def
get_annotated_score_submission_list
(
cls
)
->
QuerySet
:
...
...
This diff is collapsed.
Click to expand it.
core/serializers/student.py
+
5
−
0
View file @
26fd434f
from
rest_framework
import
serializers
<<<<<<<
HEAD
from
core.models
import
StudentInfo
,
ExamInfo
from
core.serializers
import
DynamicFieldsModelSerializer
,
ExamSerializer
=======
from
core.models
import
StudentInfo
from
core.serializers
import
DynamicFieldsModelSerializer
,
ExamInfoListSerializer
>>>>>>>
exams
now
manytomany
field
,
problems
resolved
from
core.serializers.submission
import
(
SubmissionListSerializer
,
SubmissionNoTextFieldsSerializer
,
SubmissionNoTypeSerializer
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment