Skip to content
Snippets Groups Projects

Resolve "Resolve peer dependency warnings"

Merged Dominik Seeger requested to merge 150-resolve-peer-dependency-warnings into master
All threads resolved!
2 files
+ 0
2
Compare changes
  • Side-by-side
  • Inline
Files
2
<template>
<div class="dialog-box">
<div v-if="commentDisplayable" class="body elevation-1" :style="{borderColor: borderColor, backgroundColor}">
<span class="tip tip-up" :style="{borderBottomColor: borderColor}"></span>
<span v-if="ofTutor" class="of-tutor">Of tutor: {{ofTutor}}</span>
<span class="comment-created">{{parsedCreated}}</span>
<div class="visibility-icon" v-if="showVisibilityIcon">
<v-tooltip top v-if="visibleToStudent" size="20px">
<div
v-if="commentDisplayable"
class="body elevation-1"
:style="{borderColor: borderColor, backgroundColor}"
>
<span
class="tip tip-up"
:style="{borderBottomColor: borderColor}"
/>
<span
v-if="ofTutor"
class="of-tutor"
>Of tutor: {{ ofTutor }}</span>
<span class="comment-created">{{ parsedCreated }}</span>
<div
v-if="showVisibilityIcon"
class="visibility-icon"
>
<v-tooltip
v-if="visibleToStudentBool"
top
size="20px"
>
<v-icon
slot="activator"
size="20px"
>visibility</v-icon>
>
visibility
</v-icon>
<span>Will be visible to student</span>
</v-tooltip>
<v-tooltip top v-else>
<v-tooltip
v-else
top
>
<v-icon
slot="activator"
size="20px">visibility_off</v-icon>
size="20px"
>
visibility_off
</v-icon>
<span>Won't be visible to student</span>
</v-tooltip>
</div>
<div class="message">{{text}}</div>
<div class="message">
{{ text }}
</div>
<v-btn
flat icon absolute
class="delete-button"
v-if="deletable"
flat
icon
absolute
class="delete-button"
@click.stop="toggleDeleteComment"
>
<v-icon
v-if="!markedForDeletion.hasOwnProperty(this.pk)"
color="grey darken-1" size="20px">delete_forever</v-icon>
<v-icon v-else size="20px">restore</v-icon>
v-if="!markedForDeletion.hasOwnProperty(pk)"
color="grey darken-1"
size="20px"
>
delete_forever
</v-icon>
<v-icon
v-else
size="20px"
>
restore
</v-icon>
</v-btn>
</div>
<v-layout v-if="showLabels && correctorView" ml-2>
<v-layout
v-if="showLabels && correctorView"
ml-2
>
<v-flex sm4>
<v-flex sm12>
UNCHANGED
</v-flex>
<feedback-label
removable
v-for="label in unchangedLabels"
v-bind="label"
:key="label.pk"
removable
v-bind="label"
@remove-clicked="deleteAction"
/>
</v-flex>
@@ -50,10 +91,10 @@
WILL BE REMOVED
</v-flex>
<feedback-label
removable
v-for="label in removedLabels"
v-bind="label"
:key="label.pk"
removable
v-bind="label"
@remove-clicked="deleteAction"
/>
</v-flex>
@@ -62,23 +103,34 @@
WILL BE ADDED
</v-flex>
<feedback-label
removable
v-for="label in addedLabels"
v-bind="label"
:key="label.pk"
removable
v-bind="label"
@remove-clicked="deleteAction"
/>
</v-flex>
</v-layout>
<template row wrap v-if="!correctorView" align-center>
<v-layout row wrap align-center v-for="label in unchangedLabels" :key="label.pk">
<template
v-if="!correctorView"
row
wrap
align-center
>
<v-layout
v-for="label in unchangedLabels"
:key="label.pk"
row
wrap
align-center
>
<v-flex sm6>
<feedback-label
<feedback-label
v-bind="label"
/>
</v-flex>
<v-flex sm6>
<span><b>Description: </b>{{label.description}}</span>
<span><b>Description: </b>{{ label.description }}</span>
</v-flex>
</v-layout>
</template>
@@ -89,12 +141,12 @@
import { mapState } from 'vuex'
import { UI } from '@/store/modules/ui'
import { SubmissionNotes } from '@/store/modules/submission-notes'
import FeedbackLabel from "@/components/feedback_labels/FeedbackLabel.vue"
import FeedbackLabel from '@/components/feedback_labels/FeedbackLabel.vue'
import { FeedbackLabels as Labels } from '@/store/modules/feedback-labels'
import commentLabelSelector from "@/components/mixins/commentLabelSelector"
import commentLabelSelector from '@/components/mixins/commentLabelSelector'
export default {
name: 'feedback-comment',
name: 'FeedbackComment',
components: {
FeedbackLabel,
},
@@ -103,6 +155,7 @@ export default {
],
props: {
pk: {
default: '',
type: String,
required: false
},
@@ -111,10 +164,12 @@ export default {
required: true
},
modified: {
default: '',
type: String,
required: false
},
ofTutor: {
default: '',
type: String,
required: false
},
@@ -126,7 +181,7 @@ export default {
type: Boolean,
default: false
},
visibleToStudent: {
visibleToStudentBool: {
type: Boolean,
default: true
},
@@ -140,9 +195,9 @@ export default {
}
},
computed: {
commentDisplayable () { return this.text !== "" },
commentDisplayable () { return this.text !== '' },
showLabels () {
return this.visibleToStudent &&
return this.visibleToStudentBool &&
(this.getUnchangedLabels().length > 0 ||
this.getAddedLabels().length > 0 ||
this.getRemovedLabels().length > 0)
@@ -195,7 +250,7 @@ export default {
SubmissionNotes.UPDATE_FEEDBACK_LINE({
lineNo: Number(this.lineNo),
comment: {
text: this.text || "",
text: this.text || '',
labels: labels,
}
})
@@ -246,7 +301,6 @@ export default {
border-radius: 3px;
font-size: 14px;
line-height: 1.5;
white-space: pre-wrap;
}
.delete-button {
bottom: -12px;
Loading