Refactor feedback form and final submission

client/src/components/content-blocks/assignment/Assignment.vue

@@ -39,7 +39,11 @@
           ></simple-file-upload>
         </div>
 
-        <final-submission :submission="assignment.submission" v-if="final" @reopen="reopen"></final-submission>
+        <final-submission
+          v-if="final"
+          :user-input="assignment.submission"
+          :text="assignment.submission.text"
+          @reopen="reopen"></final-submission>
       </div>
     </template>
     <template v-if="!isStudent">

client/src/components/content-blocks/assignment/FeedbackForm.vue

@@ -3,10 +3,11 @@
       <div class="submissionform-container__inputs">
         <submission-form
           @input="saveInput"
-          :input-text="feedback.text"
+          :input-text="userInput.text"
           :saved="saved"
           :final="final"
           :placeholder="placeholder"
+          :reopen="$emit('reopen')"
         ></submission-form>
       </div>
 
@@ -17,23 +18,28 @@
         </button>
       </div>
 
-      <!-- <final-submission :submission="assignment.submission" v-if="final" @reopen="reopen"></final-submission> -->
+      <final-submission
+        v-if="final"
+        :user-input="userInput"
+        @reopen="$emit('reopen')"></final-submission>
     </div>
 </template>
 
 <script>
   import SubmissionForm from '@/components/content-blocks/assignment/SubmissionForm';
+  import FinalSubmission from '@/components/content-blocks/assignment/FinalSubmission';
 
   export default {
     components: {
-      SubmissionForm
+      SubmissionForm,
+      FinalSubmission
     },
 
-    props: ['feedback', 'saved', 'placeholder', 'action'],
+    props: ['userInput', 'saved', 'placeholder', 'action', 'reopen', 'document'],
 
     computed: {
       final() {
-        return !!this.feedback && this.feedback.final
+        return !!this.userInput && this.userInput.final
       }
     },
 

client/src/components/content-blocks/assignment/FinalSubmission.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="final-submission">
     <document-block
-      v-if="submission.document"
+      v-if="userInput.document"
-      :value="{url: submission.document}"
+      :value="{url: userInput.document}"
       class="final-submission__document"
     ></document-block>
     <div class="final-submission__explanation">
@@ -19,7 +19,7 @@
   import {newLineToParagraph} from '@/helpers/text';
 
   export default {
-    props: ['submission'],
+    props: ['userInput'],
 
     components: {
       InfoIcon,
@@ -28,7 +28,7 @@
 
     computed: {
       text() {
-        return newLineToParagraph(this.submission.text);
+        return newLineToParagraph(this.userInput.text);
       }
     }
   }

client/src/pages/studentSubmission.vue

@@ -16,9 +16,10 @@
     </div>
       <div class="feedback__submission">
         <feedback-form
-          :feedback="studentSubmission.submissionfeedback"
           @turnIn="turnIn"
           @saveInput="saveInput"
+          @reopen="reopen"
+          :user-input="studentSubmission.submissionfeedback"
           :placholder="'Feedback erfassen'"
           :action="'Feedback teilen'"
           :saved="!unsaved"
@@ -79,7 +80,6 @@
               submissionFeedback: {
                 studentSubmission: this.studentSubmission.id,
                 text: this.studentSubmission.submissionfeedback.text,
-                final: this.studentSubmission.submissionfeedback.final
               }
             }
           },
@@ -119,6 +119,7 @@
         this._save();
       },
       turnIn() {
+        console.log('returnInopen')
         this.$apollo.mutate({
           mutation: UPDATE_FEEDBACK_MUTATION,
           variables: {
@@ -132,6 +133,24 @@
           }
         });
       },
+      reopen() {
+        if (!this.studentSubmission.id) {
+          return;
+        }
+
+        this.$apollo.mutate({
+          mutation: UPDATE_FEEDBACK_MUTATION,
+          variables: {
+            input: {
+              submissionFeedback: {
+                studentSubmission: this.studentSubmission.id,
+                text: this.studentSubmission.submissionfeedback.text,
+                final: false
+              }
+            }
+          }
+        });
+      },
     },
 
     data() {