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

Add emojis

This commit is contained in:
Christian Cueni 2019-11-18 11:12:09 +01:00
parent 6b739034de
commit a2af5759bb
3 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/content-blocks/assignment/FeedbackForm.vue
View File

@ -16,6 +16,7 @@
@click="$emit('turnIn')" @click="$emit('turnIn')"
>{{action}} >{{action}}
</button> </button>
<slot></slot>
</div> </div>
<final-submission <final-submission

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

@ -14,17 +14,27 @@
</p> </p>
<p class="article-content__text" v-html="text"></p> <p class="article-content__text" v-html="text"></p>
</div> </div>
<div class="feedback__submission"> <div class="feedback-submission">
<feedback-form <feedback-form
@turnIn="turnIn" @turnIn="turnIn"
@saveInput="saveInput" @saveInput="saveInput"
@reopen="reopen" @reopen="reopen"
:user-input="studentSubmission.submissionfeedback" :user-input="studentSubmission.submissionfeedback"
:placholder="'Feedback erfassen'" :placholder="'Feedback erfassen'"
:action="'Feedback teilen'" :action="'Feedback teilen'"
:saved="!unsaved" :saved="!unsaved"
/> >
</div> <div v-if="!final" class="feedback-submission__emojis emojis">
<span @click="addEmoji('😀')">😀</span>
<span @click="addEmoji('🤮')">🤮</span>
<span @click="addEmoji('🤩')">🤩</span>
<span @click="addEmoji('😎')">😎</span>
<span @click="addEmoji('🤔')">🤔</span>
<span@click="addEmoji('👍🏻')">👍🏻</span>
<span @click="addEmoji('👎🏻')">👎🏻</span>
</div>
</feedback-form>
</div>
</div> </div>
</template> </template>
@ -69,6 +79,10 @@
}, },
methods: { methods: {
addEmoji(emoji) {
const feedbackText = this.studentSubmission.submissionfeedback.text + emoji;
this.updateFeedbackText(feedbackText);
},
_save: debounce(function () { _save: debounce(function () {
const that = this; const that = this;
@ -113,13 +127,10 @@
We update the assignment on this component, so the changes are reflected on it. The server does not return We update the assignment on this component, so the changes are reflected on it. The server does not return
the updated entity, to prevent the UI to update when the user is entering his input the updated entity, to prevent the UI to update when the user is entering his input
*/ */
this.studentSubmission = Object.assign({}, this.studentSubmission, { this.updateFeedbackText(feedbackText);
submissionfeedback: Object.assign({}, this.studentSubmission.submissionfeedback, {text: feedbackText})
})
this._save(); this._save();
}, },
turnIn() { turnIn() {
console.log('returnInopen')
this.$apollo.mutate({ this.$apollo.mutate({
mutation: UPDATE_FEEDBACK_MUTATION, mutation: UPDATE_FEEDBACK_MUTATION,
variables: { variables: {
@ -151,6 +162,11 @@
} }
}); });
}, },
updateFeedbackText(text) {
this.studentSubmission = Object.assign({}, this.studentSubmission, {
submissionfeedback: Object.assign({}, this.studentSubmission.submissionfeedback, {text: text})
})
}
}, },
data() { data() {
@ -178,6 +194,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_functions.scss";
.article-content { .article-content {
&__document { &__document {
margin-bottom: 1rem; margin-bottom: 1rem;
@ -187,4 +204,8 @@
margin-bottom: 1em; margin-bottom: 1em;
} }
} }
.emojis {
font-size: toRem(24px);
}
</style> </style>

2
server/assignments/schema/mutations.py
View File

@ -52,7 +52,7 @@ class UpdateSubmissionFeedback(relay.ClientIDMutation):
(submission_feedback, created) = SubmissionFeedback.objects.get_or_create(teacher=user, (submission_feedback, created) = SubmissionFeedback.objects.get_or_create(teacher=user,
student_submission_id=student_submission_id) student_submission_id=student_submission_id)
submission_feedback.final = submission_feedback_data.get('final') submission_feedback.final = submission_feedback_data.get('final') or submission_feedback.final
submission_feedback.text = submission_feedback_data.get('text') submission_feedback.text = submission_feedback_data.get('text')
submission_feedback.save() submission_feedback.save()