From 8d3cc064108eb95c228c9b8082037428c4404efe Mon Sep 17 00:00:00 2001
From: Jeroen De Meerleer <me@jeroened.be>
Date: Thu, 6 May 2021 15:53:21 +0200
Subject: [PATCH] Renamed delay to interval

---
 public/resources/job/add.js   |  8 ++++----
 src/Repository/Job.php        |  6 +++---
 storage/database.sql          |  2 +-
 templates/job/add.html.twig   | 18 +++++++++---------
 templates/job/index.html.twig |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/resources/job/add.js b/public/resources/job/add.js
index 66ed944..91ef8d8 100644
--- a/public/resources/job/add.js
+++ b/public/resources/job/add.js
@@ -2,7 +2,7 @@ $(function() {
     initDatePickers();
     initCronType();
     initVarInputs();
-    initDelayPattern();
+    initIntervalPattern();
     bsCustomFileInput.init()
 });
 
@@ -44,10 +44,10 @@ function initVarInputs()
 }
 
 
-function initDelayPattern()
+function initIntervalPattern()
 {
-    $('.delaypattern-item').on('click', function() {
+    $('.intervalpattern-item').on('click', function() {
         let time = $(this).data('time');
-        $('#delay').val(time);
+        $('#interval').val(time);
     })
 }
\ No newline at end of file
diff --git a/src/Repository/Job.php b/src/Repository/Job.php
index 8179786..b63786b 100644
--- a/src/Repository/Job.php
+++ b/src/Repository/Job.php
@@ -32,7 +32,7 @@ class Job
     {
         if(empty($values['type']) ||
             empty($values['name']) ||
-            empty($values['delay']) ||
+            empty($values['interval']) ||
             empty($values['nextrun'])
         ) {
             return ['success' => false, 'message' => 'Some fields are empty'];
@@ -118,10 +118,10 @@ class Job
         }
 
         $data = json_encode($data);
-        $addJobSql = "INSERT INTO job(name, data, delay, nextrun, lastrun) VALUES (:name, :data, :delay, :nextrun, :lastrun)";
+        $addJobSql = "INSERT INTO job(name, data, interval, nextrun, lastrun) VALUES (:name, :data, :interval, :nextrun, :lastrun)";
 
         $addJobStmt = $this->dbcon->prepare($addJobSql);
-        $addJobStmt->execute([':name' => $values['name'], ':data' => $data, ':delay' => $values['delay'], ':nextrun' => $values['nextrun'], ':lastrun' => $values['lastrun'], ]);
+        $addJobStmt->execute([':name' => $values['name'], ':data' => $data, ':interval' => $values['interval'], ':nextrun' => $values['nextrun'], ':lastrun' => $values['lastrun'], ]);
 
         return ['success' => true, 'message' => 'Cronjob succesfully added'];
     }
diff --git a/storage/database.sql b/storage/database.sql
index 7ec2a10..ac81d50 100644
--- a/storage/database.sql
+++ b/storage/database.sql
@@ -3,7 +3,7 @@ CREATE TABLE job (
      id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
      name TEXT(25) NOT NULL,
      "data" TEXT NOT NULL,
-     delay INTEGER,
+     interval INTEGER,
      nextrun INTEGER,
      lastrun INTEGER
 );
diff --git a/templates/job/add.html.twig b/templates/job/add.html.twig
index 631cfc7..476fe75 100644
--- a/templates/job/add.html.twig
+++ b/templates/job/add.html.twig
@@ -10,21 +10,21 @@
         <input type="text" name="name" class="form-control" id="name" placeholder="System update">
     </div>
     <div class="mb-3">
-        <label for="name">Delay (in seconds)</label>
+        <label for="name">Interval (in seconds)</label>
         <div class="input-group">
             <div class="dropdown input-group-prepend">
-                <button class="btn btn-outline-primary dropdown-toggle" type="button" id="delayButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button class="btn btn-outline-primary dropdown-toggle" type="button" id="intervalButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Patterns
                 </button>
-                <div class="dropdown-menu" aria-labelledby="delayButton">
-                    <a class="dropdown-item delaypattern-item" href="#" data-time="60">Every minute</a>
-                    <a class="dropdown-item delaypattern-item" href="#" data-time="3600">Every hour</a>
-                    <a class="dropdown-item delaypattern-item" href="#" data-time="86400">Every day</a>
-                    <a class="dropdown-item delaypattern-item" href="#" data-time="604800">Every week</a>
-                    <a class="dropdown-item delaypattern-item" href="#" data-time="2419200">Every 4 weeks</a>
+                <div class="dropdown-menu" aria-labelledby="intervalButton">
+                    <a class="dropdown-item intervalpattern-item" href="#" data-time="60">Every minute</a>
+                    <a class="dropdown-item intervalpattern-item" href="#" data-time="3600">Every hour</a>
+                    <a class="dropdown-item intervalpattern-item" href="#" data-time="86400">Every day</a>
+                    <a class="dropdown-item intervalpattern-item" href="#" data-time="604800">Every week</a>
+                    <a class="dropdown-item intervalpattern-item" href="#" data-time="2419200">Every 4 weeks</a>
                 </div>
             </div>
-            <input type="number" class="form-control" id="delay" name="delay">
+            <input type="number" class="form-control" id="interval" name="interval">
         </div>
     </div>
     <div class="mb-3">
diff --git a/templates/job/index.html.twig b/templates/job/index.html.twig
index 7791065..3043345 100644
--- a/templates/job/index.html.twig
+++ b/templates/job/index.html.twig
@@ -15,7 +15,7 @@
         <tr{% if(job.norun == true) %} class="norun"{% endif %}>
             <td>{{ job.name }}</td>
             <td>{{ job.data.host }}</td>
-            <td>{{ job.delay | interval }}</td>
+            <td>{{ job.interval | interval }}</td>
             <td>{{ job.nextrun |  date("d/m/Y H:i:s") }}</td>
             <td class="text-end">
                 <a href="#" data-id="{{ job.id }}" class="runcron btn btn-outline-primary"><i class="fa fa-play" aria-hidden="true"></i></a>