From c9c650664fd92f0924afb4548a50c7bca167d955 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Thu, 28 Sep 2017 16:59:53 +0200 Subject: basic frontend setup, List model updated with wipLimit field --- client/components/lists/listHeader.jade | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 68336320..67fbe958 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -6,6 +6,11 @@ template(name="listHeader") h2.list-header-name( class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") = title + if hasWipLimit + span.wip-limit + | ( + = wipLimit + | ) if showCardsCountForList cards.count = cards.count span.lowercase @@ -33,6 +38,9 @@ template(name="listActionPopup") if cards.count li: a.js-select-cards {{_ 'list-select-cards'}} hr + ul.pop-over-list + li: a.js-set-wip-limit {{#if hasWipLimit}}{{_ 'edit-wip-limit'}}{{else}}{{_ 'set-wip-limit'}}{{/if}} + hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} hr @@ -64,3 +72,7 @@ template(name="listDeletePopup") unless archived p {{_ "list-delete-suggest-archive"}} button.js-confirm.negate.full(type="submit") {{_ 'delete'}} + +template(name="setWipLimitPopup") + p {{_ 'set-wip-limit'}} + input(type="number") -- cgit v1.2.3-1-g7c22 From a918d36533bd61765f954f60c0e3af78b014907a Mon Sep 17 00:00:00 2001 From: amadilsons Date: Fri, 29 Sep 2017 16:52:53 +0200 Subject: mostly frontend work, lists coll update with wipLimit field --- client/components/lists/listHeader.jade | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 67fbe958..5d352b2e 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -7,10 +7,8 @@ template(name="listHeader") class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") = title if hasWipLimit - span.wip-limit - | ( - = wipLimit - | ) + span + | (#{wipLimit}) if showCardsCountForList cards.count = cards.count span.lowercase @@ -39,7 +37,7 @@ template(name="listActionPopup") li: a.js-select-cards {{_ 'list-select-cards'}} hr ul.pop-over-list - li: a.js-set-wip-limit {{#if hasWipLimit}}{{_ 'edit-wip-limit'}}{{else}}{{_ 'set-wip-limit'}}{{/if}} + li: a.js-set-wip-limit {{#if hasWipLimit}}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}} hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} @@ -74,5 +72,8 @@ template(name="listDeletePopup") button.js-confirm.negate.full(type="submit") {{_ 'delete'}} template(name="setWipLimitPopup") - p {{_ 'set-wip-limit'}} - input(type="number") + #js-wip-limit-edit + lable {{_ 'set-wip-limit-value'}} + p + input.wip-limit-value(type="number" value="#{wipLimit}" min="0" max="99" onkeydown="return false") + input.wip-limit-apply(type="submit" value="{{_ 'apply'}}") -- cgit v1.2.3-1-g7c22 From 089dbf0cf6a3e144d0271a8666d58e689f8c8dba Mon Sep 17 00:00:00 2001 From: amadilsons Date: Wed, 4 Oct 2017 11:12:52 +0200 Subject: on its way --- client/components/lists/listHeader.jade | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 5d352b2e..97dbf1c8 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -6,9 +6,9 @@ template(name="listHeader") h2.list-header-name( class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") = title - if hasWipLimit + if isWipLimitEnabled span - | (#{wipLimit}) + | (#{wipLimit.value}) if showCardsCountForList cards.count = cards.count span.lowercase @@ -37,7 +37,7 @@ template(name="listActionPopup") li: a.js-select-cards {{_ 'list-select-cards'}} hr ul.pop-over-list - li: a.js-set-wip-limit {{#if hasWipLimit}}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}} + li: a.js-set-wip-limit {{#if isWipLimitEnabled }}EDIT{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}} hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} @@ -74,6 +74,20 @@ template(name="listDeletePopup") template(name="setWipLimitPopup") #js-wip-limit-edit lable {{_ 'set-wip-limit-value'}} - p - input.wip-limit-value(type="number" value="#{wipLimit}" min="0" max="99" onkeydown="return false") - input.wip-limit-apply(type="submit" value="{{_ 'apply'}}") + {{one}} + ul.pop-over-list + li: a.js-enable-wip-limit Enable WIP Limit + if isWipLimitEnabled + i.fa.fa-check + + if isWipLimitEnabled + p + input.wip-limit-value(type="number" value="#{wipLimit.value}" min="1" max="99" onkeydown="return false") + input.wip-limit-apply(type="submit" value="{{_ 'apply'}}") + input.wip-limit-error + +template(name="wipLimitErrorPopup") + .wip-limit-invalid + p The number of tasks in this list is higher than the WIP limit you've defined. + p Please move some tasks out of this list, or set a higher WIP limit. + button.full.js-back-view(type="submit") {{_ 'cancel'}} -- cgit v1.2.3-1-g7c22 From c865bfe49785181d97b25cb683c0ed37d82c1a69 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Wed, 4 Oct 2017 17:48:37 +0200 Subject: most work concluded, code needs clean up, further testing required --- client/components/lists/listHeader.jade | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 97dbf1c8..df395d65 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -36,9 +36,10 @@ template(name="listActionPopup") if cards.count li: a.js-select-cards {{_ 'list-select-cards'}} hr - ul.pop-over-list - li: a.js-set-wip-limit {{#if isWipLimitEnabled }}EDIT{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}} - hr + if currentUser.isBoardAdmin + ul.pop-over-list + li: a.js-set-wip-limit {{#if isWipLimitEnabled }}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}} + hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} hr @@ -74,13 +75,11 @@ template(name="listDeletePopup") template(name="setWipLimitPopup") #js-wip-limit-edit lable {{_ 'set-wip-limit-value'}} - {{one}} ul.pop-over-list li: a.js-enable-wip-limit Enable WIP Limit - if isWipLimitEnabled + if wipEnabled.get i.fa.fa-check - - if isWipLimitEnabled + if wipEnabled.get p input.wip-limit-value(type="number" value="#{wipLimit.value}" min="1" max="99" onkeydown="return false") input.wip-limit-apply(type="submit" value="{{_ 'apply'}}") -- cgit v1.2.3-1-g7c22 From 214fe6a61f60513d3ddfc9eee423c1b932ff8463 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Thu, 5 Oct 2017 16:46:55 +0200 Subject: feature implemented, known bugs fixed --- client/components/lists/listHeader.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index df395d65..f0c4e5f1 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -8,7 +8,7 @@ template(name="listHeader") = title if isWipLimitEnabled span - | (#{wipLimit.value}) + | ({{cards.count}}/#{wipLimit.value}) if showCardsCountForList cards.count = cards.count span.lowercase @@ -77,11 +77,11 @@ template(name="setWipLimitPopup") lable {{_ 'set-wip-limit-value'}} ul.pop-over-list li: a.js-enable-wip-limit Enable WIP Limit - if wipEnabled.get + if isWipLimitEnabled i.fa.fa-check - if wipEnabled.get + if isWipLimitEnabled p - input.wip-limit-value(type="number" value="#{wipLimit.value}" min="1" max="99" onkeydown="return false") + input.wip-limit-value(type="number" value="{{ wipLimitValue }}" min="1" max="99" onkeydown="return false") input.wip-limit-apply(type="submit" value="{{_ 'apply'}}") input.wip-limit-error -- cgit v1.2.3-1-g7c22 From f77da76c682ec7ad1b5e141d113d4b74371f46ae Mon Sep 17 00:00:00 2001 From: amadilsons Date: Thu, 5 Oct 2017 17:22:03 +0200 Subject: added i18n translation, minor fix --- client/components/lists/listHeader.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/components/lists/listHeader.jade') diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index f0c4e5f1..d5738dd9 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -76,7 +76,7 @@ template(name="setWipLimitPopup") #js-wip-limit-edit lable {{_ 'set-wip-limit-value'}} ul.pop-over-list - li: a.js-enable-wip-limit Enable WIP Limit + li: a.js-enable-wip-limit {{_ 'enable-wip-limit'}} if isWipLimitEnabled i.fa.fa-check if isWipLimitEnabled @@ -87,6 +87,6 @@ template(name="setWipLimitPopup") template(name="wipLimitErrorPopup") .wip-limit-invalid - p The number of tasks in this list is higher than the WIP limit you've defined. - p Please move some tasks out of this list, or set a higher WIP limit. + p {{_ 'wipLimitErrorPopup-dialog-pt1'}} + p {{_ 'wipLimitErrorPopup-dialog-pt2'}} button.full.js-back-view(type="submit") {{_ 'cancel'}} -- cgit v1.2.3-1-g7c22