Skip to content
Snippets Groups Projects
Commit 67a6a3a9 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

fix: Ensure label of timeseries is displayed properly when observation lacks...

fix: Ensure label of timeseries is displayed properly when observation lacks timeseries object (only id)
parent 4f83ba05
Branches
No related tags found
No related merge requests found
......@@ -43,9 +43,13 @@
{{ obs.timeOfObservation | dateFormat }} <br/><b>{{obs.observationHeading}}</b>
</div>
<div class="col-4 d-flex align-items-center justify-content-end">
<router-link v-if="obs.observationTimeSeries"
:to="{name:'ObservationTimeSeriesList', params: {paramExpandedId:obs.observationTimeSeries.observationTimeSeriesId}}">
<span class="badge badge-pill badge-info">{{label(obs.observationTimeSeries)}}</span>
<router-link v-if="obs.observationTimeSeriesId"
:to="{name:'ObservationTimeSeriesList', params: {paramExpandedId: obs.observationTimeSeriesId}}">
<span class="badge badge-pill badge-info">{{timeSeriesLabel(obs)}}</span>
</router-link>
<router-link v-else-if="obs.observationTimeSeries"
:to="{name:'ObservationTimeSeriesList', params: {paramExpandedId: obs.observationTimeSeries.observationTimeSeriesId}}">
<span class="badge badge-pill badge-info">{{timeSeriesLabel(obs)}}</span>
</router-link>
<router-link
:to="{name: 'Observation', params: {observationId:obs.observationId,createClone:true}}"
......@@ -77,6 +81,7 @@
isInitialized: false,
CONST_URL_DOMAIN: '',
observations: undefined,
otsList: undefined
};
},
components: {CommonUtil, Sync},
......@@ -108,8 +113,19 @@
this.observations = lstObservations;
}
},
label(observationTimeSeries) {
return CommonUtil.timeSeriesLabel(observationTimeSeries);
loadObservationTimeSeriesListFromLocalStore() {
const jsonLocalOtsList = localStorage.getItem(CommonUtil.CONST_STORAGE_OBSERVATION_TIME_SERIES_LIST);
if (jsonLocalOtsList) {
this.otsList = JSON.parse(jsonLocalOtsList);
}
},
timeSeriesLabel(observation) {
if(observation.observationTimeSeries) {
return CommonUtil.timeSeriesLabel(observation.observationTimeSeries);
} else if(observation.observationTimeSeriesId) {
const ots = this.otsList.find(({observationTimeSeriesId}) => observationTimeSeriesId === observation.observationTimeSeriesId);
return ots ? CommonUtil.timeSeriesLabel(ots): ""
}
}
},
computed: {
......@@ -147,6 +163,7 @@
let strUUID = localStorage.getItem(CommonUtil.CONST_STORAGE_UUID);
if (strUUID) {
this.getObservationsFromStore();
this.loadObservationTimeSeriesListFromLocalStore();
}
// Making it globally available, so that e.g. the Sync component can update the list
// calling e.g. this.$root.sharedState.observationListComponent.getObservationsFromStore();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment