From 67454d0491ca17e61eb50034ecb5d03c85dd5abe Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Wed, 13 Jun 2018 22:18:00 +0000 Subject: Fix data colour changes on cards. Addressing both #1685 and #1693 --- client/components/cards/cardDate.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'client/components') diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index e95c3a23..83cc1424 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -279,14 +279,18 @@ class CardDueDate extends CardDate { classes() { let classes = 'due-date' + ' '; - if ((this.now.get().diff(this.date.get(), 'days') >= 2) && + // if endAt exists & is < dueAt, dueAt doesn't need to be flagged + if ((this.data().endAt != 0) && + (this.data().endAt != null) && + (this.data().endAt != '') && + (this.data().endAt != undefined) && (this.date.get().isBefore(this.data().endAt))) + classes += 'current'; + else if (this.now.get().diff(this.date.get(), 'days') >= 2) classes += 'long-overdue'; - else if ((this.now.get().diff(this.date.get(), 'minute') >= 0) && - (this.date.get().isBefore(this.data().endAt))) + else if (this.now.get().diff(this.date.get(), 'minute') >= 0) classes += 'due'; - else if ((this.now.get().diff(this.date.get(), 'days') >= -1) && - (this.date.get().isBefore(this.data().endAt))) + else if (this.now.get().diff(this.date.get(), 'days') >= -1) classes += 'almost-due'; return classes; } @@ -316,10 +320,10 @@ class CardEndDate extends CardDate { let classes = 'end-date' + ' '; if (this.data.dueAt.diff(this.date.get(), 'days') >= 2) classes += 'long-overdue'; - else if (this.data.dueAt.diff(this.date.get(), 'days') >= 0) + else if (this.data.dueAt.diff(this.date.get(), 'days') > 0) classes += 'due'; - else if (this.data.dueAt.diff(this.date.get(), 'days') >= -2) - classes += 'almost-due'; + else if (this.data.dueAt.diff(this.date.get(), 'days') <= 0) + classes += 'current'; return classes; } -- cgit v1.2.3-1-g7c22 From edd2e9db3ca070c87c47a14a3458184ceb5edb34 Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Wed, 13 Jun 2018 22:26:45 +0000 Subject: Fix lint errors --- client/components/cards/cardDate.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'client/components') diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index 83cc1424..c3e0524d 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -279,11 +279,11 @@ class CardDueDate extends CardDate { classes() { let classes = 'due-date' + ' '; - // if endAt exists & is < dueAt, dueAt doesn't need to be flagged - if ((this.data().endAt != 0) && - (this.data().endAt != null) && - (this.data().endAt != '') && - (this.data().endAt != undefined) && + // if endAt exists & is < dueAt, dueAt doesn't need to be flagged + if ((this.data().endAt !== 0) && + (this.data().endAt !== null) && + (this.data().endAt !== '') && + (this.data().endAt !== undefined) && (this.date.get().isBefore(this.data().endAt))) classes += 'current'; else if (this.now.get().diff(this.date.get(), 'days') >= 2) -- cgit v1.2.3-1-g7c22 From 8ec60879dc1666e9129c5f690da06c2931135fc5 Mon Sep 17 00:00:00 2001 From: Ignatz Date: Thu, 14 Jun 2018 10:55:53 +0200 Subject: hotfix public board --- client/components/boards/boardBody.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'client/components') diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 456bf9b3..dfe7b8d2 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -88,11 +88,13 @@ BlazeComponent.extendComponent({ isViewSwimlanes() { const currentUser = Meteor.user(); + if (!currentUser) return false; return (currentUser.profile.boardView === 'board-view-swimlanes'); }, isViewLists() { const currentUser = Meteor.user(); + if (!currentUser) return true; return (currentUser.profile.boardView === 'board-view-lists'); }, -- cgit v1.2.3-1-g7c22 From 259614b647c72773675541d3de8d0ff73006c299 Mon Sep 17 00:00:00 2001 From: Ignatz Date: Thu, 14 Jun 2018 11:58:37 +0200 Subject: trying to fix display Issue with dropdown custom fields --- client/components/cards/minicard.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components') diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index b44021a6..e63a185b 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -37,7 +37,7 @@ template(name="minicard") .minicard-custom-field-item = definition.name .minicard-custom-field-item - = value + = trueValue if members .minicard-members.js-minicard-members -- cgit v1.2.3-1-g7c22 From c5f0e87dd09c68e5327a601af881c78ff723c8df Mon Sep 17 00:00:00 2001 From: Ignatz Date: Thu, 14 Jun 2018 14:10:30 +0200 Subject: fix for not able to remove "Show on Card" --- client/components/sidebar/sidebarCustomFields.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components') diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade index def083e9..fd31e5ac 100644 --- a/client/components/sidebar/sidebarCustomFields.jade +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -37,7 +37,7 @@ template(name="createCustomFieldPopup") each dropdownItems.get input.js-dropdown-item(type="text" value=name placeholder="") input.js-dropdown-item.last(type="text" value="" placeholder="{{_ 'custom-field-dropdown-options-placeholder'}}") - a.flex.js-field-show-on-card + a.flex.js-field-show-on-card(class="{{#if showOnCard}}is-checked{{/if}}") .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") span {{_ 'show-field-on-card'}} @@ -49,4 +49,4 @@ template(name="createCustomFieldPopup") template(name="deleteCustomFieldPopup") p {{_ "custom-field-delete-pop"}} - button.js-confirm.negate.full(type="submit") {{_ 'delete'}} \ No newline at end of file + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} -- cgit v1.2.3-1-g7c22 From fcf262cc9807c1e87e638ce6b0c6151ae2114f60 Mon Sep 17 00:00:00 2001 From: Ignatz Date: Thu, 14 Jun 2018 15:08:30 +0200 Subject: testing markdown support for custom fields --- client/components/cards/minicard.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'client/components') diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index e63a185b..c912ea70 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -37,7 +37,8 @@ template(name="minicard") .minicard-custom-field-item = definition.name .minicard-custom-field-item - = trueValue + +viewer + = trueValue if members .minicard-members.js-minicard-members -- cgit v1.2.3-1-g7c22 From 718adc6c4727022063a7cf04386c641db0b6dc3f Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Thu, 14 Jun 2018 16:11:41 +0000 Subject: Fix minicardReceivedDate typo identified in #1694 --- client/components/cards/minicard.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components') diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index b44021a6..6dac4e12 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -15,7 +15,7 @@ template(name="minicard") unless dueAt unless endAt .date - +miniCardReceivedDate + +minicardReceivedDate if startAt .date +minicardStartDate -- cgit v1.2.3-1-g7c22