From 1f5f429fc4535d251d32335eea7e44904a924650 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 19 Aug 2018 18:53:50 +0200 Subject: Completed rules --- client/components/rules/actions/boardActions.jade | 30 +++++++++- client/components/rules/actions/boardActions.js | 53 +++++++++++++---- client/components/rules/actions/cardActions.jade | 43 ++++++++++++++ client/components/rules/actions/cardActions.js | 66 +++++++++++++++++++++ .../components/rules/actions/checklistActions.jade | 51 ++++++++++++++++ .../components/rules/actions/checklistActions.js | 61 +++++++++++++++++++ client/components/rules/actions/mailActions.jade | 11 ++++ client/components/rules/actions/mailActions.js | 21 +++++++ client/components/rules/rules.styl | 16 +++++ client/components/rules/rulesActions.jade | 18 ++++-- client/components/rules/rulesActions.js | 69 ++++++++++++---------- client/components/rules/rulesMain.jade | 4 +- client/components/rules/rulesMain.js | 2 +- client/components/rules/triggers/boardTriggers.js | 32 +++------- client/components/rules/triggers/cardTriggers.js | 40 ++++--------- .../components/rules/triggers/checklistTriggers.js | 52 +++++----------- 16 files changed, 421 insertions(+), 148 deletions(-) create mode 100644 client/components/rules/actions/cardActions.jade create mode 100644 client/components/rules/actions/cardActions.js create mode 100644 client/components/rules/actions/checklistActions.jade create mode 100644 client/components/rules/actions/checklistActions.js create mode 100644 client/components/rules/actions/mailActions.jade create mode 100644 client/components/rules/actions/mailActions.js (limited to 'client/components/rules') diff --git a/client/components/rules/actions/boardActions.jade b/client/components/rules/actions/boardActions.jade index fe56c3ee..81b2023d 100644 --- a/client/components/rules/actions/boardActions.jade +++ b/client/components/rules/actions/boardActions.jade @@ -4,16 +4,40 @@ template(name="boardActions") div.trigger-text | Move card to div.trigger-dropdown - select(id="action") + select(id="move-gen-action") + option(value="top") Top of + option(value="bottom") Bottom of + div.trigger-text + | its list + div.trigger-button.js-add-gen-move-action.js-goto-rules + i.fa.fa-plus + + div.trigger-item + div.trigger-content + div.trigger-text + | Move card to + div.trigger-dropdown + select(id="move-spec-action") option(value="top") Top of option(value="bottom") Bottom of div.trigger-text | list div.trigger-dropdown - input(type=text,placeholder="List Name") - div.trigger-button.js-add-move-action.js-goto-rules + input(id="listName",type=text,placeholder="List Name") + div.trigger-button.js-add-spec-move-action.js-goto-rules i.fa.fa-plus + div.trigger-item + div.trigger-content + div.trigger-dropdown + select(id="arch-action") + option(value="archive") Archive + option(value="unarchive") Unarchive + div.trigger-text + | card + div.trigger-button.js-add-arch-action.js-goto-rules + i.fa.fa-plus + diff --git a/client/components/rules/actions/boardActions.js b/client/components/rules/actions/boardActions.js index 53325ca0..94c2778d 100644 --- a/client/components/rules/actions/boardActions.js +++ b/client/components/rules/actions/boardActions.js @@ -7,23 +7,50 @@ BlazeComponent.extendComponent({ events() { return [ - {'click .js-add-move-action'(event) { - - console.log(this.data()); - console.log(this.data().triggerIdVar.get()); + {'click .js-add-spec-move-action'(event) { const ruleName = this.data().ruleName.get(); - const triggerId = this.data().triggerIdVar.get(); - const actionSelected = this.find('#action').value; - + const trigger = this.data().triggerVar.get(); + const actionSelected = this.find('#move-spec-action').value; + const listTitle = this.find('#listName').value; + if(actionSelected == "top"){ + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":listTitle}); + Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId}); + } + if(actionSelected == "bottom"){ + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":listTitle}); + Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId}); + } + }, + 'click .js-add-gen-move-action'(event) { + const ruleName = this.data().ruleName.get(); + const trigger = this.data().triggerVar.get(); + const actionSelected = this.find('#move-gen-action').value; if(actionSelected == "top"){ - Actions.insert({actionType: "moveCardToTop"},function(err,id){ - Rules.insert({title: ruleName, triggerId: triggerId, actionId: id}); - }); + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":"*"}); + Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId}); } if(actionSelected == "bottom"){ - Actions.insert({actionType: "moveCardToBottom"},function(err,id){ - Rules.insert({title: ruleName, triggerId: triggerId, actionId: id}); - }); + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":"*"}); + Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId}); + } + }, + 'click .js-add-arch-action'(event) { + const ruleName = this.data().ruleName.get(); + const trigger = this.data().triggerVar.get(); + const actionSelected = this.find('#arch-action').value; + if(actionSelected == "archive"){ + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({actionType: "archive"}); + Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId}); + } + if(actionSelected == "unarchive"){ + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({actionType: "unarchive"}); + Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId}); } }, }]; diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade new file mode 100644 index 00000000..8d218a49 --- /dev/null +++ b/client/components/rules/actions/cardActions.jade @@ -0,0 +1,43 @@ +template(name="cardActions") + div.trigger-item + div.trigger-content + div.trigger-dropdown + select(id="label-action") + option(value="add") Add + option(value="remove") Remove + div.trigger-text + | label + div.trigger-dropdown + select(id="label-id") + each labels + option(value="#{_id}") + = name + div.trigger-button.js-add-label-action.js-goto-rules + i.fa.fa-plus + + div.trigger-item + div.trigger-content + div.trigger-dropdown + select(id="member-action") + option(value="add") Add + option(value="remove") Removed + div.trigger-text + | member + div.trigger-dropdown + input(id="member-name",type=text,placeholder="Member name") + div.trigger-button.js-add-member-action.js-goto-rules + i.fa.fa-plus + + div.trigger-item + div.trigger-content + div.trigger-text + | Remove all member from the card + div.trigger-button.js-add-removeall-action.js-goto-rules + i.fa.fa-plus + + + + + + + diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js new file mode 100644 index 00000000..48120d91 --- /dev/null +++ b/client/components/rules/actions/cardActions.js @@ -0,0 +1,66 @@ +BlazeComponent.extendComponent({ + onCreated() { + this.subscribe('allRules'); + }, + + labels(){ + const labels = Boards.findOne(Session.get('currentBoard')).labels; + console.log(labels); + for(let i = 0;i