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
2 changes: 1 addition & 1 deletion client/src/components/RecordingList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default defineComponent({
</v-col>
</v-row>
</v-col>
<v-expansion-panel>
<v-expansion-panel v-if="configuration.is_admin || configuration.non_admin_upload_enabled">
<v-expansion-panel-title>My Recordings</v-expansion-panel-title>
<v-expansion-panel-text>
<div
Expand Down
40 changes: 31 additions & 9 deletions client/src/views/Recordings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Recording,
FileAnnotation,
getRecordingTags,
getConfiguration,

Check warning on line 15 in client/src/views/Recordings.vue

View workflow job for this annotation

GitHub Actions / Lint [eslint]

'getConfiguration' is defined but never used
} from '../api/api';
import UploadRecording, { EditingRecording } from '@components/UploadRecording.vue';
import MapLocation from '@components/MapLocation.vue';
Expand Down Expand Up @@ -260,14 +261,30 @@
sharedHeaders.value = sharedHeaders.value.filter(filterDetailedMetadataFunction);
}

const recordingListStyles = computed(() => {
const myRecordingListStyles = computed(() => {
const sectionHeight = configuration.value.mark_annotations_completed_enabled ? '35vh' : '40vh';
return {
'height': sectionHeight,
'max-height': sectionHeight,
};
});

const sharedRecordingListStyles = computed(() => {
let sectionHeight: string;
if (configuration.value.mark_annotations_completed_enabled) {
sectionHeight = '35vh';
} else {
sectionHeight = '40vh';
}
if (!configuration.value.is_admin && !configuration.value.non_admin_upload_enabled) {
sectionHeight = '75vh';
}
return {
'height': sectionHeight,
'max-height': sectionHeight,
};
});

onMounted(async () => {
addSubmittedColumns();
hideDetailedMetadataColumns();
Expand Down Expand Up @@ -349,7 +366,8 @@
configuration,
submittedMyRecordings,
submittedSharedRecordings,
recordingListStyles,
myRecordingListStyles,
sharedRecordingListStyles,
showSubmittedRecordings,
myRecordingsDisplay,
sharedRecordingsDisplay,
Expand All @@ -361,20 +379,19 @@
<template>
<v-card>
<v-card-title>
<v-row class="py-2">
<div>
<v-row>
<div v-if="configuration.is_admin || configuration.non_admin_upload_enabled">
My Recordings
</div>
<v-spacer />
<div class="d-flex justify-center align-center">
<v-checkbox
v-if="configuration.mark_annotations_completed_enabled"
v-model="showSubmittedRecordings"
class="mr-4"
label="Show submitted recordings"
hide-details
/>
<v-menu>
<v-menu v-if="configuration.is_admin || configuration.non_admin_upload_enabled">
<template #activator="{ props }">
<v-btn
color="primary"
Expand Down Expand Up @@ -424,6 +441,7 @@
</v-card>
</v-dialog>
<v-data-table
v-if="configuration.is_admin || configuration.non_admin_upload_enabled"
v-model:items-per-page="itemsPerPage"
:headers="headers"
:items="myRecordingsDisplay"
Expand All @@ -433,7 +451,7 @@
density="compact"
:loading="dataLoading"
class="elevation-1 my-recordings"
:style="recordingListStyles"
:style="myRecordingListStyles"
>
<template #top>
<div max-height="100px">
Expand Down Expand Up @@ -588,7 +606,11 @@
<template #bottom />
</v-data-table>
<div
v-if="recordingList.length && configuration.mark_annotations_completed_enabled"
v-if="
recordingList.length
&& configuration.mark_annotations_completed_enabled
&& (configuration.is_admin || configuration.non_admin_upload_enabled)
"
class="d-flex justify-center align-center"
>
<v-progress-linear
Expand Down Expand Up @@ -642,7 +664,7 @@
:loading="dataLoading"
density="compact"
class="elevation-1 shared-recordings"
:style="recordingListStyles"
:style="sharedRecordingListStyles"
>
<template #top>
<div max-height="100px">
Expand Down