From 3914b2925598ff33adaaed1b4065106ea6733bcc Mon Sep 17 00:00:00 2001
From: Dominic Bosch <dominicsfakeaddress@server.fake>
Date: Tue, 22 Apr 2014 10:34:11 +0200
Subject: [PATCH] custom events do not need an interval and a start time

---
 coffee/components-manager.coffee           | 6 ++++--
 js/components-manager.js                   | 8 ++++++--
 webpages/handlers/coffee/forge_rule.coffee | 7 ++++++-
 webpages/handlers/js/forge_rule.js         | 8 +++++++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/coffee/components-manager.coffee b/coffee/components-manager.coffee
index 55cfbc3..92f08bc 100644
--- a/coffee/components-manager.coffee
+++ b/coffee/components-manager.coffee
@@ -256,10 +256,12 @@ storeRule = ( user, oPayload, callback ) =>
 			arr = id.split ' -> '
 			db.actionInvokers.storeUserArguments user.username, rule.id, arr[ 0 ], arr[ 1 ], JSON.stringify args 
 		
+		eventInfo = ''
+		if rule.event_start
+			eventInfo = "Starting at #{ new Date( rule.event_start ) }, Interval set to #{ rule.event_interval } minutes"
 		# Initialize the rule log
 		db.resetLog user.username, rule.id
-		db.appendLog user.username, rule.id, "INIT",
-			"Rule '#{ rule.id }' initialized. Interval set to #{ rule.event_interval } minutes"
+		db.appendLog user.username, rule.id, "INIT", "Rule '#{ rule.id }' initialized. #{ eventInfo }"
 		
 		# Inform everbody about the new rule
 		eventEmitter.emit 'rule',
diff --git a/js/components-manager.js b/js/components-manager.js
index 0796537..0a20ce2 100644
--- a/js/components-manager.js
+++ b/js/components-manager.js
@@ -310,7 +310,7 @@ Components Manager
 
   storeRule = (function(_this) {
     return function(user, oPayload, callback) {
-      var args, arr, epModId, id, oFuncArgs, oParams, params, rule, strRule;
+      var args, arr, epModId, eventInfo, id, oFuncArgs, oParams, params, rule, strRule;
       rule = {
         id: oPayload.id,
         event: oPayload.event,
@@ -344,8 +344,12 @@ Components Manager
         arr = id.split(' -> ');
         db.actionInvokers.storeUserArguments(user.username, rule.id, arr[0], arr[1], JSON.stringify(args));
       }
+      eventInfo = '';
+      if (rule.event_start) {
+        eventInfo = "Starting at " + (new Date(rule.event_start)) + ", Interval set to " + rule.event_interval + " minutes";
+      }
       db.resetLog(user.username, rule.id);
-      db.appendLog(user.username, rule.id, "INIT", "Rule '" + rule.id + "' initialized. Interval set to " + rule.event_interval + " minutes");
+      db.appendLog(user.username, rule.id, "INIT", "Rule '" + rule.id + "' initialized. " + eventInfo);
       eventEmitter.emit('rule', {
         event: 'new',
         user: user.username,
diff --git a/webpages/handlers/coffee/forge_rule.coffee b/webpages/handlers/coffee/forge_rule.coffee
index 0b520a8..7f4cce6 100644
--- a/webpages/handlers/coffee/forge_rule.coffee
+++ b/webpages/handlers/coffee/forge_rule.coffee
@@ -501,13 +501,18 @@ fOnLoad = () ->
 								.fail fFailedRequest "#{ obj.id } not stored!"
 					else
 						fFailedRequest( "#{ obj.id } not stored!" ) err
+			if $( '#select_event' ).val() is ''
+				start = null
+				mins = null
+			else 
+				start = start.toISOString()
 			obj =
 				command: 'forge_rule'
 				payload: JSON.stringify
 					id: $( '#input_id' ).val()
 					event: eventId
 					event_params: ep
-					event_start: start.toISOString()
+					event_start: start
 					event_interval: mins
 					event_functions: evtFuncs
 					conditions: conds
diff --git a/webpages/handlers/js/forge_rule.js b/webpages/handlers/js/forge_rule.js
index 125018e..27c6224 100644
--- a/webpages/handlers/js/forge_rule.js
+++ b/webpages/handlers/js/forge_rule.js
@@ -649,13 +649,19 @@
             }
           };
         };
+        if ($('#select_event').val() === '') {
+          start = null;
+          mins = null;
+        } else {
+          start = start.toISOString();
+        }
         obj = {
           command: 'forge_rule',
           payload: JSON.stringify({
             id: $('#input_id').val(),
             event: eventId,
             event_params: ep,
-            event_start: start.toISOString(),
+            event_start: start,
             event_interval: mins,
             event_functions: evtFuncs,
             conditions: conds,