ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Incoorperate feedback

This commit is contained in:
Christian Cueni 2019-12-02 17:12:19 +01:00
parent 735eae25e3
commit 84a69b24f1
8 changed files with 13080 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/content-blocks/assignment/Assignment.vue
View File

@ -14,9 +14,9 @@
@reopen="reopen" @reopen="reopen"
@changeDocumentUrl="changeDocumentUrl" @changeDocumentUrl="changeDocumentUrl"
:user-input="submission" :user-input="submission"
:placholder="'Ergebnis erfassen'" placeholder="Ergebnis erfassen"
:action="'Ergebnis mit Lehrperson teilen'" action="Ergebnis mit Lehrperson teilen"
:shared-msg="'Das Ergebnis wurde mit der Lehrperson geteilt.'" shared-msg="Das Ergebnis wurde mit der Lehrperson geteilt."
:saved="!unsaved" :saved="!unsaved"
> >
</submission-form> </submission-form>

12
client/src/components/content-blocks/assignment/SubmissionForm.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="feedback__submission submissionform-container"> <div class="feedback__submission submission-form-container">
<div class="submissionform-container__inputs"> <div class="submission-form-container__inputs">
<submission-input <submission-input
@input="saveInput" @input="saveInput"
:input-text="userInput.text" :input-text="userInput.text"
@ -11,8 +11,8 @@
></submission-input> ></submission-input>
</div> </div>
<div class="submissionform-container__actions" v-if="!final"> <div class="submission-form-container__actions" v-if="!final">
<button class="submissionform-container__submit button button--primary button--white-bg" <button class="submission-form-container__submit button button--primary button--white-bg"
@click="$emit('turnIn')" @click="$emit('turnIn')"
>{{action}} >{{action}}
</button> </button>
@ -28,7 +28,7 @@
v-if="allowsDocuments" v-if="allowsDocuments"
v-on:link-change-url="changeDocumentUrl" v-on:link-change-url="changeDocumentUrl"
:value="userInput.document" :value="userInput.document"
class="submissionform-container__document" class="submission-form-container__document"
></simple-file-upload> ></simple-file-upload>
<slot></slot> <slot></slot>
</div> </div>
@ -92,7 +92,7 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import '@/styles/_mixins.scss'; @import '@/styles/_mixins.scss';
.submissionform-container { .submission-form-container {
@include input-box-shadow; @include input-box-shadow;
background-color: $color-white; background-color: $color-white;

6
client/src/pages/studentSubmission.vue
View File

@ -20,9 +20,9 @@
@saveInput="saveInput" @saveInput="saveInput"
@reopen="reopen" @reopen="reopen"
:user-input="feedback" :user-input="feedback"
:placholder="'Feedback erfassen'" placholder="Feedback erfassen"
:action="'Feedback teilen'" action="Feedback teilen"
:shared-msg="'Dieses Feedback wurde geteilt.'" shared-msg="Dieses Feedback wurde geteilt."
:saved="!unsaved" :saved="!unsaved"
> >
<div v-if="!final" class="feedback-submission__emojis emojis"> <div v-if="!final" class="feedback-submission__emojis emojis">

0
client/src/styles/_submissionform-container.scss
View File

1
client/src/styles/main.scss
View File

@ -21,4 +21,3 @@
@import "password_forms"; @import "password_forms";
@import "public-page"; @import "public-page";
@import "student-submission"; @import "student-submission";
@import "submissionform-container";

13067
client/yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff

4
server/assignments/tests/test_feedback.py
View File

@ -180,7 +180,6 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
submission_feedback = SubmissionFeedbackFactory(teacher=self.teacher, final=True, submission_feedback = SubmissionFeedbackFactory(teacher=self.teacher, final=True,
student_submission=self.student_submission) student_submission=self.student_submission)
result = self._fetch_assignment_student(self.student1) result = self._fetch_assignment_student(self.student1)
print(result)
self.assertEqual(result.get('data').get('assignment').get('submission').get('submissionfeedback') self.assertEqual(result.get('data').get('assignment').get('submission').get('submissionfeedback')
.get('text'), submission_feedback.text) .get('text'), submission_feedback.text)
@ -195,11 +194,10 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
.get('text'), submission_feedback.text) .get('text'), submission_feedback.text)
def test_rogue_teacher_cannot_see_feedback(self): def test_rogue_teacher_cannot_see_feedback(self):
submission_feedback = SubmissionFeedbackFactory(teacher=self.teacher, final=False, SubmissionFeedbackFactory(teacher=self.teacher, final=False,
student_submission=self.student_submission) student_submission=self.student_submission)
self.student_submission.final = True self.student_submission.final = True
self.student_submission.save() self.student_submission.save()
result = self._fetch_assignment_teacher(self.teacher2) result = self._fetch_assignment_teacher(self.teacher2)
print(result)
self.assertIsNone(result.get('data').get('assignment').get('submissions')[0].get('submissionfeedback')) self.assertIsNone(result.get('data').get('assignment').get('submissions')[0].get('submissionfeedback'))

1
server/books/schema/queries.py
View File

@ -1,6 +1,5 @@
import graphene import graphene
from graphene import relay from graphene import relay
from django.db.models import Q
from graphene_django import DjangoObjectType from graphene_django import DjangoObjectType
from graphene_django.filter import DjangoFilterConnectionField from graphene_django.filter import DjangoFilterConnectionField