Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 49 additions & 5 deletions client/src/components/RecordingList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ export default defineComponent({
const openPanel = ref(1);
const filtered = ref(true);
const modifiedList = computed(() => {
if (filtered.value) {
return sharedList.value.filter((item) => !item.userMadeAnnotations);
}
return sharedList.value;
if (configuration.value.mark_annotations_completed_enabled) {
return sharedRecordingsDisplay.value;
}
if (filtered.value) {
return sharedList.value.filter((item) => !item.userMadeAnnotations);
}
return sharedList.value;
});

const userSubmittedAnnotation = (recording: Recording) => {
Expand Down Expand Up @@ -120,6 +123,23 @@ export default defineComponent({
dense
>
<v-col>
<div>
<b>Submitted: </b>
<v-icon
v-if="userSubmittedAnnotation(item)"
color="success"
>
mdi-check
</v-icon>
<v-icon
v-else
color="error"
>
mdi-close
</v-icon>
</div>
</v-col>
<v-col v-if="userSubmittedAnnotation(item)">
<b>My label: </b>
<span>{{ userSubmittedAnnotation(item) }}</span>
</v-col>
Expand All @@ -132,6 +152,7 @@ export default defineComponent({
<v-expansion-panel-title>Public</v-expansion-panel-title>
<v-expansion-panel-text class="ma-0 pa-0">
<v-switch
v-if="!configuration.mark_annotations_completed_enabled"
v-model="filtered"
label="Filter Annotated"
dense
Expand Down Expand Up @@ -159,7 +180,7 @@ export default defineComponent({
</v-col>
</v-row>
<v-row dense>
<v-col>
<v-col v-if="!configuration.mark_annotations_completed_enabled">
<div>
<b>Annotated:</b>
<v-icon
Expand All @@ -176,6 +197,29 @@ export default defineComponent({
</v-icon>
</div>
</v-col>
<v-col v-else>
<div>
<b>Submitted: </b>
<v-icon
v-if="userSubmittedAnnotation(item)"
color="success"
>
mdi-check
</v-icon>
<v-icon
v-else
color="error"
>
mdi-close
</v-icon>
</div>
</v-col>
<v-col
v-if="configuration.mark_annotations_completed_enabled && userSubmittedAnnotation(item)"
>
<b>My label: </b>
<span>{{ userSubmittedAnnotation(item) }}</span>
</v-col>
</v-row>
</v-card>
</div>
Expand Down
27 changes: 16 additions & 11 deletions client/src/views/Recordings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -217,22 +217,27 @@ export default defineComponent({
return filterTagSet.intersection(itemTagSet).size > 0;
};

function submittedForCurrentUser(recording: Recording) {
const userSubmittedAnnotations = recording.fileAnnotations.filter((annotation: FileAnnotation) => (
function currentUserSubmission(recording: Recording) {
const userSubmittedAnnotation = recording.fileAnnotations.find((annotation: FileAnnotation) => (
annotation.owner === currentUser.value && annotation.submitted
));
return userSubmittedAnnotations.length > 0;
return userSubmittedAnnotation?.species[0]?.species_code;
}

function addSubmittedColumn() {
function addSubmittedColumns() {
if (configuration.value.mark_annotations_completed_enabled) {
const submittedHeader = {
title: 'Submitted',
key: 'submitted',
value: submittedForCurrentUser,
value: currentUserSubmission,
};
headers.value.push(submittedHeader);
sharedHeaders.value.push(submittedHeader);
const myLabelHeader = {
title: 'My Submitted Label',
key: 'submittedLabel',
value: currentUserSubmission,
};
headers.value.push(submittedHeader, myLabelHeader);
sharedHeaders.value.push(submittedHeader, myLabelHeader);
}
}

Expand All @@ -248,7 +253,7 @@ export default defineComponent({
await loadCurrentUser();
await fetchRecordingTags();
await fetchRecordings();
addSubmittedColumn();
addSubmittedColumns();
});

const uploadDone = () => {
Expand Down Expand Up @@ -319,7 +324,7 @@ export default defineComponent({
recordingToDelete,
editingRecording,
dataLoading,
submittedForCurrentUser,
currentUserSubmission,
configuration,
submittedMyRecordings,
submittedSharedRecordings,
Expand Down Expand Up @@ -539,7 +544,7 @@ export default defineComponent({
#item.submitted="{ item }"
>
<v-icon
v-if="submittedForCurrentUser(item)"
v-if="currentUserSubmission(item)"
color="success"
>
mdi-check
Expand Down Expand Up @@ -714,7 +719,7 @@ export default defineComponent({
#item.submitted="{ item }"
>
<v-icon
v-if="submittedForCurrentUser(item)"
v-if="currentUserSubmission(item)"
color="success"
>
mdi-check
Expand Down