From 9d1d66b0f5253c571f07c0f7c6250f5a725ddbb1 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sat, 29 Dec 2018 16:59:50 +0100 Subject: Added triggers by username --- client/components/rules/rules.styl | 7 +++- client/components/rules/rulesMain.js | 19 ++++++++++ .../components/rules/triggers/boardTriggers.jade | 37 ++++++++++++++++++- client/components/rules/triggers/cardTriggers.jade | 35 ++++++++++++++++++ .../rules/triggers/checklistTriggers.jade | 42 ++++++++++++++++++++++ 5 files changed, 138 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index b52f84a7..4679e039 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -10,7 +10,10 @@ display: inline-block float: left margin: revert - +.hide-element + display:none !important +.user-details + display:inline-block .rules-btns-group position: absolute right: 0 @@ -160,6 +163,8 @@ box-shadow: 0 0 0 2px darken(white, 60%) inset .trigger-button.trigger-button-email top:30px + .trigger-button.trigger-button-person + right:-40px .trigger-item.trigger-item-mail height:300px diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 0752a541..566fd3e5 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -42,7 +42,26 @@ BlazeComponent.extendComponent({ }, 'click .js-goto-action' (event) { event.preventDefault(); + // Add user to the trigger + const username = $(event.currentTarget.offsetParent).find(".user-name").val(); + let trigger = this.triggerVar.get(); + const user = Users.findOne({"username":username}); + if(user != undefined){ + trigger["userId"] = user._id; + }else{ + trigger["userId"] = "*"; + } + this.triggerVar.set(trigger); this.setAction(); + }, + 'click .js-show-user-field' (event) { + event.preventDefault(); + console.log(event); + console.log(event.currentTarget.offsetParent); + console.log($(event.currentTarget.offsetParent)); + $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element"); + + }, 'click .js-goto-rules' (event) { event.preventDefault(); diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index 48b9345c..b0f2b44f 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -9,6 +9,13 @@ template(name="boardTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-the-board'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-trigger.js-goto-action i.fa.fa-plus @@ -23,7 +30,14 @@ template(name="boardTriggers") div.trigger-text | {{_'r-list'}} div.trigger-dropdown - input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}") + input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}") + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-create-trigger.js-goto-action i.fa.fa-plus @@ -31,6 +45,13 @@ template(name="boardTriggers") div.trigger-content div.trigger-text | {{_'r-when-a-card-is-moved'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-moved-trigger.js-goto-action i.fa.fa-plus @@ -46,6 +67,13 @@ template(name="boardTriggers") | {{_'r-list'}} div.trigger-dropdown input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}") + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-moved-trigger.js-goto-action i.fa.fa-plus @@ -57,6 +85,13 @@ template(name="boardTriggers") select(id="arch-action") option(value="archived") {{_'r-archived'}} option(value="unarchived") {{_'r-unarchived'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-arch-trigger.js-goto-action i.fa.fa-plus diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade index 5226e3c4..52594986 100644 --- a/client/components/rules/triggers/cardTriggers.jade +++ b/client/components/rules/triggers/cardTriggers.jade @@ -9,6 +9,13 @@ template(name="cardTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-label-trigger.js-goto-action i.fa.fa-plus @@ -29,6 +36,13 @@ template(name="cardTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-label-trigger.js-goto-action i.fa.fa-plus @@ -42,6 +56,13 @@ template(name="cardTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-member-trigger.js-goto-action i.fa.fa-plus @@ -60,6 +81,13 @@ template(name="cardTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-member-trigger.js-goto-action i.fa.fa-plus @@ -75,5 +103,12 @@ template(name="cardTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-attachment-trigger.js-goto-action i.fa.fa-plus diff --git a/client/components/rules/triggers/checklistTriggers.jade b/client/components/rules/triggers/checklistTriggers.jade index c6cd99a6..a563e93b 100644 --- a/client/components/rules/triggers/checklistTriggers.jade +++ b/client/components/rules/triggers/checklistTriggers.jade @@ -9,6 +9,13 @@ template(name="checklistTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-check-trigger.js-goto-action i.fa.fa-plus @@ -27,6 +34,13 @@ template(name="checklistTriggers") option(value="removed") {{_'r-removed-from'}} div.trigger-text | {{_'r-a-card'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-check-trigger.js-goto-action i.fa.fa-plus @@ -38,6 +52,13 @@ template(name="checklistTriggers") select(id="gen-comp-check-action") option(value="completed") {{_'r-completed'}} option(value="uncompleted") {{_'r-made-incomplete'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-comp-trigger.js-goto-action i.fa.fa-plus @@ -53,6 +74,13 @@ template(name="checklistTriggers") select(id="spec-comp-check-action") option(value="completed") {{_'r-completed'}} option(value="uncompleted") {{_'r-made-incomplete'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-comp-trigger.js-goto-action i.fa.fa-plus @@ -64,6 +92,13 @@ template(name="checklistTriggers") select(id="check-item-gen-action") option(value="checked") {{_'r-checked'}} option(value="unchecked") {{_'r-unchecked'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-check-item-trigger.js-goto-action i.fa.fa-plus @@ -79,5 +114,12 @@ template(name="checklistTriggers") select(id="check-item-spec-action") option(value="checked") {{_'r-checked'}} option(value="unchecked") {{_'r-unchecked'}} + div.trigger-button.trigger-button-person.js-show-user-field + i.fa.fa-user + div.user-details.hide-element + div.trigger-text + | {{_'r-by'}} + div.trigger-dropdown + input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-check-item-trigger.js-goto-action i.fa.fa-plus -- cgit v1.2.3-1-g7c22 From b2f23d619d1ff33e899080dca17d018f0e8d0963 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sat, 29 Dec 2018 17:36:57 +0100 Subject: Triggers by username, updated desc --- client/lib/utils.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/lib/utils.js b/client/lib/utils.js index d46d8076..5ec62ef9 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -218,11 +218,14 @@ Utils = { const element = tempInstance.$(triggerEls[i]); if (element.hasClass('trigger-text')) { finalString += element.text().toLowerCase(); + } else if (element.hasClass('user-details')) { + console.log(element); + finalString += element.find('.trigger-text').text().toLowerCase()+ " " + element.find('input').val(); } else if (element.find('select').length > 0) { finalString += element.find('select option:selected').text().toLowerCase(); } else if (element.find('input').length > 0) { finalString += element.find('input').val(); - } + } // Add space if (i !== length - 1) { finalString += ' '; -- cgit v1.2.3-1-g7c22 From a2d756074f05299248944ecce2cc87a9a28ab020 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 30 Dec 2018 22:08:34 +0100 Subject: Added swimlane trigger --- .../components/rules/triggers/boardTriggers.jade | 35 +++++++++++--------- client/components/rules/triggers/boardTriggers.js | 37 ++++++++-------------- client/components/rules/triggers/cardTriggers.jade | 10 +++--- .../rules/triggers/checklistTriggers.jade | 12 +++---- client/lib/utils.js | 13 ++++++-- 5 files changed, 54 insertions(+), 53 deletions(-) (limited to 'client') diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index b0f2b44f..abf2ee6d 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -3,10 +3,8 @@ template(name="boardTriggers") div.trigger-content div.trigger-text | {{_'r-when-a-card-is'}} - div.trigger-dropdown - select(id="gen-action") - option(value="created") {{_'r-added-to'}} - option(value="removed") {{_'r-removed-from'}} + div.trigger-text + | {{_'r-added-to'}} div.trigger-text | {{_'r-the-board'}} div.trigger-button.trigger-button-person.js-show-user-field @@ -15,7 +13,7 @@ template(name="boardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-trigger.js-goto-action i.fa.fa-plus @@ -23,21 +21,23 @@ template(name="boardTriggers") div.trigger-content div.trigger-text | {{_'r-when-a-card-is'}} - div.trigger-dropdown - select(id="create-action") - option(value="created") {{_'r-added-to'}} - option(value="removed") {{_'r-removed-from'}} + div.trigger-text + | {{_'r-added-to'}} div.trigger-text | {{_'r-list'}} div.trigger-dropdown - input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}") + input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}") + div.trigger-text + | {{_'r-swimlane'}} + div.trigger-dropdown + input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") div.trigger-button.trigger-button-person.js-show-user-field i.fa.fa-user div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-create-trigger.js-goto-action i.fa.fa-plus @@ -51,7 +51,7 @@ template(name="boardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-moved-trigger.js-goto-action i.fa.fa-plus @@ -66,14 +66,19 @@ template(name="boardTriggers") div.trigger-text | {{_'r-list'}} div.trigger-dropdown - input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}") + input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}") + div.trigger-text + | {{_'r-swimlane'}} + div.trigger-dropdown + input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") + div.trigger-button.trigger-button-person.js-show-user-field div.trigger-button.trigger-button-person.js-show-user-field i.fa.fa-user div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-moved-trigger.js-goto-action i.fa.fa-plus @@ -91,7 +96,7 @@ template(name="boardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-arch-trigger.js-goto-action i.fa.fa-plus diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js index 40c5b07e..b822d643 100644 --- a/client/components/rules/triggers/boardTriggers.js +++ b/client/components/rules/triggers/boardTriggers.js @@ -8,60 +8,48 @@ BlazeComponent.extendComponent({ 'click .js-add-gen-trigger' (event) { const desc = Utils.getTriggerActionDesc(event, this); const datas = this.data(); - const actionSelected = this.find('#gen-action').value; const boardId = Session.get('currentBoard'); - if (actionSelected === 'created') { - datas.triggerVar.set({ + datas.triggerVar.set({ activityType: 'createCard', boardId, 'listName': '*', desc, }); - } - if (actionSelected === 'removed') { - datas.triggerVar.set({ - activityType: 'removeCard', - boardId, - desc, - }); - } }, 'click .js-add-create-trigger' (event) { const desc = Utils.getTriggerActionDesc(event, this); const datas = this.data(); - const actionSelected = this.find('#create-action').value; const listName = this.find('#create-list-name').value; + const swimlaneName = this.find('#create-swimlane-name').value; + if(swimlaneName == undefined || swimlaneName == ""){ + swimlaneName = "*"; + } const boardId = Session.get('currentBoard'); - if (actionSelected === 'created') { - datas.triggerVar.set({ + datas.triggerVar.set({ activityType: 'createCard', boardId, + swimlaneName, listName, desc, }); - } - if (actionSelected === 'removed') { - datas.triggerVar.set({ - activityType: 'removeCard', - boardId, - listName, - desc, - }); - } }, 'click .js-add-moved-trigger' (event) { const datas = this.data(); const desc = Utils.getTriggerActionDesc(event, this); - + const swimlaneName = this.find('#create-swimlane-name').value; const actionSelected = this.find('#move-action').value; const listName = this.find('#move-list-name').value; const boardId = Session.get('currentBoard'); + if(swimlaneName == undefined || swimlaneName == ""){ + swimlaneName = "*"; + } if (actionSelected === 'moved-to') { datas.triggerVar.set({ activityType: 'moveCard', boardId, listName, + swimlaneName, 'oldListName': '*', desc, }); @@ -70,6 +58,7 @@ BlazeComponent.extendComponent({ datas.triggerVar.set({ activityType: 'moveCard', boardId, + swimlaneName, 'listName': '*', 'oldListName': listName, desc, diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade index 52594986..54133451 100644 --- a/client/components/rules/triggers/cardTriggers.jade +++ b/client/components/rules/triggers/cardTriggers.jade @@ -15,7 +15,7 @@ template(name="cardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-label-trigger.js-goto-action i.fa.fa-plus @@ -42,7 +42,7 @@ template(name="cardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-label-trigger.js-goto-action i.fa.fa-plus @@ -62,7 +62,7 @@ template(name="cardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-member-trigger.js-goto-action i.fa.fa-plus @@ -87,7 +87,7 @@ template(name="cardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-member-trigger.js-goto-action i.fa.fa-plus @@ -109,6 +109,6 @@ template(name="cardTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-attachment-trigger.js-goto-action i.fa.fa-plus diff --git a/client/components/rules/triggers/checklistTriggers.jade b/client/components/rules/triggers/checklistTriggers.jade index a563e93b..8745b364 100644 --- a/client/components/rules/triggers/checklistTriggers.jade +++ b/client/components/rules/triggers/checklistTriggers.jade @@ -15,7 +15,7 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-check-trigger.js-goto-action i.fa.fa-plus @@ -40,7 +40,7 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-check-trigger.js-goto-action i.fa.fa-plus @@ -58,7 +58,7 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-comp-trigger.js-goto-action i.fa.fa-plus @@ -80,7 +80,7 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-comp-trigger.js-goto-action i.fa.fa-plus @@ -98,7 +98,7 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-gen-check-item-trigger.js-goto-action i.fa.fa-plus @@ -120,6 +120,6 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-by'}} div.trigger-dropdown - input(class="user-name",id="create-list-name",type=text,placeholder="{{_'r-user-name'}}") + input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") div.trigger-button.js-add-spec-check-item-trigger.js-goto-action i.fa.fa-plus diff --git a/client/lib/utils.js b/client/lib/utils.js index 5ec62ef9..f252a220 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -219,12 +219,19 @@ Utils = { if (element.hasClass('trigger-text')) { finalString += element.text().toLowerCase(); } else if (element.hasClass('user-details')) { - console.log(element); - finalString += element.find('.trigger-text').text().toLowerCase()+ " " + element.find('input').val(); + let username = element.find('input').val(); + if(username == undefined || username == ""){ + username = "*"; + } + finalString += element.find('.trigger-text').text().toLowerCase()+ " " + username ; } else if (element.find('select').length > 0) { finalString += element.find('select option:selected').text().toLowerCase(); } else if (element.find('input').length > 0) { - finalString += element.find('input').val(); + let inputvalue = element.find('input').val(); + if(inputvalue == undefined || inputvalue == ""){ + inputvalue = "*"; + } + finalString += inputvalue; } // Add space if (i !== length - 1) { -- cgit v1.2.3-1-g7c22 From 196fef3a1bca7d2d4fbb07e6134c1de2a4338a97 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Mon, 31 Dec 2018 00:45:11 +0100 Subject: Added popup --- client/components/rules/rules.styl | 9 +++++++++ client/components/rules/rulesMain.jade | 8 +++++++- client/components/rules/rulesMain.js | 1 + client/components/rules/triggers/boardTriggers.jade | 2 ++ client/lib/popup.js | 6 ++---- 5 files changed, 21 insertions(+), 5 deletions(-) (limited to 'client') diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 4679e039..27463d12 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -123,6 +123,15 @@ .trigger-text font-size: 16px display:inline-block + .trigger-inline-button + font-size: 16px + display: inline; + padding: 6px; + border: 1px solid #eee + border-radius: 4px + box-shadow: inset -1px -1px 3px rgba(0,0,0,.05) + &:hover, &.is-active + box-shadow: 0 0 0 2px darken(white, 60%) inset .trigger-text.trigger-text-email margin-left: 5px; margin-top: 10px; diff --git a/client/components/rules/rulesMain.jade b/client/components/rules/rulesMain.jade index dc33ee4e..d01d9f77 100644 --- a/client/components/rules/rulesMain.jade +++ b/client/components/rules/rulesMain.jade @@ -6,4 +6,10 @@ template(name="rulesMain") if($eq rulesCurrentTab.get 'action') +rulesActions(ruleName=ruleName triggerVar=triggerVar) if($eq rulesCurrentTab.get 'ruleDetails') - +ruleDetails(ruleId=ruleId) \ No newline at end of file + +ruleDetails(ruleId=ruleId) + +template(name="boardCardTitlePopup") + form + label + | Card Title Filter + input.js-board-name(type="text" value=title autofocus) \ No newline at end of file diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 566fd3e5..373c7502 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -31,6 +31,7 @@ BlazeComponent.extendComponent({ Triggers.remove(rule.triggerId); }, + 'click .js-open-card-title-popup': Popup.open('boardCardTitle'), 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index abf2ee6d..f8767974 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -21,6 +21,8 @@ template(name="boardTriggers") div.trigger-content div.trigger-text | {{_'r-when-a-card-is'}} + div.trigger-inline-button.js-open-card-title-popup + i.fa.fa-filter div.trigger-text | {{_'r-added-to'}} div.trigger-text diff --git a/client/lib/popup.js b/client/lib/popup.js index 516ce849..5b640f50 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -27,11 +27,9 @@ window.Popup = new class { open(name) { const self = this; const popupName = `${name}Popup`; - function clickFromPopup(evt) { return $(evt.target).closest('.js-pop-over').length !== 0; } - return function(evt) { // If a popup is already opened, clicking again on the opener element // should close it -- and interrupt the current `open` function. @@ -57,7 +55,6 @@ window.Popup = new class { self._stack = []; openerElement = evt.currentTarget; } - $(openerElement).addClass('is-active'); evt.preventDefault(); @@ -139,6 +136,7 @@ window.Popup = new class { const openerElement = this._getTopStack().openerElement; $(openerElement).removeClass('is-active'); + this._stack = []; } } @@ -200,7 +198,7 @@ escapeActions.forEach((actionName) => { () => Popup[actionName](), () => Popup.isOpen(), { - noClickEscapeOn: '.js-pop-over', + noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup', enabledOnClick: actionName === 'close', } ); -- cgit v1.2.3-1-g7c22 From 25968a35cc568e1c3f7d084632f4d2c8b41ed380 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 14:45:45 +0100 Subject: Finished triggers improvements --- client/components/rules/rulesMain.jade | 8 +--- client/components/rules/rulesMain.js | 34 ++++++++------ .../components/rules/triggers/boardTriggers.jade | 54 +++++++++++----------- client/components/rules/triggers/boardTriggers.js | 51 ++++++++++++-------- 4 files changed, 82 insertions(+), 65 deletions(-) (limited to 'client') diff --git a/client/components/rules/rulesMain.jade b/client/components/rules/rulesMain.jade index d01d9f77..dc33ee4e 100644 --- a/client/components/rules/rulesMain.jade +++ b/client/components/rules/rulesMain.jade @@ -6,10 +6,4 @@ template(name="rulesMain") if($eq rulesCurrentTab.get 'action') +rulesActions(ruleName=ruleName triggerVar=triggerVar) if($eq rulesCurrentTab.get 'ruleDetails') - +ruleDetails(ruleId=ruleId) - -template(name="boardCardTitlePopup") - form - label - | Card Title Filter - input.js-board-name(type="text" value=title autofocus) \ No newline at end of file + +ruleDetails(ruleId=ruleId) \ No newline at end of file diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 373c7502..42116790 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -1,4 +1,4 @@ -BlazeComponent.extendComponent({ +let rulesMainComponent = BlazeComponent.extendComponent({ onCreated() { this.rulesCurrentTab = new ReactiveVar('rulesList'); this.ruleName = new ReactiveVar(''); @@ -9,7 +9,13 @@ BlazeComponent.extendComponent({ setTrigger() { this.rulesCurrentTab.set('trigger'); }, - + sanitizeObject(obj){ + Object.keys(obj).forEach(key =>{ + if(obj[key] == "" || obj[key] == undefined){ + obj[key] = "*"; + }} + ); + }, setRulesList() { this.rulesCurrentTab.set('rulesList'); }, @@ -31,7 +37,6 @@ BlazeComponent.extendComponent({ Triggers.remove(rule.triggerId); }, - 'click .js-open-card-title-popup': Popup.open('boardCardTitle'), 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; @@ -46,23 +51,23 @@ BlazeComponent.extendComponent({ // Add user to the trigger const username = $(event.currentTarget.offsetParent).find(".user-name").val(); let trigger = this.triggerVar.get(); - const user = Users.findOne({"username":username}); - if(user != undefined){ - trigger["userId"] = user._id; - }else{ - trigger["userId"] = "*"; + trigger["userId"] = "*"; + if(username != undefined ){ + const userFound = Users.findOne({"username":username}); + if(userFound != undefined){ + trigger["userId"] = userFound._id; + this.triggerVar.set(trigger); + } } + // Sanitize trigger + trigger = this.triggerVar.get(); + this.sanitizeObject(trigger) this.triggerVar.set(trigger); this.setAction(); }, 'click .js-show-user-field' (event) { event.preventDefault(); - console.log(event); - console.log(event.currentTarget.offsetParent); - console.log($(event.currentTarget.offsetParent)); $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element"); - - }, 'click .js-goto-rules' (event) { event.preventDefault(); @@ -88,3 +93,6 @@ BlazeComponent.extendComponent({ }, }).register('rulesMain'); + + + diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index f8767974..dae3351e 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -1,28 +1,12 @@ template(name="boardTriggers") - div.trigger-item + div.trigger-item#trigger-two div.trigger-content div.trigger-text - | {{_'r-when-a-card-is'}} - div.trigger-text - | {{_'r-added-to'}} - div.trigger-text - | {{_'r-the-board'}} - div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user - div.user-details.hide-element - div.trigger-text - | {{_'r-by'}} - div.trigger-dropdown - input(class="user-name",type=text,placeholder="{{_'r-user-name'}}") - div.trigger-button.js-add-gen-trigger.js-goto-action - i.fa.fa-plus - - div.trigger-item - div.trigger-content - div.trigger-text - | {{_'r-when-a-card-is'}} + | {{_'r-when-a-card'}} div.trigger-inline-button.js-open-card-title-popup i.fa.fa-filter + div.trigger-text + | {{_'r-is'}} div.trigger-text | {{_'r-added-to'}} div.trigger-text @@ -43,10 +27,14 @@ template(name="boardTriggers") div.trigger-button.js-add-create-trigger.js-goto-action i.fa.fa-plus - div.trigger-item + div.trigger-item#trigger-three div.trigger-content div.trigger-text - | {{_'r-when-a-card-is-moved'}} + | {{_'r-when-a-card'}} + div.trigger-inline-button.js-open-card-title-popup + i.fa.fa-filter + div.trigger-text + | {{_'r-is-moved'}} div.trigger-button.trigger-button-person.js-show-user-field i.fa.fa-user div.user-details.hide-element @@ -57,10 +45,14 @@ template(name="boardTriggers") div.trigger-button.js-add-gen-moved-trigger.js-goto-action i.fa.fa-plus - div.trigger-item + div.trigger-item#trigger-four div.trigger-content div.trigger-text - | {{_'r-when-a-card-is'}} + | {{_'r-when-a-card'}} + div.trigger-inline-button.js-open-card-title-popup + i.fa.fa-filter + div.trigger-text + | {{_'r-is'}} div.trigger-dropdown select(id="move-action") option(value="moved-to") {{_'r-moved-to'}} @@ -84,10 +76,14 @@ template(name="boardTriggers") div.trigger-button.js-add-moved-trigger.js-goto-action i.fa.fa-plus - div.trigger-item + div.trigger-item#trigger-five div.trigger-content div.trigger-text - | {{_'r-when-a-card-is'}} + | {{_'r-when-a-card'}} + div.trigger-inline-button.js-open-card-title-popup + i.fa.fa-filter + div.trigger-text + | {{_'r-is'}} div.trigger-dropdown select(id="arch-action") option(value="archived") {{_'r-archived'}} @@ -102,6 +98,12 @@ template(name="boardTriggers") div.trigger-button.js-add-arch-trigger.js-goto-action i.fa.fa-plus +template(name="boardCardTitlePopup") + form + label + | Card Title Filter + input.js-card-filter-name(type="text" value=title autofocus) + input.js-card-filter-button.primary.wide(type="submit" value="{{_ 'set-filter'}}") diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js index b822d643..1a7948de 100644 --- a/client/components/rules/triggers/boardTriggers.js +++ b/client/components/rules/triggers/boardTriggers.js @@ -1,34 +1,36 @@ BlazeComponent.extendComponent({ onCreated() { - + this.provaVar = new ReactiveVar(''); + this.currentPopupTriggerId = "def"; + this.cardTitleFilters = {}; + }, + setNameFilter(name){ + this.cardTitleFilters[this.currentPopupTriggerId] = name; }, events() { return [{ - 'click .js-add-gen-trigger' (event) { - const desc = Utils.getTriggerActionDesc(event, this); - const datas = this.data(); - const boardId = Session.get('currentBoard'); - datas.triggerVar.set({ - activityType: 'createCard', - boardId, - 'listName': '*', - desc, - }); - + 'click .js-open-card-title-popup'(event){ + var funct = Popup.open('boardCardTitle'); + let divId = $(event.currentTarget.parentNode.parentNode).attr("id"); + console.log("current popup"); + console.log(this.currentPopupTriggerId); + this.currentPopupTriggerId = divId; + funct.call(this,event); }, 'click .js-add-create-trigger' (event) { const desc = Utils.getTriggerActionDesc(event, this); const datas = this.data(); const listName = this.find('#create-list-name').value; const swimlaneName = this.find('#create-swimlane-name').value; - if(swimlaneName == undefined || swimlaneName == ""){ - swimlaneName = "*"; - } const boardId = Session.get('currentBoard'); + const divId = $(event.currentTarget.parentNode).attr("id"); + const cardTitle = this.cardTitleFilters[divId]; + // move to generic funciont datas.triggerVar.set({ activityType: 'createCard', boardId, + cardTitle, swimlaneName, listName, desc, @@ -41,9 +43,6 @@ BlazeComponent.extendComponent({ const actionSelected = this.find('#move-action').value; const listName = this.find('#move-list-name').value; const boardId = Session.get('currentBoard'); - if(swimlaneName == undefined || swimlaneName == ""){ - swimlaneName = "*"; - } if (actionSelected === 'moved-to') { datas.triggerVar.set({ activityType: 'moveCard', @@ -71,8 +70,9 @@ BlazeComponent.extendComponent({ const boardId = Session.get('currentBoard'); datas.triggerVar.set({ - activityType: 'moveCard', + 'activityType': 'moveCard', boardId, + 'swimlaneName': '*', 'listName':'*', 'oldListName': '*', desc, @@ -103,3 +103,16 @@ BlazeComponent.extendComponent({ }, }).register('boardTriggers'); + + + + + +Template.boardCardTitlePopup.events({ + submit(evt, tpl) { + const title = tpl.$('.js-card-filter-name').val().trim(); + Popup.getOpenerComponent().setNameFilter(title); + evt.preventDefault(); + Popup.close(); + }, +}); -- cgit v1.2.3-1-g7c22 From 4c399a41f7b87247c979e98c422d7aad999fbdb1 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 15:42:10 +0100 Subject: Add action: create checklist with items --- client/components/rules/actions/boardActions.jade | 11 ++++++++++- client/components/rules/actions/boardActions.js | 21 ++++++++++++++++++++ .../components/rules/actions/checklistActions.jade | 13 ++++++++++++ .../components/rules/actions/checklistActions.js | 23 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/components/rules/actions/boardActions.jade b/client/components/rules/actions/boardActions.jade index 768d77cf..ab7d77a8 100644 --- a/client/components/rules/actions/boardActions.jade +++ b/client/components/rules/actions/boardActions.jade @@ -36,7 +36,16 @@ template(name="boardActions") div.trigger-text | {{_'r-card'}} div.trigger-button.js-add-arch-action.js-goto-rules - i.fa.fa-plus + i.fa.fa-plus + + div.trigger-item + div.trigger-content + div.trigger-text + | {{_'r-add-swimlane'}} + div.trigger-dropdown + input(id="swimlane-name",type=text,placeholder="{{_'r-name'}}") + div.trigger-button.js-add-swimlane-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 95771fce..34f7c4b4 100644 --- a/client/components/rules/actions/boardActions.js +++ b/client/components/rules/actions/boardActions.js @@ -5,6 +5,27 @@ BlazeComponent.extendComponent({ events() { return [{ + 'click .js-add-swimlane-action' (event) { + const ruleName = this.data().ruleName.get(); + const trigger = this.data().triggerVar.get(); + const swimlaneName = this.find('#swimlane-name').value; + const boardId = Session.get('currentBoard'); + const desc = Utils.getTriggerActionDesc(event, this); + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({ + actionType: 'addSwimlane', + swimlaneName, + boardId, + desc, + }); + Rules.insert({ + title: ruleName, + triggerId, + actionId, + boardId, + }); + + }, 'click .js-add-spec-move-action' (event) { const ruleName = this.data().ruleName.get(); const trigger = this.data().triggerVar.get(); diff --git a/client/components/rules/actions/checklistActions.jade b/client/components/rules/actions/checklistActions.jade index 8414a1a5..3542c5c9 100644 --- a/client/components/rules/actions/checklistActions.jade +++ b/client/components/rules/actions/checklistActions.jade @@ -43,6 +43,19 @@ template(name="checklistActions") div.trigger-button.js-add-check-item-action.js-goto-rules i.fa.fa-plus + div.trigger-item + div.trigger-content + div.trigger-text + | {{{_'r-add-checklist'}}} + div.trigger-dropdown + input(id="checklist-name-3",type=text,placeholder="{{{_'r-name'}}}") + div.trigger-text + | {{{_'r-with-items'}}} + div.trigger-dropdown + input(id="checklist-items",type=text,placeholder="{{{_'r-items-list'}}}") + div.trigger-button.js-add-checklist-items-action.js-goto-rules + i.fa.fa-plus + diff --git a/client/components/rules/actions/checklistActions.js b/client/components/rules/actions/checklistActions.js index 4b70f959..59141c39 100644 --- a/client/components/rules/actions/checklistActions.js +++ b/client/components/rules/actions/checklistActions.js @@ -4,6 +4,29 @@ BlazeComponent.extendComponent({ }, events() { return [{ + 'click .js-add-checklist-items-action' (event) { + const ruleName = this.data().ruleName.get(); + const trigger = this.data().triggerVar.get(); + const checklistName = this.find('#checklist-name-3').value; + const checklistItems = this.find('#checklist-items').value; + const boardId = Session.get('currentBoard'); + const desc = Utils.getTriggerActionDesc(event, this); + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({ + actionType: 'addChecklistWithItems', + checklistName, + checklistItems, + boardId, + desc, + }); + Rules.insert({ + title: ruleName, + triggerId, + actionId, + boardId, + }); + + }, 'click .js-add-checklist-action' (event) { const ruleName = this.data().ruleName.get(); const trigger = this.data().triggerVar.get(); -- cgit v1.2.3-1-g7c22 From 12827ef0a6a36edd4fc2ee4abd93c16ceb0245ee Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 15:52:58 +0100 Subject: Added notes --- client/components/rules/actions/checklistActions.jade | 6 ++++++ client/components/rules/triggers/boardTriggers.jade | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'client') diff --git a/client/components/rules/actions/checklistActions.jade b/client/components/rules/actions/checklistActions.jade index 3542c5c9..94c63557 100644 --- a/client/components/rules/actions/checklistActions.jade +++ b/client/components/rules/actions/checklistActions.jade @@ -56,6 +56,12 @@ template(name="checklistActions") div.trigger-button.js-add-checklist-items-action.js-goto-rules i.fa.fa-plus + div.trigger-item + div.trigger-content + div.trigger-text + | {{{_'r-checklist-note'}}} + + diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index dae3351e..c39ff6d0 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -98,6 +98,11 @@ template(name="boardTriggers") div.trigger-button.js-add-arch-trigger.js-goto-action i.fa.fa-plus + div.trigger-item + div.trigger-content + div.trigger-text + | {{{_'r-board-note'}}} + template(name="boardCardTitlePopup") form label -- cgit v1.2.3-1-g7c22 From 8ad0da210940c514fc173564955568f023bde3d6 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 22:32:08 +0100 Subject: Added create card action --- client/components/rules/actions/boardActions.jade | 17 +++++++++++++++ client/components/rules/actions/boardActions.js | 25 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) (limited to 'client') diff --git a/client/components/rules/actions/boardActions.jade b/client/components/rules/actions/boardActions.jade index ab7d77a8..6034184c 100644 --- a/client/components/rules/actions/boardActions.jade +++ b/client/components/rules/actions/boardActions.jade @@ -47,6 +47,23 @@ template(name="boardActions") div.trigger-button.js-add-swimlane-action.js-goto-rules i.fa.fa-plus + div.trigger-item + div.trigger-content + div.trigger-text + | {{_'r-create-card'}} + div.trigger-dropdown + input(id="card-name",type=text,placeholder="{{_'r-name'}}") + div.trigger-text + | {{_'r-in-list'}} + div.trigger-dropdown + input(id="list-name",type=text,placeholder="{{_'r-name'}}") + div.trigger-text + | {{_'r-in-swimlane'}} + div.trigger-dropdown + input(id="swimlane-name2",type=text,placeholder="{{_'r-name'}}") + div.trigger-button.js-create-card-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 34f7c4b4..c2ac156c 100644 --- a/client/components/rules/actions/boardActions.js +++ b/client/components/rules/actions/boardActions.js @@ -5,6 +5,31 @@ BlazeComponent.extendComponent({ events() { return [{ + 'click .js-create-card-action' (event) { + const ruleName = this.data().ruleName.get(); + const trigger = this.data().triggerVar.get(); + const cardName = this.find('#card-name').value; + const listName = this.find('#list-name').value; + const swimlaneName = this.find('#swimlane-name2').value; + const boardId = Session.get('currentBoard'); + const desc = Utils.getTriggerActionDesc(event, this); + const triggerId = Triggers.insert(trigger); + const actionId = Actions.insert({ + actionType: 'createCard', + swimlaneName, + cardName, + listName, + boardId, + desc, + }); + Rules.insert({ + title: ruleName, + triggerId, + actionId, + boardId, + }); + + }, 'click .js-add-swimlane-action' (event) { const ruleName = this.data().ruleName.get(); const trigger = this.data().triggerVar.get(); -- cgit v1.2.3-1-g7c22 From 4d8b2029d266843dc0eb376a0bf752c46e440a13 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 22:51:00 +0100 Subject: Fixed errors --- client/components/rules/actions/boardActions.js | 4 +-- .../components/rules/actions/checklistActions.js | 2 +- client/components/rules/rulesMain.js | 21 ++++++++-------- client/components/rules/triggers/boardTriggers.js | 29 ++++++++++------------ client/lib/utils.js | 12 ++++----- 5 files changed, 32 insertions(+), 36 deletions(-) (limited to 'client') diff --git a/client/components/rules/actions/boardActions.js b/client/components/rules/actions/boardActions.js index c2ac156c..e0b8edc9 100644 --- a/client/components/rules/actions/boardActions.js +++ b/client/components/rules/actions/boardActions.js @@ -28,7 +28,7 @@ BlazeComponent.extendComponent({ actionId, boardId, }); - + }, 'click .js-add-swimlane-action' (event) { const ruleName = this.data().ruleName.get(); @@ -49,7 +49,7 @@ BlazeComponent.extendComponent({ actionId, boardId, }); - + }, 'click .js-add-spec-move-action' (event) { const ruleName = this.data().ruleName.get(); diff --git a/client/components/rules/actions/checklistActions.js b/client/components/rules/actions/checklistActions.js index 59141c39..3e79b075 100644 --- a/client/components/rules/actions/checklistActions.js +++ b/client/components/rules/actions/checklistActions.js @@ -25,7 +25,7 @@ BlazeComponent.extendComponent({ actionId, boardId, }); - + }, 'click .js-add-checklist-action' (event) { const ruleName = this.data().ruleName.get(); diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 42116790..2e125960 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -1,4 +1,4 @@ -let rulesMainComponent = BlazeComponent.extendComponent({ +const rulesMainComponent = BlazeComponent.extendComponent({ onCreated() { this.rulesCurrentTab = new ReactiveVar('rulesList'); this.ruleName = new ReactiveVar(''); @@ -10,9 +10,9 @@ let rulesMainComponent = BlazeComponent.extendComponent({ this.rulesCurrentTab.set('trigger'); }, sanitizeObject(obj){ - Object.keys(obj).forEach(key =>{ - if(obj[key] == "" || obj[key] == undefined){ - obj[key] = "*"; + Object.keys(obj).forEach((key) => { + if(obj[key] == '' || obj[key] == undefined){ + obj[key] = '*'; }} ); }, @@ -49,25 +49,25 @@ let rulesMainComponent = BlazeComponent.extendComponent({ 'click .js-goto-action' (event) { event.preventDefault(); // Add user to the trigger - const username = $(event.currentTarget.offsetParent).find(".user-name").val(); + const username = $(event.currentTarget.offsetParent).find('.user-name').val(); let trigger = this.triggerVar.get(); - trigger["userId"] = "*"; + trigger.userId = '*'; if(username != undefined ){ - const userFound = Users.findOne({"username":username}); + const userFound = Users.findOne({username}); if(userFound != undefined){ - trigger["userId"] = userFound._id; + trigger.userId = userFound._id; this.triggerVar.set(trigger); } } // Sanitize trigger trigger = this.triggerVar.get(); - this.sanitizeObject(trigger) + this.sanitizeObject(trigger); this.triggerVar.set(trigger); this.setAction(); }, 'click .js-show-user-field' (event) { event.preventDefault(); - $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element"); + $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element'); }, 'click .js-goto-rules' (event) { event.preventDefault(); @@ -95,4 +95,3 @@ let rulesMainComponent = BlazeComponent.extendComponent({ }).register('rulesMain'); - diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js index 1a7948de..f9aa57cb 100644 --- a/client/components/rules/triggers/boardTriggers.js +++ b/client/components/rules/triggers/boardTriggers.js @@ -1,7 +1,7 @@ BlazeComponent.extendComponent({ onCreated() { this.provaVar = new ReactiveVar(''); - this.currentPopupTriggerId = "def"; + this.currentPopupTriggerId = 'def'; this.cardTitleFilters = {}; }, setNameFilter(name){ @@ -11,12 +11,12 @@ BlazeComponent.extendComponent({ events() { return [{ 'click .js-open-card-title-popup'(event){ - var funct = Popup.open('boardCardTitle'); - let divId = $(event.currentTarget.parentNode.parentNode).attr("id"); - console.log("current popup"); + const funct = Popup.open('boardCardTitle'); + const divId = $(event.currentTarget.parentNode.parentNode).attr('id'); + console.log('current popup'); console.log(this.currentPopupTriggerId); this.currentPopupTriggerId = divId; - funct.call(this,event); + funct.call(this, event); }, 'click .js-add-create-trigger' (event) { const desc = Utils.getTriggerActionDesc(event, this); @@ -24,17 +24,17 @@ BlazeComponent.extendComponent({ const listName = this.find('#create-list-name').value; const swimlaneName = this.find('#create-swimlane-name').value; const boardId = Session.get('currentBoard'); - const divId = $(event.currentTarget.parentNode).attr("id"); + const divId = $(event.currentTarget.parentNode).attr('id'); const cardTitle = this.cardTitleFilters[divId]; // move to generic funciont datas.triggerVar.set({ - activityType: 'createCard', - boardId, - cardTitle, - swimlaneName, - listName, - desc, - }); + activityType: 'createCard', + boardId, + cardTitle, + swimlaneName, + listName, + desc, + }); }, 'click .js-add-moved-trigger' (event) { const datas = this.data(); @@ -105,9 +105,6 @@ BlazeComponent.extendComponent({ }).register('boardTriggers'); - - - Template.boardCardTitlePopup.events({ submit(evt, tpl) { const title = tpl.$('.js-card-filter-name').val().trim(); diff --git a/client/lib/utils.js b/client/lib/utils.js index f252a220..051ec952 100644 --- a/client/lib/utils.js +++ b/client/lib/utils.js @@ -220,19 +220,19 @@ Utils = { finalString += element.text().toLowerCase(); } else if (element.hasClass('user-details')) { let username = element.find('input').val(); - if(username == undefined || username == ""){ - username = "*"; + if(username == undefined || username == ''){ + username = '*'; } - finalString += element.find('.trigger-text').text().toLowerCase()+ " " + username ; + finalString += `${element.find('.trigger-text').text().toLowerCase() } ${ username}`; } else if (element.find('select').length > 0) { finalString += element.find('select option:selected').text().toLowerCase(); } else if (element.find('input').length > 0) { let inputvalue = element.find('input').val(); - if(inputvalue == undefined || inputvalue == ""){ - inputvalue = "*"; + if(inputvalue == undefined || inputvalue == ''){ + inputvalue = '*'; } finalString += inputvalue; - } + } // Add space if (i !== length - 1) { finalString += ' '; -- cgit v1.2.3-1-g7c22