Hopiu/webapi-eca
1
0
Fork 0
mirror of https://github.com/Hopiu/webapi-eca.git synced 2026-03-19 07:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

custom events do not need an interval and a start time

Browse source
This commit is contained in:
Dominic Bosch 2014-04-22 10:34:11 +02:00
parent 4cd014801a
commit 3914b29255
4 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coffee/components-manager.coffee
View file

@ -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',

8
js/components-manager.js
View file

@ -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,

7
webpages/handlers/coffee/forge_rule.coffee
View file

@ -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

8
webpages/handlers/js/forge_rule.js
View file

@ -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,