Commit d6bd49e6 authored by anton's avatar anton

Merge branch 'release_2_4' into release_2_5

parents beea3e64 3accfb59
Pipeline #91094 passed with stage
in 2 minutes and 46 seconds
......@@ -14,7 +14,7 @@
| Select object type ({{ activeTypesModel.length }})
q-popover
q-list
q-item.q-py-sm.q-pl-sm.q-pr-md.moba-tag-hover-dark(v-for="type in objectTypes")
q-item.q-py-sm.q-pl-sm.q-pr-md.moba-tag-hover-dark(v-for="type in objectTypes" :key="type.value")
q-checkbox.full-width(v-model="checkedTypes", :val="type", :label="type.label",
:key="type.value", checked-icon="check", unchecked-icon="xxxxxx",
@input="handlerActivity(type)")
......@@ -27,7 +27,7 @@
template(v-if="typesVisibility")
template(v-if="checkedTypes.length > 0")
q-item.q-pa-none.cursor-pointer(v-for="type in checkedTypes",
q-item.q-pa-none.cursor-pointer(v-for="type in checkedTypes", :key="type.value",
tag="label")
q-item-main.q-pa-sm.moba-tag-hover-dark.text-grey-7(style="height: 35px;")
......
......@@ -10,6 +10,7 @@
timecode-bar-section(
v-for="(n, index) in numSections",
:index="index",
:key="index",
:numSections="numSections",
:millis="sectionDuration",
:width="sectionWidth",
......
......@@ -33,9 +33,9 @@
| Select vocabulary
q-popover
q-list
q-item.q-py-sm.q-px-xs.moba-tag-hover-dark(v-for="vocabulary in vocabularyLabels")
q-item.q-py-sm.q-px-xs.moba-tag-hover-dark(v-for="vocabulary in vocabularyLabels" :key="vocabulary.id")
q-checkbox.full-width(v-model="checkedVocabularies", :val="vocabulary", :label="vocabulary.label",
:key="vocabulary.id", checked-icon="check", unchecked-icon="xxxxxx",
checked-icon="check", unchecked-icon="xxxxxx",
@input="handlerActivity(vocabulary)")
q-item-side.text-right
......@@ -47,10 +47,10 @@
template(v-if="checkedVocabularies.length > 0")
q-item.q-pl-md.q-pr-sm.q-py-none.moba-tag-hover-dark.cursor-pointer(v-for="vocabulary in checkedVocabularies",
tag="label")
tag="label" :key="`checked-${vocabulary.id}`")
q-item-side(style="min-width: auto;")
q-checkbox(v-model="activeVocabulariesModel", :val="vocabulary", :key="vocabulary.id",
q-checkbox(v-model="activeVocabulariesModel", :val="vocabulary",
size="sm", round, flat, checked-icon="remove_red_eye", unchecked-icon="none")
q-item-main.text-grey-7
......@@ -73,7 +73,7 @@
span Loading vocabularies...
// results
q-list.q-py-sm(v-for="(aV, i) in activeVocabularies",
q-list.q-py-sm(v-for="(aV, i) in activeVocabularies", :key="`result-${i}`",
:class="{'ui-border-bottom': i < activeVocabularies.length - 1}")
// vocabulary label
......@@ -81,7 +81,7 @@
q-item-main.text-grey-7 {{ aV.label }}
// vocabulary items
q-item.moba-tag-hover.cursor-pointer.q-pa-none(v-for="item in filteredItems(aV.items)")
q-item.moba-tag-hover.cursor-pointer.q-pa-none(v-for="item in filteredItems(aV.items)" :key="item.value")
q-item-main
div.q-px-md.q-py-xs(@click="selectEntry(item)") {{ item.value }}
//
......
......@@ -22,27 +22,27 @@
// BACKGROUND LINES
//
line.background-line(v-for="n in diagramDimensions.distances.length", x1="0", x2="100%",
line.background-line(v-for="n in diagramDimensions.distances.length", :key="`bgline-${n}`", x1="0", x2="100%",
:y1="diagramDimensions.height / diagramDimensions.distances.length * (n - 1) + diagramDimensions.offsetY",
:y2="diagramDimensions.height / diagramDimensions.distances.length * (n - 1) + diagramDimensions.offsetY")
rect(width="60", height="100%", fill="#1F1D1E")
// TIME LABELS
//
text.q-caption.time-labels(v-for="(n, i) in diagramDimensions.distances.length", x="0",
text.q-caption.time-labels(v-for="(n, i) in diagramDimensions.distances.length", :key="`timelabel-${i}`", x="0",
:y="diagramDimensions.height - (diagramDimensions.height / diagramDimensions.distances.length * (n - 1)) - ((diagramDimensions.height / diagramDimensions.distances.length)) + 3 + diagramDimensions.offsetY",)
| {{ diagramDimensions.distances[i] }}
// BACKGROUND LINE + TIME LABEL
// if session duration <= minimum time
line.background-line-label(v-for="n in diagramDimensions.distances.length", x1="0", x2="100%",
line.background-line-label(v-for="n in diagramDimensions.distances.length", :key="`bgline-tlabel-${n}`", x1="0", x2="100%",
:y1="backgroundLineLabel.y1", :y2="backgroundLineLabel.y2")
text.q-caption.background-line-label-caption(x="0", :y="backgroundLineLabelCaptionY") < 10min
// SESSION BARS
//
svg(:x="sessionBarX")
diagram-bar(v-for="(session, i) in sessions", :session="session", :index="i", :active="activeSessionIndex === i"
diagram-bar(v-for="(session, i) in sessions", :session="session", :key="`sbar-${i}`", :index="i", :active="activeSessionIndex === i"
@hover="sessionHover", @click="sessionBarClick(session, i)", :time-format="timeFormat", :dimensions="diagramDimensions")
// BOTTOM LINE
......
......@@ -17,17 +17,17 @@
q-tab(:class="{'bg-green': filterCreators.length > 0}", slot="title", name="creators") creators
q-tooltip.bg-dark.shadow-8.moba-border(v-if="filterCreators.length > 0", anchor="bottom middle", self="top middle", :offset="[10, 0]")
q-list.no-border.no-padding
q-item.q-caption.q-pa-xs.no-margin(v-for="creator in filterCreators") {{ creator }}
q-item.q-caption.q-pa-xs.no-margin(v-for="(creator, i) in filterCreators" :key="`creator-${i}`") {{ creator }}
q-tab(:class="{'bg-green': filterTags.length > 0}", slot="title", name="tags") tags
q-tooltip.bg-dark.shadow-8.moba-border(v-if="filterTags.length > 0", anchor="bottom middle", self="top middle", :offset="[10, 0]")
q-list.no-border.no-padding
q-item.q-caption.q-pa-xs.no-margin(v-for="tag in filterTags") {{ tag }}
q-item.q-caption.q-pa-xs.no-margin(v-for="(tag, i) in filterTags" :key="`tag-${i}`") {{ tag }}
q-tab(:class="{'bg-green': filterTypes.length > 0}", slot="title", name="types") types
q-tooltip.bg-dark.shadow-8.moba-border(v-if="filterTypes.length > 0", anchor="bottom middle", self="top middle", :offset="[10, 0]")
q-list.no-border.no-padding
q-item.q-caption.q-pa-xs.no-margin(v-for="type in filterTypes") {{ type }}
q-item.q-caption.q-pa-xs.no-margin(v-for="(type, i) in filterTypes" :key="`type-${i}`") {{ type }}
q-tab(slot="title", name="date") date
q-tab(slot="title", name="search") search
......@@ -37,7 +37,7 @@
q-btn.col-6 select all
q-btn.col-6(@click="filterCreators = ['']") select none
q-list.no-border
q-item.no-padding(v-for="creator in creators")
q-item.no-padding(v-for="(creator, i) in creators" :key="`creator-f-${i}`")
q-checkbox.q-caption(v-model="filterCreators", :val="creator", :label="creator", color="white")
q-tab-pane(name="tags")
......@@ -52,7 +52,7 @@
q-btn.col-6 select all
q-btn.col-6(@click="filterTypes = ['']") select none
q-list.no-border
q-item.no-padding(v-for="type in annotationTypes")
q-item.no-padding(v-for="(type, i) in annotationTypes" :key="`type-f-${i}`")
q-checkbox.q-caption(v-model="filterTypes", :val="type", :label="type", color="white")
q-tab-pane(name="date")
......
......@@ -11,7 +11,7 @@
q-btn.full-width(@click="search", color="primary") Search
// results
content-paragraph(v-for="(result, i) in results", :class="{'q-mt-xl': i === 0}")
content-paragraph(v-for="(result, i) in results", :class="{'q-mt-xl': i === 0}" :key="`result-${i}`")
div(:class="{'ui-border-bottom': i < results.length - 1}")
// div
markdown-display.markdown-display(:content="result.body.value", :options="mdOptions")
......
......@@ -11,7 +11,7 @@
<!--h5 {{ $t('labels.my_vocabularies') }}-->
q-btn(@click="showModal('newVocabularyModal')", icon="add", :label="$t('buttons.add_vocabulary')", color="primary")
q-card.q-mt-lg.q-pa-sm(v-for="(tree, i) in trees")
q-card.q-mt-lg.q-pa-sm(v-for="(tree, i) in trees" :key="`tree-${i}`")
q-tree(:nodes="tree", node-key="label", color="primary", dark)
q-item.full-width(slot="header-generic", slot-scope="prop").q-pl-none
q-item-side
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment