Mercurial > gemma

changeset 3421:fdfdef9eb3ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 23 May 2019 15:33:02 +0200
parents b9fc6c546610 (current diff) 079243130949 (diff)
children 34e846f89936
files
diffstat 4 files changed, 40 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/fairway/AvailableFairwayDepthDialogue.vue	Thu May 23 15:32:38 2019 +0200
+++ b/client/src/components/fairway/AvailableFairwayDepthDialogue.vue	Thu May 23 15:33:02 2019 +0200
@@ -506,7 +506,6 @@
           this.$store.commit("application/paneSetup", "AVAILABLEFAIRWAYDEPTH");
         })
         .catch(error => {
-          console.log(error);
           const { status, data } = error.response;
           displayError({
             title: this.$gettext("Backend Error"),
--- a/client/src/components/importconfiguration/ImportDetails.vue	Thu May 23 15:32:38 2019 +0200
+++ b/client/src/components/importconfiguration/ImportDetails.vue	Thu May 23 15:33:02 2019 +0200
@@ -11,33 +11,33 @@
           id="importtype"
         >
           <optgroup :label="regularLabel">
-            <option :value="$options.IMPORTTYPES.BOTTLENECK">
-              <translate>Bottlenecks</translate>
+            <option :value="$options.IMPORTTYPES.WATERWAYAREA">
+              <translate>Waterway area</translate>
             </option>
             <option :value="$options.IMPORTTYPES.WATERWAYAXIS">
               <translate>Waterway axis</translate>
             </option>
-            <option :value="$options.IMPORTTYPES.GAUGEMEASUREMENT">
-              <translate>Gauge measurement</translate>
-            </option>
-            <option :value="$options.IMPORTTYPES.FAIRWAYAVAILABILITY">
-              <translate>Available fairway depths</translate>
-            </option>
-            <option :value="$options.IMPORTTYPES.WATERWAYAREA">
-              <translate>Waterway area</translate>
-            </option>
             <option :value="$options.IMPORTTYPES.FAIRWAYDIMENSION">
               <translate>Fairway dimension</translate>
             </option>
-            <option :value="$options.IMPORTTYPES.WATERWAYGAUGES">
-              <translate>Waterway gauges</translate>
-            </option>
             <option :value="$options.IMPORTTYPES.DISTANCEMARKSVIRTUAL">
               <translate>Distance marks virtual</translate>
             </option>
             <option :value="$options.IMPORTTYPES.DISTANCEMARKSASHORE">
               <translate>Distance marks ashore</translate>
             </option>
+            <option :value="$options.IMPORTTYPES.WATERWAYGAUGES">
+              <translate>Waterway gauges</translate>
+            </option>
+            <option :value="$options.IMPORTTYPES.BOTTLENECK">
+              <translate>Bottlenecks</translate>
+            </option>
+            <option :value="$options.IMPORTTYPES.FAIRWAYAVAILABILITY">
+              <translate>Available fairway depths</translate>
+            </option>
+            <option :value="$options.IMPORTTYPES.GAUGEMEASUREMENT">
+              <translate>Gauge measurement</translate>
+            </option>
           </optgroup>
           <optgroup :label="onetimeLabel">
             <option :value="$options.IMPORTTYPES.SOUNDINGRESULTS">
--- a/client/src/components/importoverview/ImportOverview.vue	Thu May 23 15:32:38 2019 +0200
+++ b/client/src/components/importoverview/ImportOverview.vue	Thu May 23 15:33:02 2019 +0200
@@ -54,14 +54,23 @@
             </option>
           </select>
         </div>
-        <button
-          :disabled="!this.next"
-          @click="later"
-          class="btn btn-xs btn-outline-secondary"
-        >
-          <translate>Later</translate>
-          <font-awesome-icon icon="angle-right" fixed-width />
-        </button>
+        <div class="btn-group">
+          <button
+            :disabled="!this.next"
+            @click="later"
+            class="btn btn-xs btn-outline-secondary"
+          >
+            <translate>Later</translate>
+            <font-awesome-icon icon="angle-right" fixed-width />
+          </button>
+          <button
+            :disabled="!this.next"
+            @click="now"
+            class="btn btn-xs btn-outline-secondary"
+          >
+            <font-awesome-icon icon="angle-double-right" fixed-width />
+          </button>
+        </div>
       </div>
       <UITableHeader
         :columns="[
@@ -283,6 +292,13 @@
       this.$store.commit("imports/setEndDate", end);
       this.loadLogs();
     },
+    now() {
+      if (!this.next) return;
+      const [start, end] = this.determineInterval(new Date());
+      this.$store.commit("imports/setStartDate", start);
+      this.$store.commit("imports/setEndDate", end);
+      this.loadLogs();
+    },
     filteredImports() {
       return this.imports;
     },
--- a/client/src/main.js	Thu May 23 15:32:38 2019 +0200
+++ b/client/src/main.js	Thu May 23 15:33:02 2019 +0200
@@ -49,6 +49,7 @@
   faAngleLeft,
   faAngleRight,
   faAngleUp,
+  faAngleDoubleRight,
   faBars,
   faBook,
   faChartArea,
@@ -116,6 +117,7 @@
   faAngleLeft,
   faAngleRight,
   faAngleUp,
+  faAngleDoubleRight,
   faBars,
   faBook,
   faChartArea,