Merge pull request #2 from NethServer/displayCron

Display the task frequency in the table

imageroot/actions/create-task/validate-input.json

@@ -53,6 +53,7 @@
             "enum": [
                 "",
                 "5m",
+                "10m",
                 "15m",
                 "30m",
                 "45m",

ui/public/i18n/en/translation.json

@@ -46,6 +46,7 @@
     "col_remotehostname": "IMAP server",
     "col_task_status": "Task status",
     "col_task_id": "Task ID",
+    "col_task_cron": "Task frequency",
     "create": "Create",
     "edit": "Edit",
     "start": "Start",
@@ -82,7 +83,7 @@
     "choose_the_user_to_sync": "Choose a user managed by your email server to synchronize the remote messages",
     "hour":"hour",
     "minutes":"minutes",
-    "no_cron": "No Scheduled",
+    "no_cron": "Not scheduled",
     "select_your_cron": "select your task frequency",
     "set_when_you_want_the_task_start": "Select when to start your task",
     "remove_mails":"Messages removal",
@@ -109,7 +110,7 @@
     "something_wrong_cannot_list_informations": "Something went wront we cannot list the remote and account informations",
     "informations": "Informations",
     "fetching_statistic_please_wait":"Waiting to retrieve statictics, please wait",
-    "every":"every",
+    "every_minutes":"Every {num} minutes",
     "configure_imapsync": "Go to the settings"
 
   },

ui/src/components/CreateOrEditTask.vue

@@ -182,25 +182,24 @@
           <cv-dropdown-item selected value="">{{
             $t("tasks.no_cron")
           }}</cv-dropdown-item>
-          <cv-dropdown-item value="5m"
-            >{{ $t("tasks.every") }} 5
-            {{ $t("tasks.minutes") }}</cv-dropdown-item
-          >
-          <cv-dropdown-item value="15m"
-            >{{ $t("tasks.every") }} 15
-            {{ $t("tasks.minutes") }}</cv-dropdown-item
-          >
-          <cv-dropdown-item value="30m"
-            >{{ $t("tasks.every") }} 30
-            {{ $t("tasks.minutes") }}</cv-dropdown-item
-          >
-          <cv-dropdown-item value="45m"
-            >{{ $t("tasks.every") }} 45
-            {{ $t("tasks.minutes") }}</cv-dropdown-item
-          >
-          <cv-dropdown-item value="1h"
-            >{{ $t("tasks.every") }} 1 {{ $t("tasks.hour") }}</cv-dropdown-item
-          >
+          <cv-dropdown-item value="5m">{{
+            $t("tasks.every_minutes", { num: 5 })
+          }}</cv-dropdown-item>
+          <cv-dropdown-item value="10m">{{
+            $t("tasks.every_minutes", { num: 10 })
+          }}</cv-dropdown-item>
+          <cv-dropdown-item value="15m">{{
+            $t("tasks.every_minutes", { num: 15 })
+          }}</cv-dropdown-item>
+          <cv-dropdown-item value="30m">{{
+            $t("tasks.every_minutes", { num: 30 })
+          }}</cv-dropdown-item>
+          <cv-dropdown-item value="45m">{{
+            $t("tasks.every_minutes", { num: 45 })
+          }}</cv-dropdown-item>
+          <cv-dropdown-item value="1h">{{
+            $t("tasks.every_minutes", { num: 60 })
+          }}</cv-dropdown-item>
         </cv-dropdown>
       </cv-form>
       <cv-row v-if="error.createTask">

ui/src/views/Tasks.vue

@@ -136,6 +136,15 @@
                   <cv-data-table-cell>
                     {{ row.remotehostname }}
                   </cv-data-table-cell>
+                  <cv-data-table-cell>
+                    {{
+                      row.cron === ""
+                        ? $t("tasks.no_cron")
+                        : row.cron === "1h"
+                        ?  parseInt(row.cron) + " " + $t("tasks.hour")
+                        :  parseInt(row.cron) + " " + $t("tasks.minutes")
+                    }}
+                  </cv-data-table-cell>
                   <cv-data-table-cell>
                     {{
                       row.service ? $t("tasks.running") : $t("tasks.stopped")
@@ -270,6 +279,7 @@ export default {
         "localuser",
         "remoteusername",
         "remotehostname",
+        "task_cron",
         "task_status",
         "task_id",
       ],