Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recording list update #67

Merged
merged 5 commits into from
Feb 27, 2024
Merged

Recording list update #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1ba214
annotation list refactor
BryonLewis Feb 27, 2024
3704221
annotation list refactor
BryonLewis Feb 27, 2024
7a28175
annotation list refactor
BryonLewis Feb 27, 2024
cd4b995
annotation list refactor
BryonLewis Feb 27, 2024
c275327
annotation list refactor
BryonLewis Feb 27, 2024
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
6 changes: 6 additions & 0 deletions client/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,9 @@ export default defineComponent({
</v-main>
</v-app>
</template>

<style >
html {
overflow-y:hidden;
}
</style>
14 changes: 13 additions & 1 deletion client/src/components/AnnotationList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ export default defineComponent({
</script>

<template>
<v-card class="pa-0 ma-0">
<v-card
class="pa-0 ma-0"
:class="{'annotation-list': ['pulse','sequence'].includes(tab),'recording-list': !['pulse','sequence'].includes(tab)}"
>
<v-card-title>
<v-row dense>
<v-tabs
Expand Down Expand Up @@ -237,4 +240,13 @@ export default defineComponent({
.selected {
background-color: cyan;
}
.annotation-list {
max-height: 60vh;
overflow-y: auto;
}
.recording-list {
max-height: 85vh;
overflow-y: auto;
}

</style>
157 changes: 70 additions & 87 deletions client/src/components/RecordingList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,53 +47,43 @@ export default defineComponent({
<v-expansion-panel>
<v-expansion-panel-title>My Recordings</v-expansion-panel-title>
<v-expansion-panel-text>
<div>
<v-row
dense
class="text-center"
>
<v-col class="text-left">
<b>Name</b>
</v-col>
<v-col><b>Public</b></v-col>
<v-col><b>Annotations</b></v-col>
</v-row>
</div>
<div
v-for="item in recordingList"
:key="`public_${item.id}`"
>
<v-row
dense
class="text-center"
>
<v-col class="text-left">
<router-link
:to="`/recording/${item.id.toString()}/spectrogram`"
>
{{ item.name }}
</router-link>
</v-col>
<v-col>
<v-icon
v-if="item.public"
color="success"
>
mdi-check
</v-icon>
<v-icon
v-else
color="error"
>
mdi-close
</v-icon>
</v-col>
<v-col>
<div>
{{ item.userAnnotations }}
</div>
</v-col>
</v-row>
<v-card class="pa-2 my-2">
<v-row dense>
<v-col class="text-left">
<b>Name:</b><router-link
:to="`/recording/${item.id.toString()}/spectrogram`"
>
{{ item.name }}
</router-link>
</v-col>
</v-row>
<v-row dense>
<v-col>
<b>Public:</b>
<v-icon
v-if="item.public"
color="success"
>
mdi-check
</v-icon>
<v-icon
v-else
color="error"
>
mdi-close
</v-icon>
</v-col>
<v-col>
<div>
<b class="pr-1">Annotations:</b>{{ item.userAnnotations }}
</div>
</v-col>
</v-row>
</v-card>
</div>
</v-expansion-panel-text>
</v-expansion-panel>
Expand All @@ -105,55 +95,48 @@ export default defineComponent({
label="Filter Annotated"
dense
/>
<div>
<v-row
dense
class="text-center"
>
<v-col class="text-left">
<b>Name</b>
</v-col>
<v-col><b>Owner</b></v-col>
<v-col><b>Annotated</b></v-col>
</v-row>
</div>
<div
v-for="item in modifiedList"
:key="`public_${item.id}`"
>
<v-row
dense
class="text-center"
>
<v-col class="text-left">
<router-link
:to="`/recording/${item.id.toString()}/spectrogram`"
>
{{ item.name }}
</router-link>
</v-col>
<v-col>
<div style="font-size:0.75em">
{{ item.owner_username }}
</div>
</v-col>
<v-col>
<div>
<v-icon
v-if="item.userMadeAnnotations"
color="success"
>
mdi-check
</v-icon>
<v-icon
v-else
color="error"
<v-card class="pa-2 my-2">
<v-row dense>
<v-col class="text-left">
<b class="pr-1">Name:</b>
<router-link
:to="`/recording/${item.id.toString()}/spectrogram`"
>
mdi-close
</v-icon>
</div>
</v-col>
</v-row>
{{ item.name }}
</router-link>
</v-col>
</v-row>
<v-row dense>
<v-col>
<div style="font-size:0.75em">
<b>Owner:</b> {{ item.owner_username }}
</div>
</v-col>
</v-row>
<v-row dense>
<v-col>
<div>
<b>Annotated:</b>
<v-icon
v-if="item.userMadeAnnotations"
color="success"
>
mdi-check
</v-icon>
<v-icon
v-else
color="error"
>
mdi-close
</v-icon>
</div>
</v-col>
</v-row>
</v-card>
</div>
</v-expansion-panel-text>
</v-expansion-panel>
Expand Down
7 changes: 1 addition & 6 deletions client/src/views/Spectrogram.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ export default defineComponent({
<annotation-list
:annotations="annotations"
:temporal-annotations="temporalAnnotations"
class="annotation-list"
@select="processSelection($event)"
/>
<annotation-editor
Expand All @@ -396,11 +395,7 @@ export default defineComponent({
</template>

<style scoped>
.annotation-list {
max-height: 60vh;
overflow-y: auto;
}
.spectro-main {
height: calc(100vh - 20vh - 64px - 72px);
height: calc(100vh - 21vh - 64px - 72px);
}
</style>
Loading