diff --git a/src/breeding-insight/model/Observation.ts b/src/breeding-insight/model/Observation.ts index 06fbbf972..3611b5963 100644 --- a/src/breeding-insight/model/Observation.ts +++ b/src/breeding-insight/model/Observation.ts @@ -30,6 +30,7 @@ export class Observation { season?: Season; level?: string; value?: any; + observationTimeStamp?: string; constructor(id?: string, studyId?: string, diff --git a/src/breeding-insight/model/import/ImportPreview.ts b/src/breeding-insight/model/import/ImportPreview.ts index 6c8de2787..519fb8a2e 100644 --- a/src/breeding-insight/model/import/ImportPreview.ts +++ b/src/breeding-insight/model/import/ImportPreview.ts @@ -20,9 +20,12 @@ import {ImportPreviewStatistics} from "@/breeding-insight/model/import/ImportPre export class ImportPreview { statistics?: {[key: string]: ImportPreviewStatistics}; rows?: any[]; + dynamicColumnNames?: string[]; - constructor({statistics, rows}: ImportPreview) { + constructor({statistics, rows, dynamicColumnNames}: ImportPreview) { this.statistics = statistics; this.rows = rows; + this.dynamicColumnNames = dynamicColumnNames; + } } \ No newline at end of file diff --git a/src/views/import/ImportExperiment.vue b/src/views/import/ImportExperiment.vue index 5b3fb57f7..d1fef65e2 100644 --- a/src/views/import/ImportExperiment.vue +++ b/src/views/import/ImportExperiment.vue @@ -78,6 +78,7 @@ v-bind:loading="false" v-bind:pagination="previewData.pagination" v-on:show-error-notification="$emit('show-error-notification', $event)" + scrollable > {{ getTreatment(props.row.data.observationUnit) }} - + - {{ props.row.data.observations.filter(observation => observation.brAPIObject.observationVariableName === variable)[0].brAPIObject.value }} +

{{ retrieveDynamicColVal(props.row.data.observations, variable) }}