From 3e390503fc9dbaf02f770f8d433d608bd074e68b Mon Sep 17 00:00:00 2001 From: Ignatz Date: Fri, 18 May 2018 16:41:03 +0200 Subject: first test for custom fields filter --- client/components/sidebar/sidebarFilters.jade | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 273df8c2..ef7b39a2 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -40,6 +40,12 @@ template(name="filterSidebar") | ({{ username }}) if Filter.members.isSelected _id i.fa.fa-check + ul.sidebar-list + each currentBoard.customFields + li + a.name.js-toggle-label-filter + span.sidebar-list-item-description + {{ name }} if Filter.isActive hr a.sidebar-btn.js-clear-all -- cgit v1.2.3-1-g7c22 From 78317ef792c0de7435bbb8a0d3f6b413b2af9ab1 Mon Sep 17 00:00:00 2001 From: IgnatzHome Date: Sat, 19 May 2018 14:51:01 +0200 Subject: Filter on custom fields presence --- client/components/sidebar/sidebarFilters.jade | 5 ++++- client/components/sidebar/sidebarFilters.js | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index ef7b39a2..d1fdf824 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -40,12 +40,15 @@ template(name="filterSidebar") | ({{ username }}) if Filter.members.isSelected _id i.fa.fa-check + hr ul.sidebar-list each currentBoard.customFields li - a.name.js-toggle-label-filter + a.name.js-toggle-custom-fields-filter span.sidebar-list-item-description {{ name }} + if Filter.customFields.isSelected _id + i.fa.fa-check if Filter.isActive hr a.sidebar-btn.js-clear-all diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js index f02d3a4a..ba2633de 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -11,6 +11,11 @@ BlazeComponent.extendComponent({ Filter.members.toggle(this.currentData()._id); Filter.resetExceptions(); }, + 'click .js-toggle-custom-fields-filter'(evt) { + evt.preventDefault(); + Filter.customFields.toggle(this.currentData()._id); + Filter.resetExceptions(); + }, 'click .js-clear-all'(evt) { evt.preventDefault(); Filter.reset(); -- cgit v1.2.3-1-g7c22 From f6d19d2833b322eb54762dae7a8d51d07718ef24 Mon Sep 17 00:00:00 2001 From: IgnatzHome Date: Sat, 19 May 2018 15:40:51 +0200 Subject: Filter Sidebar Corrections --- client/components/sidebar/sidebarFilters.jade | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index d1fdf824..5f9fcf72 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -42,8 +42,14 @@ template(name="filterSidebar") i.fa.fa-check hr ul.sidebar-list + li(class="{{#if Filter.customFields.isSelected undefined}}active{{/if}}") + a.name.js-toggle-custom-fields-filter + span.sidebar-list-item-description + | {{_ 'filter-no-custom-fields'}} + if Filter.customFields.isSelected undefined + i.fa.fa-check each currentBoard.customFields - li + li(class="{{#if Filter.customFields.isSelected _id}}active{{/if}}") a.name.js-toggle-custom-fields-filter span.sidebar-list-item-description {{ name }} -- cgit v1.2.3-1-g7c22 From b00bd04baaa7cdad9b2162d13bff78d97d23f34a Mon Sep 17 00:00:00 2001 From: IgnatzHome Date: Sat, 19 May 2018 18:38:48 +0200 Subject: first test for Advanced Filter --- client/components/sidebar/sidebarFilters.jade | 2 ++ client/components/sidebar/sidebarFilters.js | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 5f9fcf72..00d8c87b 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -55,6 +55,8 @@ template(name="filterSidebar") {{ name }} if Filter.customFields.isSelected _id i.fa.fa-check + hr + input.js-field-advanced-filter(type="text") if Filter.isActive hr a.sidebar-btn.js-clear-all diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js index ba2633de..6fb3f500 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -16,6 +16,11 @@ BlazeComponent.extendComponent({ Filter.customFields.toggle(this.currentData()._id); Filter.resetExceptions(); }, + 'input .js-field-advanced-filter'(evt) { + evt.preventDefault(); + Filter.advanced.set(this.find('.js-field-advanced-filter').value.trim()); + Filter.resetExceptions(); + }, 'click .js-clear-all'(evt) { evt.preventDefault(); Filter.reset(); -- cgit v1.2.3-1-g7c22 From dd7c9997a937fde0c598188884db6690e77bfb11 Mon Sep 17 00:00:00 2001 From: IgnatzHome Date: Sun, 20 May 2018 14:53:00 +0200 Subject: Removing Debug Lines, correcting behavior, caching las valide filter, and adding description --- client/components/sidebar/sidebarFilters.jade | 2 ++ client/components/sidebar/sidebarFilters.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 00d8c87b..c0696391 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -56,7 +56,9 @@ template(name="filterSidebar") if Filter.customFields.isSelected _id i.fa.fa-check hr + span {{_ 'advanced-filter-label}} input.js-field-advanced-filter(type="text") + span {{_ 'advanced-filter-description'}} if Filter.isActive hr a.sidebar-btn.js-clear-all diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js index 6fb3f500..fd8229e4 100644 --- a/client/components/sidebar/sidebarFilters.js +++ b/client/components/sidebar/sidebarFilters.js @@ -16,7 +16,7 @@ BlazeComponent.extendComponent({ Filter.customFields.toggle(this.currentData()._id); Filter.resetExceptions(); }, - 'input .js-field-advanced-filter'(evt) { + 'change .js-field-advanced-filter'(evt) { evt.preventDefault(); Filter.advanced.set(this.find('.js-field-advanced-filter').value.trim()); Filter.resetExceptions(); -- cgit v1.2.3-1-g7c22 From 2119a6568b36591f84df29e0305fda9c12ec207a Mon Sep 17 00:00:00 2001 From: IgnatzHome Date: Sun, 20 May 2018 14:59:32 +0200 Subject: forgot a ' --- client/components/sidebar/sidebarFilters.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index c0696391..514870b8 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -56,7 +56,7 @@ template(name="filterSidebar") if Filter.customFields.isSelected _id i.fa.fa-check hr - span {{_ 'advanced-filter-label}} + span {{_ 'advanced-filter-label'}} input.js-field-advanced-filter(type="text") span {{_ 'advanced-filter-description'}} if Filter.isActive -- 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/sidebar') 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