From 1a055b06205b28288ccabcd6babce166f887d94e Mon Sep 17 00:00:00 2001
From: Hugo Cornu <hugo.cornu@live.fr>
Date: Mon, 27 Jun 2016 12:48:00 +0200
Subject: [PATCH 1/2] Update agendash.js

---
 lib/agendash.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/agendash.js b/lib/agendash.js
index 9b49a444..258deb1e 100644
--- a/lib/agendash.js
+++ b/lib/agendash.js
@@ -81,15 +81,23 @@ module.exports = function (agenda, options) {
       /*
       TODO: Need to validate user input.
       */
-      agenda.create(jobName,jobData)
-        .schedule(jobSchedule)
-        .repeatEvery(jobRepeatEvery)
-        .save(function (err) {
-          if (err) {
-            callback('Jobs not created')
-          }
-          callback()
-        });
+      var job = agenda.create(jobName,jobData)
+      if (jobSchedule ==='' && jobRepeatEvery === ''){
+        return callback('Jobs not created')
+      } else if (jobRepeatEvery ===''){
+        job.schedule(jobSchedule)
+      } else if (jobSchedule === ''){
+        job.repeatEvery(jobRepeatEvery)
+      } else {
+        job.repeatAt(jobSchedule)
+        job.repeatEvery(jobRepeatEvery)
+      }
+      job.save(function (err) {
+        if (err) {
+          return callback('Jobs not created')
+        }
+        callback()
+      });
     } catch (e) {
       callback(e.message)
     }

From 969550061c8b1562e6c936f02e4755f4d086d738 Mon Sep 17 00:00:00 2001
From: Hugo Cornu <hugo.cornu@live.fr>
Date: Wed, 29 Jun 2016 15:33:27 +0200
Subject: [PATCH 2/2] Update agendash.js

---
 lib/agendash.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/agendash.js b/lib/agendash.js
index 258deb1e..2ddbc338 100644
--- a/lib/agendash.js
+++ b/lib/agendash.js
@@ -82,15 +82,15 @@ module.exports = function (agenda, options) {
       TODO: Need to validate user input.
       */
       var job = agenda.create(jobName,jobData)
-      if (jobSchedule ==='' && jobRepeatEvery === ''){
-        return callback('Jobs not created')
-      } else if (jobRepeatEvery ===''){
+      if (jobSchedule && jobRepeatEvery) {
+        job.repeatAt(jobSchedule)
+        job.repeatEvery(jobRepeatEvery)
+      } else if (jobSchedule) {
         job.schedule(jobSchedule)
-      } else if (jobSchedule === ''){
+      } else if (jobRepeatEvery) {
         job.repeatEvery(jobRepeatEvery)
       } else {
-        job.repeatAt(jobSchedule)
-        job.repeatEvery(jobRepeatEvery)
+        return callback('Jobs not created')
       }
       job.save(function (err) {
         if (err) {