Mercurial > gemma

changeset 5580:0f258757e73a surveysperbottleneckid

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change objnam in Soundingresults.vue to bottleneck_id. Add comments for places where objnam is okay.
author Thomas Junk <thomas.junk@intevation.de>
date Mon, 14 Feb 2022 11:31:15 +0100
parents f54932eec5c0
children 2cadfdc9960c
files client/src/components/importconfiguration/types/Soundingresults.vue client/src/components/importoverview/BottleneckDetail.vue
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importconfiguration/types/Soundingresults.vue	Mon Feb 14 09:19:19 2022 +0100
+++ b/client/src/components/importconfiguration/types/Soundingresults.vue	Mon Feb 14 11:31:15 2022 +0100
@@ -22,10 +22,11 @@
             >
               <option
                 v-for="bn in bottlenecksForCountry"
-                :key="bn.properties.objnam"
+                :key="bn.properties.bottleneck_id"
                 :value="bn"
               >
                 {{ bn.properties.objnam }}
+                <!-- objnam for label is okay -->
               </option>
             </optgroup>
           </select>
@@ -303,7 +304,7 @@
             const surveyType = response.data.meta["survey-type"];
             this.negateZ = response.data.meta["negate-z"];
             this.bottleneck = this.bottlenecks.find(
-              bn => bn.properties.objnam === bottleneck
+              bn => bn.properties.bottleneck_id === bottleneck
             );
             this.depthReference = depthReference;
             this.importDate = new Date(date).toISOString().split("T")[0];
@@ -343,7 +344,7 @@
       let formData = new FormData();
       formData.append("token", this.token);
       if (this.bottleneck)
-        formData.append("bottleneck", this.bottleneck.properties.objnam);
+        formData.append("bottleneck", this.bottleneck.properties.bottleneck_id);
       if (this.importDate)
         formData.append("date", this.importDate.split("T")[0]);
       if (this.depthReference)
@@ -362,7 +363,7 @@
             title: this.$gettext("Import"),
             message:
               this.$gettext("Starting import for ") +
-              this.bottleneck.properties.objnam
+              this.bottleneck.properties.objnam //objnam for display is okay
           });
           this.initialState();
         })
@@ -464,7 +465,7 @@
           encodeURIComponent(
             JSON.stringify({
               "depth-reference": this.depthReference,
-              bottleneck: this.bottleneck.properties.objnam,
+              bottleneck: this.bottleneck.properties.bottleneck_id,
               date: this.importDate,
               "survey-type": this.beamType,
               epsg: Number(this.projection),
--- a/client/src/components/importoverview/BottleneckDetail.vue	Mon Feb 14 09:19:19 2022 +0100
+++ b/client/src/components/importoverview/BottleneckDetail.vue	Mon Feb 14 11:31:15 2022 +0100
@@ -20,6 +20,7 @@
         </div>
         <a @click="moveToBottleneck(index)" href="#">
           {{ bottleneck.properties.objnam }}
+          <!-- objnam for Text is okay-->
         </a>
       </div>