From 79856bc09fbf346f956c373cb941b64d1bc4e459 Mon Sep 17 00:00:00 2001
From: "robinwilliam.hundt" <robinwilliam.hundt@stud.uni-goettingen.de>
Date: Mon, 19 Feb 2018 13:08:46 +0100
Subject: [PATCH] Fix Final checkbox
---
.../submission_notes/SubmissionCorrection.vue | 1 +
.../AnnotatedSubmissionBottomToolbar.vue | 20 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/frontend/src/components/submission_notes/SubmissionCorrection.vue b/frontend/src/components/submission_notes/SubmissionCorrection.vue
index 485c6adb..8cb61c0d 100644
--- a/frontend/src/components/submission_notes/SubmissionCorrection.vue
+++ b/frontend/src/components/submission_notes/SubmissionCorrection.vue
@@ -48,6 +48,7 @@
:loading="loading"
:fullScore="submissionObj['full_score']"
:skippable="assignment !== undefined"
+ :feedback="feedbackObj ? feedbackObj : {}"
@submitFeedback="submitFeedback"
@skip="$emit('skip')"
/>
diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
index 4d0d5bff..835ec918 100644
--- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
@@ -61,8 +61,11 @@
data () {
return {
scoreError: '',
+ initialIsFinal: this.$store.state.submissionNotes.origFeedback.isFinal ||
+ !this.$store.getters['submissionNotes/isFeedbackCreation'] || this.$store.getters.isReviewer,
isFinal: this.$store.state.submissionNotes.origFeedback.isFinal ||
!this.$store.getters['submissionNotes/isFeedbackCreation'] || this.$store.getters.isReviewer
+
}
},
props: {
@@ -77,6 +80,10 @@
skippable: {
type: Boolean,
default: false
+ },
+ feedback: {
+ type: Object,
+ default: () => {}
}
},
computed: {
@@ -92,6 +99,18 @@
return !this.$store.getters['submissionNotes/isFeedbackCreation'] || this.$store.getters.isReviewer
}
},
+ watch: {
+ feedback: {
+ handler: function (val) {
+ if (!val.hasOwnProperty('is_final')) {
+ this.isFinal = this.initialValue
+ } else {
+ this.isFinal = val.is_final
+ }
+ },
+ deep: true
+ }
+ },
methods: {
emitScoreError (error, duration) {
this.scoreError = error
@@ -111,6 +130,7 @@
},
submit () {
this.$emit('submitFeedback', {isFinal: this.isFinal})
+ this.isFinal = this.initialIsFinal
}
}
}
--
GitLab