Mercurial > gemma

changeset 2877:55a9c7965e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: importoverview: fixed interval select fix gnarf sorry...
author Markus Kottlaender <markus@intevation.de>
date Mon, 01 Apr 2019 13:24:32 +0200
parents 0e0cc65d3479
children 4f66a3ba424b 8b32574bed09
files client/src/components/importoverview/ImportOverview.vue
diffstat 1 files changed, 19 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importoverview/ImportOverview.vue	Mon Apr 01 13:06:46 2019 +0200
+++ b/client/src/components/importoverview/ImportOverview.vue	Mon Apr 01 13:24:32 2019 +0200
@@ -54,24 +54,16 @@
             class="my-auto btn btn-outline-light text-dark form-control interval-select"
             v-model="selectedInterval"
           >
-            <option
-              :selected="selectedInterval === LAST_HOUR"
-              :value="LAST_HOUR"
+            <option :value="$options.LAST_HOUR"
               ><translate>Hour</translate></option
             >
-            <option :selected="selectedInterval === TODAY" :value="TODAY"
-              ><translate>Day</translate></option
-            >
-            <option
-              :selected="selectedInterval === LAST_7_DAYS"
-              :value="LAST_7_DAYS"
+            <option :value="$options.TODAY"><translate>Day</translate></option>
+            <option :value="$options.LAST_7_DAYS"
               ><translate>7 days</translate></option
             >
-            <option
-              :selected="selectedInterval === LAST_30_DAYS"
-              :value="LAST_30_DAYS"
-              ><translate>30 Days</translate></option
-            >
+            <option :value="$options.LAST_30_DAYS">
+              <translate>30 Days</translate>
+            </option>
           </select>
         </div>
       </div>
@@ -134,21 +126,20 @@
   format
 } from "date-fns";
 
-const LAST_HOUR = "lasthour";
-const TODAY = "today";
-const LAST_7_DAYS = "lastsevendays";
-const LAST_30_DAYS = "lastthirtydays";
-
 export default {
   components: {
     Filters: () => import("./Filters.vue"),
     LogEntry: () => import("./LogEntry.vue")
   },
   mixins: [sortTable],
+  LAST_HOUR: "lasthour",
+  TODAY: "today",
+  LAST_7_DAYS: "lastsevendays",
+  LAST_30_DAYS: "lastthirtydays",
   data() {
     return {
       loading: false,
-      selectedInterval: LAST_HOUR
+      selectedInterval: this.$options.LAST_HOUR
     };
   },
   computed: {
@@ -196,22 +187,22 @@
     selectedInterval() {
       const now = new Date();
       switch (this.selectedInterval) {
-        case LAST_HOUR:
+        case this.$options.LAST_HOUR:
           this.$store.commit("imports/setStartDate", startOfHour(now));
           this.$store.commit("imports/setEndDate", now);
           break;
-        case TODAY:
+        case this.$options.TODAY:
           this.$store.commit("imports/setStartDate", startOfDay(now));
           this.$store.commit("imports/setEndDate", now);
           break;
-        case LAST_7_DAYS:
+        case this.$options.LAST_7_DAYS:
           this.$store.commit(
             "imports/setStartDate",
             subDays(startOfDay(now), 7)
           );
           this.$store.commit("imports/setEndDate", now);
           break;
-        case LAST_30_DAYS:
+        case this.$options.LAST_30_DAYS:
           this.$store.commit(
             "imports/setStartDate",
             subDays(startOfDay(now), 30)
@@ -278,19 +269,19 @@
     determineInterval(pointInTime) {
       let start, end;
       switch (this.selectedInterval) {
-        case LAST_HOUR:
+        case this.$options.LAST_HOUR:
           start = startOfHour(pointInTime);
           end = endOfHour(pointInTime);
           break;
-        case TODAY:
+        case this.$options.TODAY:
           start = startOfDay(pointInTime);
           end = endOfDay(pointInTime);
           break;
-        case LAST_7_DAYS:
+        case this.$options.LAST_7_DAYS:
           start = startOfDay(pointInTime);
           end = endOfDay(addDays(start, 7));
           break;
-        case LAST_30_DAYS:
+        case this.$options.LAST_30_DAYS:
           start = startOfDay(pointInTime);
           end = endOfDay(addDays(start, 30));
           break;