Mercurial > gemma

changeset 2927:80815b0a665c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: importoverview: further improved styles and shortened variable names
author Markus Kottlaender <markus@intevation.de>
date Wed, 03 Apr 2019 17:57:40 +0200
parents 899b591493b4
children 074f2bb85584
files client/src/assets/application.scss client/src/components/importoverview/LogDetail.vue client/src/components/importoverview/SoundingResultDetail.vue client/src/components/importoverview/StretchDetails.vue
diffstat 4 files changed, 13 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/assets/application.scss	Wed Apr 03 17:54:35 2019 +0200
+++ b/client/src/assets/application.scss	Wed Apr 03 17:57:40 2019 +0200
@@ -204,10 +204,6 @@
   font-size: 0.75rem;
 }
 
-.empty {
-  margin-right: 1.25rem;
-}
-
 .truncate {
   white-space: nowrap;
   overflow: hidden;
--- a/client/src/components/importoverview/LogDetail.vue	Wed Apr 03 17:54:35 2019 +0200
+++ b/client/src/components/importoverview/LogDetail.vue	Wed Apr 03 17:57:40 2019 +0200
@@ -3,7 +3,7 @@
     <div
       class="d-flex border-bottom"
       style="padding-left: 3px;"
-      v-if="hasAdditionalInfo || isStretch || isSoundingResult"
+      v-if="hasAdditionalInfo || isST || isSR"
     >
       <div v-if="hasAdditionalInfo">
         <UISpinnerButton
@@ -17,29 +17,26 @@
           ({{ details.summary.length }})
         </span>
         <span
-          v-if="isBottleneck && details.summary && details.summary.bottlenecks"
+          v-if="isBN && details.summary && details.summary.bottlenecks"
           class="text-info text-left"
         >
           ({{ details.summary.bottlenecks.length }})
         </span>
-        <span class="text-left" v-if="isFairwayDimension">
+        <span class="text-left" v-if="isFD">
           {{ details.summary["source-organization"] }}
           (LOS: {{ details.summary.los }})
         </span>
       </div>
-      <StretchDetail v-if="isStretch && isPending" :entry="entry" />
-      <SoundingResultDetail
-        :entry="entry"
-        v-if="isSoundingResult && isPending"
-      />
+      <StretchDetail v-if="isST && isPending" :entry="entry" />
+      <SoundingResultDetail :entry="entry" v-if="isSR && isPending" />
     </div>
     <div
-      v-if="entry.id === showAdditional && isPending"
+      v-if="entry.id === showAdditional && isPending && (isFD || isAGM || isBN)"
       class="d-flex border-bottom"
     >
-      <FairwayDimensionDetail :entry="entry" v-if="isFairwayDimension" />
+      <FairwayDimensionDetail :entry="entry" v-if="isFD" />
       <ApprovedGaugeMeasurementDetail :entry="entry" v-if="isAGM" />
-      <BottleneckDetail :entry="entry" v-if="isBottleneck" />
+      <BottleneckDetail :entry="entry" v-if="isBN" />
     </div>
     <div class="d-flex" style="padding-left: 3px;">
       <UISpinnerButton
@@ -91,21 +88,21 @@
       return this.entry.state == "pending";
     },
     hasAdditionalInfo() {
-      return this.isPending && (this.isAGM || this.isBottleneck);
+      return this.isPending && (this.isAGM || this.isBN);
     },
-    isFairwayDimension() {
+    isFD() {
       return this.kind === "FD";
     },
     isAGM() {
       return this.kind === "AGM";
     },
-    isBottleneck() {
+    isBN() {
       return this.kind === "BN" || this.kind === "UBN";
     },
-    isStretch() {
+    isST() {
       return this.kind === "ST";
     },
-    isSoundingResult() {
+    isSR() {
       return this.kind === "SR";
     }
   },
--- a/client/src/components/importoverview/SoundingResultDetail.vue	Wed Apr 03 17:54:35 2019 +0200
+++ b/client/src/components/importoverview/SoundingResultDetail.vue	Wed Apr 03 17:57:40 2019 +0200
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <span class="empty"></span>
     <a @click="zoomTo()" class="text-info pointer">
       {{ details.summary.bottleneck }}
     </a>
--- a/client/src/components/importoverview/StretchDetails.vue	Wed Apr 03 17:54:35 2019 +0200
+++ b/client/src/components/importoverview/StretchDetails.vue	Wed Apr 03 17:57:40 2019 +0200
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <span class="empty">&nbsp;</span>
     <a @click="zoomToStretch()" class="text-info pointer">{{
       details.summary.stretch
     }}</a>