Mercurial > gemma

changeset 1725:b24a54c684bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
importschedule: UI improvements
author Thomas Junk <thomas.junk@intevation.de>
date Wed, 09 Jan 2019 11:39:39 +0100
parents 79a18eb1672b
children 9e1abe157e47
files client/src/components/Sidebar.vue client/src/components/importschedule/Importschedule.vue client/src/components/importschedule/Importscheduledetail.vue client/src/store/imports.js
diffstat 4 files changed, 59 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Sidebar.vue	Wed Jan 09 10:18:35 2019 +0100
+++ b/client/src/components/Sidebar.vue	Wed Jan 09 11:39:39 2019 +0100
@@ -60,7 +60,7 @@
           ></font-awesome-icon>
           <span class="fix-trans-space" v-translate>Import stretches</span>
         </router-link>
-        <router-link to="importschedule" v-if="this.$options.IMPORTSCHEDULE">
+        <router-link to="importschedule">
           <font-awesome-icon
             class="fa-fw mr-2"
             fixed-width
@@ -171,7 +171,6 @@
       ];
     }
   },
-  IMPORTSCHEDULE: process.env.VUE_APP_FEATURE_IMPORTSCHEDULE,
   IMPORTSTRETCHES: process.env.VUE_APP_FEATURE_IMPORTSTRETCHES,
   methods: {
     logoff() {
--- a/client/src/components/importschedule/Importschedule.vue	Wed Jan 09 10:18:35 2019 +0100
+++ b/client/src/components/importschedule/Importschedule.vue	Wed Jan 09 11:39:39 2019 +0100
@@ -11,7 +11,7 @@
         </h6>
         <div class="card-body schedulecardbody">
           <div class="card-body schedulecardbody">
-            <div class="searchandfilter  w-50 d-flex flex-row">
+            <div class="searchandfilter mb-3  w-50 d-flex flex-row">
               <div class="searchgroup input-group">
                 <div class="input-group-prepend">
                   <span class="input-group-text" id="search">
@@ -38,15 +38,23 @@
                   <th><translate>Email</translate></th>
                   <th>&nbsp;</th>
                   <th>&nbsp;</th>
+                  <th>&nbsp;</th>
                 </tr>
               </thead>
               <tbody>
-                <tr v-for="(schedule, index) in schedules" :key="index">
-                  <td></td>
+                <tr v-for="schedule in schedules" :key="schedule.id">
+                  <td>{{ schedule.id }}</td>
+                  <td>{{ schedule.kind }}</td>
+                  <td>{{ schedule.user }}</td>
                   <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
+                  <td>
+                    <font-awesome-icon
+                      v-if="schedule['send-email']"
+                      class="fa-fw mr-2"
+                      fixed-width
+                      icon="check"
+                    ></font-awesome-icon>
+                  </td>
                   <td>
                     <font-awesome-icon
                       icon="pencil-alt"
@@ -55,11 +63,19 @@
                   </td>
                   <td>
                     <font-awesome-icon
-                      @click="deleteSchedule"
+                      @click="deleteSchedule(schedule.id)"
                       icon="trash"
                       fixed-width
                     ></font-awesome-icon>
                   </td>
+                  <td>
+                    <font-awesome-icon
+                      @click="triggerManualImport(schedule.id)"
+                      class="fa-fw mr-2"
+                      fixed-width
+                      icon="play"
+                    ></font-awesome-icon>
+                  </td>
                 </tr>
               </tbody>
             </table>
@@ -96,7 +112,8 @@
  */
 
 import { mapState } from "vuex";
-import { displayError } from "@/lib/errors.js";
+import { HTTP } from "@/lib/http";
+import { displayInfo, displayError } from "@/lib/errors.js";
 
 export default {
   name: "importschedule",
@@ -113,11 +130,30 @@
     this.getSchedules();
   },
   methods: {
+    triggerManualImport(id) {
+      HTTP.get("/imports/config/" + id, {
+        headers: { "X-Gemma-Auth": localStorage.getItem("token") }
+      })
+        .then(response => {
+          const { id } = response.data;
+          displayInfo({
+            title: this.$gettext("Not Implemented"),
+            message: this.$gettext("Manually triggered import: #") + id
+          });
+        })
+        .catch(error => {
+          const { status, data } = error.response;
+          displayError({
+            title: this.$gettext("Backend Error"),
+            message: `${status}: ${data.message || data}`
+          });
+        });
+    },
     getSchedules() {
       this.$store.dispatch("imports/loadSchedules").catch(error => {
         const { status, data } = error.response;
         displayError({
-          title: this.gettext("Backend Error"),
+          title: this.$gettext("Backend Error"),
           message: `${status}: ${data.message || data}`
         });
       });
@@ -126,7 +162,13 @@
       this.$store.commit("imports/setImportScheduleDetailVisible");
     },
     deleteSchedule(index) {
-      this.$store.commit("imports/deleteSchedule", index);
+      this.$store.dispatch("imports/deleteSchedule", index).catch(error => {
+        const { status, data } = error.response;
+        displayError({
+          title: this.$gettext("Backend Error"),
+          message: `${status}: ${data.message || data}`
+        });
+      });
     }
   },
   computed: {
@@ -146,6 +188,10 @@
 </script>
 
 <style lang="scss" scoped>
+th {
+  border-top: 0px;
+}
+
 .schedulecard {
   margin-right: $offset;
   min-height: 20rem;
--- a/client/src/components/importschedule/Importscheduledetail.vue	Wed Jan 09 10:18:35 2019 +0100
+++ b/client/src/components/importschedule/Importscheduledetail.vue	Wed Jan 09 11:39:39 2019 +0100
@@ -499,7 +499,7 @@
     },
     triggerManualImport() {
       if (!this.triggerActive) return;
-      if (!this._imports) return;
+      if (!this.import_) return;
       let data = {};
       if (this.import_ === this.$options.IMPORTTYPES.BOTTLENECK) {
         if (!this.url) return;
--- a/client/src/store/imports.js	Wed Jan 09 10:18:35 2019 +0100
+++ b/client/src/store/imports.js	Wed Jan 09 11:39:39 2019 +0100
@@ -12,7 +12,7 @@
  * Thomas Junk <thomas.junk@intevation.de>
  */
 
-import { HTTP } from "../lib/http";
+import { HTTP } from "@/lib/http";
 
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-unreachable */
@@ -80,9 +80,6 @@
     clearCurrentSchedule: state => {
       state.currentSchedule = initializeCurrentSchedule();
     },
-    deleteSchedule: (state, index) => {
-      state.schedules.splice(index, 1);
-    },
     setImportScheduleDetailInvisible: state => {
       state.importScheduleDetailVisible = false;
     },