diff --git a/client/src/components/content-blocks/assignment/FinalSubmission.vue b/client/src/components/content-blocks/assignment/FinalSubmission.vue new file mode 100644 index 00000000..912d1fd7 --- /dev/null +++ b/client/src/components/content-blocks/assignment/FinalSubmission.vue @@ -0,0 +1,58 @@ + + + + {{submission.text}} + + + + Das Ergebnis wurde mit der Lehrperson geteilt + + + + + + + diff --git a/client/src/styles/_mixins.scss b/client/src/styles/_mixins.scss index 82ee5406..a6e5d917 100644 --- a/client/src/styles/_mixins.scss +++ b/client/src/styles/_mixins.scss @@ -12,6 +12,11 @@ fill: $color-darkgrey-1; } +@mixin input-box-shadow { + border: 1px solid #DBDBDB; + box-shadow: inset 0 1px 2px 0 rgba(0, 0, 0, 0.15); +} + @mixin skillbox-colors { &--yellow { background-color: $color-accent-1; diff --git a/client/src/styles/_variables.scss b/client/src/styles/_variables.scss index 6dd3718b..9615e53f 100644 --- a/client/src/styles/_variables.scss +++ b/client/src/styles/_variables.scss @@ -47,6 +47,7 @@ $brown: #EB9E77; $default-border-radius: 13px; +$input-border-radius: 3px; //modal stuff $modal-lateral-padding: 34px; diff --git a/server/assignments/schema/inputs.py b/server/assignments/schema/inputs.py index 1804e82c..7e4338bd 100644 --- a/server/assignments/schema/inputs.py +++ b/server/assignments/schema/inputs.py @@ -5,3 +5,4 @@ from graphene import InputObjectType class AssignmentInput(InputObjectType): id = graphene.ID(required=True) answer = graphene.String(required=True) + final = graphene.Boolean() diff --git a/server/assignments/schema/mutations.py b/server/assignments/schema/mutations.py index 6680e3a0..14ff7e09 100644 --- a/server/assignments/schema/mutations.py +++ b/server/assignments/schema/mutations.py @@ -20,6 +20,9 @@ class UpdateAssignment(relay.ClientIDMutation): assignment = get_object(Assignment, assignment_data.get('id')) (submission, created) = assignment.submissions.get_or_create(student=info.context.user) submission.text = assignment_data.get('answer') + final = assignment_data.get('final') + if final is not None: + submission.final = final submission.save() return cls(updated_assignment=assignment, errors=None)