From 49057dbd234e0b246e7d5e97688a66f378f9f4ae Mon Sep 17 00:00:00 2001
From: sebastian-raubach <sebastian.raubach@hutton.ac.uk>
Date: Mon, 23 Jan 2023 14:35:59 +0000
Subject: [PATCH] - ADD: Added option to export multi-trait data in
 non-aggregated form to Germinate templates.

---
 src/plugins/i18n/de_DE.json |  2 ++
 src/plugins/i18n/en_GB.json |  2 ++
 src/views/Export.vue        | 56 ++++++++++++++++++++++---------------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/plugins/i18n/de_DE.json b/src/plugins/i18n/de_DE.json
index 36b7a45..03a9ecd 100644
--- a/src/plugins/i18n/de_DE.json
+++ b/src/plugins/i18n/de_DE.json
@@ -98,6 +98,8 @@
   "formLabelExportFieldPlanTrait": "Merkmal",
   "formLabelExportFieldPlan": "Feldplan",
   "formLabelExportTraits": "Merkmalübersicht",
+  "formLabelExportGerminateAggregation": "Mehrfachmessungen zusammenrechnen?",
+  "formDescriptionExportGerminateAggregation": "Falls ausgewählt, werden Mehrfachmessungen zusammengerechnet um einen einzigen Wert pro Merkmal und Beet zu erstellen.",
   "formLabelFieldLayoutRowCol": "Reihe {row}, Spalte {col}",
   "formLabelGermplasm": "Keimplasma/Sorten",
   "formLabelMarkersUse": "Markierungen auf Feldplan anzeigen",
diff --git a/src/plugins/i18n/en_GB.json b/src/plugins/i18n/en_GB.json
index 0b2a621..092082e 100644
--- a/src/plugins/i18n/en_GB.json
+++ b/src/plugins/i18n/en_GB.json
@@ -99,6 +99,8 @@
   "formLabelExportFieldPlanTrait": "Trait",
   "formLabelExportFieldPlan": "Field plan",
   "formLabelExportTraits": "Trait overview",
+  "formLabelExportGerminateAggregation": "Aggregate multi-traits?",
+  "formDescriptionExportGerminateAggregation": "If selected, multi-traits will be aggregated to generate a single value per trait for each plot.",
   "formLabelFieldLayoutRowCol": "Row {row}, Column {col}",
   "formLabelGermplasm": "Germplasm/varieties",
   "formLabelMarkersUse": "Show markers on field plan",
diff --git a/src/views/Export.vue b/src/views/Export.vue
index 9e2af2a..9a443ad 100644
--- a/src/views/Export.vue
+++ b/src/views/Export.vue
@@ -85,29 +85,38 @@
         </template>
         <p v-html="$t('modalTextExportGerminate')" />
         <div>
-          <p v-if="hasMultiTrait">{{ $t('modalTextExportGerminateMultiSelection') }}</p>
-
-          <b-form @submit.prevent v-if="storeTraits && storeTraits.length > 0">
-            <template v-for="(trait, index) in storeTraits">
-              <b-form-group :label="trait.name"
-                            :label-for="`trait-select-${trait.name}`"
-                            :key="`trait-select-${trait.name}`"
-                            :content-cols="12"
-                            :label-cols="12"
-                            :content-cols-lg="10"
-                            :label-cols-lg="2"
-                            class="align-items-center"
-                            v-if="trait.mType === 'multi'">
-                <template #label>
-                  <TraitHeading :trait="trait" mode="full" />
-                </template>
-                <b-form-radio-group
-                  :id="`trait-select-${trait.name}`"
-                  v-model="multiTraitSelection[index]"
-                  :options="multiTraitOptions[index]" />
+          <div v-if="hasMultiTrait && storeTraits && storeTraits.length > 0">
+            <b-form @submit.prevent>
+
+              <b-form-group :label="$t('formLabelExportGerminateAggregation')" label-for="aggregation" :description="$t('formDescriptionExportGerminateAggregation')">
+                <b-form-checkbox id="aggregation" switch v-model="multiTraitAggregation">{{ $t(multiTraitAggregation ? 'buttonYes' : 'buttonNo') }}</b-form-checkbox>
               </b-form-group>
-            </template>
-          </b-form>
+
+              <div v-if="multiTraitAggregation">
+                <p>{{ $t('modalTextExportGerminateMultiSelection') }}</p>
+
+                <template v-for="(trait, index) in storeTraits">
+                  <b-form-group :label="trait.name"
+                                :label-for="`trait-select-${trait.name}`"
+                                :key="`trait-select-${trait.name}`"
+                                :content-cols="12"
+                                :label-cols="12"
+                                :content-cols-lg="10"
+                                :label-cols-lg="2"
+                                class="align-items-center"
+                                v-if="trait.mType === 'multi'">
+                    <template #label>
+                      <TraitHeading :trait="trait" mode="full" />
+                    </template>
+                    <b-form-radio-group
+                      :id="`trait-select-${trait.name}`"
+                      v-model="multiTraitSelection[index]"
+                      :options="multiTraitOptions[index]" />
+                  </b-form-group>
+                </template>
+              </div>
+            </b-form>
+          </div>
 
           <b-button @click="exportToGerminateFormat"><BIconFileEarmarkSpreadsheet /> {{ $t('buttonExportGerminateFormat') }}</b-button>
 
@@ -157,6 +166,7 @@ export default {
     return {
       selectedTrait: null,
       germinateTemplateFile: null,
+      multiTraitAggregation: false,
       shapeFile: null,
       multiTraitOptions: [],
       multiTraitSelection: []
@@ -487,7 +497,7 @@ export default {
         this.synchronizeDataset(this.storeDatasetId)
           .then(dataset => {
             emitter.emit('set-loading', true)
-            return this.axios(`config/${dataset.uuid}/export-g8`, this.multiTraitSelection, 'post')
+            return this.axios(`config/${dataset.uuid}/export-g8`, this.multiTraitAggregation ? this.multiTraitSelection : [], 'post')
           })
           .then(result => {
             emitter.emit('set-loading', true)