diff --git a/client/src/App.vue b/client/src/App.vue index c7d25f30..823ef327 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -32,7 +32,6 @@ export default defineComponent({ const checkLogin = async () => { if (oauthClient.isLoggedIn) { loginText.value = "Logout"; - await loadConfiguration(); await loadCurrentUser(); await loadReviewerMaterials(); if (sharedList.value.length === 0) { @@ -52,7 +51,8 @@ export default defineComponent({ oauthClient.redirectToLogin(); } }; - onMounted(() => { + onMounted(async () => { + await loadConfiguration(); checkLogin(); }); router.afterEach((guard) => { diff --git a/client/src/components/AnnotationList.vue b/client/src/components/AnnotationList.vue index dd89abf2..daa606ad 100644 --- a/client/src/components/AnnotationList.vue +++ b/client/src/components/AnnotationList.vue @@ -1,5 +1,5 @@ - - - - - - - - - - My Recordings - - - - - - Name: - {{ item.name }} - - - - - - Public: - - mdi-check - - - mdi-close - - - - - Annotations:{{ item.userAnnotations }} - - - - - - - Submitted: - - mdi-check - - - mdi-close - - - - - My label: - {{ userSubmittedAnnotation(item) }} - - - - - - - - Public - - + + + - - - - - Name: - - {{ item.name }} - - - - - - - Owner: {{ item.owner_username }} - - - - - - - Annotated: - - mdi-check - - + + + + My Recordings + + + + + + Name: - mdi-close - - - - - - Submitted: + {{ item.name }} + + + + + + Public: mdi-check @@ -212,20 +129,122 @@ export default defineComponent({ > mdi-close - - - + + + Annotations:{{ item.userAnnotations }} + + + + - My label: - {{ userSubmittedAnnotation(item) }} - - - - - - - + + + Submitted: + + mdi-check + + + mdi-close + + + + + My label: + {{ userSubmittedAnnotation(item) }} + + + + + + + + Public + + + + + + + Name: + + {{ item.name }} + + + + + + + Owner: {{ item.owner_username }} + + + + + + + Annotated: + + mdi-check + + + mdi-close + + + + + + Submitted: + + mdi-check + + + mdi-close + + + + + My label: + {{ userSubmittedAnnotation(item) }} + + + + + + + + diff --git a/client/src/components/geoJS/layers/axesLayer.ts b/client/src/components/geoJS/layers/axesLayer.ts index 7b0218fe..03a5acb3 100644 --- a/client/src/components/geoJS/layers/axesLayer.ts +++ b/client/src/components/geoJS/layers/axesLayer.ts @@ -289,7 +289,7 @@ export default class AxesLayer extends BaseTextLayer { this.lineData.push(line); this.textData.push({ - text: `${(tick.value / 1000).toFixed(0)}KHz`, + text: `${(tick.value / 1000).toFixed(0)}kHz`, x: gcsTextStart, y, textAlign: 'left', diff --git a/client/src/components/geoJS/layers/boundingBoxLayer.ts b/client/src/components/geoJS/layers/boundingBoxLayer.ts index 86616116..d8bb31ad 100644 --- a/client/src/components/geoJS/layers/boundingBoxLayer.ts +++ b/client/src/components/geoJS/layers/boundingBoxLayer.ts @@ -118,14 +118,14 @@ export default class BoundingBoxLayer extends BaseTextLayer textBaseline: 'top', }, { - text: `${(lowFreq / 1000).toFixed(1)}KHz`, + text: `${(lowFreq / 1000).toFixed(1)}kHz`, x: coordinates[3][0] + 5, y: coordinates[3][1], textAlign: 'start', textBaseline: 'middle', }, { - text: `${(highFreq / 1000).toFixed(1)}KHz`, + text: `${(highFreq / 1000).toFixed(1)}kHz`, x: coordinates[2][0] + 5, y: coordinates[2][1], textAlign: 'start', diff --git a/client/src/components/geoJS/layers/measureToolLayer.ts b/client/src/components/geoJS/layers/measureToolLayer.ts index 17ffef4f..b132e1e4 100644 --- a/client/src/components/geoJS/layers/measureToolLayer.ts +++ b/client/src/components/geoJS/layers/measureToolLayer.ts @@ -164,7 +164,7 @@ export default class MeasureToolLayer extends BaseTextLayer { const frequency = height - this.yValue >= 0 ? ((height - newY) * (this.spectroInfo.high_freq - this.spectroInfo.low_freq)) / height / 1000 + this.spectroInfo.low_freq / 1000 : -1; - const textValue = `${frequency.toFixed(1)}KHz`; + const textValue = `${frequency.toFixed(1)}kHz`; const { x: textX, y: textY } = this._getTextCoordinates(); this.textData = [ { diff --git a/client/src/views/Recordings.vue b/client/src/views/Recordings.vue index e780b3c6..995b02e8 100644 --- a/client/src/views/Recordings.vue +++ b/client/src/views/Recordings.vue @@ -231,7 +231,7 @@ export default defineComponent({ const userSubmittedAnnotation = recording.fileAnnotations.find((annotation: FileAnnotation) => ( annotation.owner === currentUser.value && annotation.submitted )); - return userSubmittedAnnotation?.species[0]?.species_code; + return userSubmittedAnnotation?.species[0]?.species_code || ''; } function addSubmittedColumns() { @@ -285,10 +285,10 @@ export default defineComponent({ }); onMounted(async () => { - addSubmittedColumns(); - hideDetailedMetadataColumns(); await fetchRecordingTags(); await fetchRecordings(); + addSubmittedColumns(); + hideDetailedMetadataColumns(); }); const uploadDone = () => { @@ -582,24 +582,39 @@ export default defineComponent({ v-if="configuration.mark_annotations_completed_enabled" #item.submitted="{ item }" > - - mdi-check - - - mdi-close - - - mdi-circle-outline - + + + + mdi-check + + + You have submitted an annotation for this recording + + + + + mdi-circle-outline + + + You have created an annotation, but it has not been submitted + + + + + mdi-close + + + You have not created an annotation for this recording + diff --git a/client/src/views/Spectrogram.vue b/client/src/views/Spectrogram.vue index cc4f8d2a..0d0a1ccb 100644 --- a/client/src/views/Spectrogram.vue +++ b/client/src/views/Spectrogram.vue @@ -639,8 +639,8 @@ export default defineComponent({ v-if="configuration.mark_annotations_completed_enabled" > - - + + Vetting Controls @@ -658,12 +658,15 @@ export default defineComponent({ - + - + - - - - - - + +