From a732074a9b1da3c8a847d52b97276a382f97be23 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 18 Nov 2019 17:42:53 +0100
Subject: [PATCH] Add feedback in student view

---
 .../components/content-blocks/assignment/Assignment.vue   | 8 ++++++++
 client/src/graphql/gql/fragments/assignmentParts.gql      | 7 +++++++
 client/src/styles/_submissionform-container.scss          | 4 ++++
 server/assignments/schema/types.py                        | 2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index cedfeba7..50a1fb64 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -45,6 +45,9 @@
           :shared-msg="'Das Ergebnis wurde mit der Lehrperson geteilt'"
           @reopen="reopen"></final-submission>
       </div>
+      <div v-if="this.assignment.submission.submissionfeedback" class="submissionform-container__feedback">
+        <p>{{feedbackText}}</p>
+      </div>
     </template>
     <template v-if="!isStudent">
       <router-link class="button button--primary" :to="{name: 'submissions', params: { id: assignment.id }}">Zu den Ergebnissen
@@ -99,6 +102,10 @@
       },
       id() {
         return this.assignment.id ? this.assignment.id.replace(/=/g, '') : ''
+      },
+      feedbackText() {
+        let feedback = this.assignment.submission.submissionfeedback;
+        return `Feedback von ${feedback.teacher.firstName} ${feedback.teacher.lastName}: ${feedback.text}`;
       }
     },
 
@@ -270,4 +277,5 @@
       }
     }
   }
+
 </style>
diff --git a/client/src/graphql/gql/fragments/assignmentParts.gql b/client/src/graphql/gql/fragments/assignmentParts.gql
index e025d80d..69cec550 100644
--- a/client/src/graphql/gql/fragments/assignmentParts.gql
+++ b/client/src/graphql/gql/fragments/assignmentParts.gql
@@ -8,5 +8,12 @@ fragment AssignmentParts on AssignmentNode {
     text
     final
     document
+    submissionfeedback {
+      text
+      teacher {
+        firstName
+        lastName
+      }
+    }
   }
 }
diff --git a/client/src/styles/_submissionform-container.scss b/client/src/styles/_submissionform-container.scss
index 2efe72ff..45a32132 100644
--- a/client/src/styles/_submissionform-container.scss
+++ b/client/src/styles/_submissionform-container.scss
@@ -20,4 +20,8 @@
     display: flex;
     align-items: center;
   }
+
+  &__feedback {
+    margin-top: $medium-spacing;
+  }
 }
diff --git a/server/assignments/schema/types.py b/server/assignments/schema/types.py
index 25ff3bf9..f128a5c7 100644
--- a/server/assignments/schema/types.py
+++ b/server/assignments/schema/types.py
@@ -42,7 +42,7 @@ class StudentSubmissionNode(DjangoObjectType):
             return self.submissionfeedback
 
         return None
-
+    
 
 class AssignmentNode(DjangoObjectType):
     submission = graphene.Field(StudentSubmissionNode)