From 6ff89b43b61ace7ea26d50f091ea6b714fa79c84 Mon Sep 17 00:00:00 2001 From: Pouyan Savoli Date: Tue, 5 Sep 2017 02:34:18 +0200 Subject: show custom fields on cards but still with dummy value --- client/components/cards/cardCustomFields.js | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 client/components/cards/cardCustomFields.js (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js new file mode 100644 index 00000000..73dda02e --- /dev/null +++ b/client/components/cards/cardCustomFields.js @@ -0,0 +1,41 @@ +Template.cardCustomFieldsPopup.events({ + 'click .js-select-field'(evt) { + const card = Cards.findOne(Session.get('currentCard')); + const customFieldId = this._id; + card.toggleCustomField(customFieldId); + evt.preventDefault(); + }, + 'click .js-configure-custom-fields'(evt) { + EscapeActions.executeUpTo('detailsPane'); + Sidebar.setView('customFields'); + evt.preventDefault(); + } +}); + +const CardCustomField = BlazeComponent.extendComponent({ + template() { + return 'cardCustomFieldText'; + }, + + onCreated() { + const self = this; + self.date = ReactiveVar(); + self.now = ReactiveVar(moment()); + }, + + value() { + return "this is the value"; + }, + + showISODate() { + return this.date.get().toISOString(); + }, + + events() { + return [{ + 'click .js-edit-date': Popup.open('editCardStartDate'), + }]; + }, +}); + +CardCustomField.register('cardCustomField'); \ No newline at end of file -- cgit v1.2.3-1-g7c22 From caad952bc1b29bb925c1347a14daa5d1ec8ada81 Mon Sep 17 00:00:00 2001 From: Pouyan Savoli Date: Thu, 14 Sep 2017 00:50:05 +0200 Subject: text custom fields are now editable using inlinedForm --- client/components/cards/cardCustomFields.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js index 73dda02e..7009dede 100644 --- a/client/components/cards/cardCustomFields.js +++ b/client/components/cards/cardCustomFields.js @@ -1,3 +1,11 @@ +Template.cardCustomFieldsPopup.helpers({ + hasCustomField() { + const card = Cards.findOne(Session.get('currentCard')); + const customFieldId = this._id; + return card.customFieldIndex(customFieldId) > -1; + }, +}); + Template.cardCustomFieldsPopup.events({ 'click .js-select-field'(evt) { const card = Cards.findOne(Session.get('currentCard')); @@ -24,7 +32,7 @@ const CardCustomField = BlazeComponent.extendComponent({ }, value() { - return "this is the value"; + return this.data().value; }, showISODate() { @@ -33,9 +41,20 @@ const CardCustomField = BlazeComponent.extendComponent({ events() { return [{ + 'submit .js-card-customfield-text'(evt) { + evt.preventDefault(); + const card = Cards.findOne(Session.get('currentCard')); + const customFieldId = this.data()._id; + const value = this.currentComponent().getValue(); + card.setCustomField(customFieldId,value); + }, 'click .js-edit-date': Popup.open('editCardStartDate'), }]; }, + + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); + }, }); CardCustomField.register('cardCustomField'); \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 3753337d60e17e5e72ec071aa4a1b28e36297d15 Mon Sep 17 00:00:00 2001 From: Pouyan Savoli Date: Mon, 18 Sep 2017 00:46:17 +0200 Subject: dropdown items --- client/components/cards/cardCustomFields.js | 62 +++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 17 deletions(-) (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js index 7009dede..f9fa760c 100644 --- a/client/components/cards/cardCustomFields.js +++ b/client/components/cards/cardCustomFields.js @@ -13,7 +13,7 @@ Template.cardCustomFieldsPopup.events({ card.toggleCustomField(customFieldId); evt.preventDefault(); }, - 'click .js-configure-custom-fields'(evt) { + 'click .js-settings'(evt) { EscapeActions.executeUpTo('detailsPane'); Sidebar.setView('customFields'); evt.preventDefault(); @@ -21,23 +21,25 @@ Template.cardCustomFieldsPopup.events({ }); const CardCustomField = BlazeComponent.extendComponent({ - template() { - return 'cardCustomFieldText'; + + getTemplate() { + return 'cardCustomField-' + this.data().definition.type; }, onCreated() { const self = this; - self.date = ReactiveVar(); - self.now = ReactiveVar(moment()); }, - value() { - return this.data().value; + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); }, +}); +CardCustomField.register('cardCustomField'); - showISODate() { - return this.date.get().toISOString(); - }, +(class extends CardCustomField { + + onCreated() { + } events() { return [{ @@ -48,13 +50,39 @@ const CardCustomField = BlazeComponent.extendComponent({ const value = this.currentComponent().getValue(); card.setCustomField(customFieldId,value); }, - 'click .js-edit-date': Popup.open('editCardStartDate'), }]; - }, + } - canModifyCard() { - return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); - }, -}); +}).register('cardCustomField-text'); + +(class extends CardCustomField { + + onCreated() { + this._items = this.data().definition.settings.dropdownItems; + this.items = this._items.slice(0); + this.items.unshift({ + _id: "", + name: TAPi18n.__('custom-field-dropdown-none') + }); + } + + selectedItem() { + const selected = this._items.find((item) => { + return item._id == this.data().value; + }); + return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown'); + } + + events() { + return [{ + 'submit .js-card-customfield-dropdown'(evt) { + evt.preventDefault(); + const card = Cards.findOne(Session.get('currentCard')); + const customFieldId = this.data()._id; + const value = this.find('select').value; + card.setCustomField(customFieldId,value); + }, + }]; + } -CardCustomField.register('cardCustomField'); \ No newline at end of file +}).register('cardCustomField-dropdown'); \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 8b16955cc27b29ae507be084adccc4fad61b05ef Mon Sep 17 00:00:00 2001 From: Pouyan Savoli Date: Sat, 14 Oct 2017 01:38:25 +0200 Subject: number + date fields --- client/components/cards/cardCustomFields.js | 103 ++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 6 deletions(-) (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js index f9fa760c..e014de4a 100644 --- a/client/components/cards/cardCustomFields.js +++ b/client/components/cards/cardCustomFields.js @@ -20,6 +20,7 @@ Template.cardCustomFieldsPopup.events({ } }); +// cardCustomField const CardCustomField = BlazeComponent.extendComponent({ getTemplate() { @@ -28,6 +29,8 @@ const CardCustomField = BlazeComponent.extendComponent({ onCreated() { const self = this; + self.card = Cards.findOne(Session.get('currentCard')); + self.customFieldId = this.data()._id; }, canModifyCard() { @@ -36,28 +39,118 @@ const CardCustomField = BlazeComponent.extendComponent({ }); CardCustomField.register('cardCustomField'); +// cardCustomField-text (class extends CardCustomField { onCreated() { + super.onCreated(); } events() { return [{ 'submit .js-card-customfield-text'(evt) { evt.preventDefault(); - const card = Cards.findOne(Session.get('currentCard')); - const customFieldId = this.data()._id; const value = this.currentComponent().getValue(); - card.setCustomField(customFieldId,value); + this.card.setCustomField(this.customFieldId, value); }, }]; } }).register('cardCustomField-text'); +// cardCustomField-number (class extends CardCustomField { onCreated() { + super.onCreated(); + } + + events() { + return [{ + 'submit .js-card-customfield-number'(evt) { + evt.preventDefault(); + const value = parseInt(this.find('input').value); + this.card.setCustomField(this.customFieldId, value); + }, + }]; + } + +}).register('cardCustomField-number'); + +// cardCustomField-date +(class extends CardCustomField { + + onCreated() { + super.onCreated(); + const self = this; + self.date = ReactiveVar(); + self.now = ReactiveVar(moment()); + window.setInterval(() => { + self.now.set(moment()); + }, 60000); + + self.autorun(() => { + self.date.set(moment(self.data().value)); + }); + } + + showDate() { + // this will start working once mquandalle:moment + // is updated to at least moment.js 2.10.5 + // until then, the date is displayed in the "L" format + return this.date.get().calendar(null, { + sameElse: 'llll', + }); + } + + showISODate() { + return this.date.get().toISOString(); + } + + classes() { + if (this.date.get().isBefore(this.now.get(), 'minute') && + this.now.get().isBefore(this.data().value)) { + return 'current'; + } + return ''; + } + + showTitle() { + return `${TAPi18n.__('card-start-on')} ${this.date.get().format('LLLL')}`; + } + + events() { + return [{ + 'click .js-edit-date': Popup.open('cardCustomField-date'), + }]; + } + +}).register('cardCustomField-date'); + +// cardCustomField-datePopup +(class extends DatePicker { + onCreated() { + super.onCreated(); + const self = this; + self.card = Cards.findOne(Session.get('currentCard')); + self.customFieldId = this.data()._id; + this.data().value && this.date.set(moment(this.data().value)); + } + + _storeDate(date) { + this.card.setCustomField(this.customFieldId, date); + } + + _deleteDate() { + this.card.setCustomField(this.customFieldId, ''); + } +}).register('cardCustomField-datePopup'); + +// cardCustomField-dropdown +(class extends CardCustomField { + + onCreated() { + super.onCreated(); this._items = this.data().definition.settings.dropdownItems; this.items = this._items.slice(0); this.items.unshift({ @@ -77,10 +170,8 @@ CardCustomField.register('cardCustomField'); return [{ 'submit .js-card-customfield-dropdown'(evt) { evt.preventDefault(); - const card = Cards.findOne(Session.get('currentCard')); - const customFieldId = this.data()._id; const value = this.find('select').value; - card.setCustomField(customFieldId,value); + this.card.setCustomField(this.customFieldId, value); }, }]; } -- cgit v1.2.3-1-g7c22 From d6cfac0122dc5e6819c82f73c728488e0600cb70 Mon Sep 17 00:00:00 2001 From: Ignatz Date: Fri, 18 May 2018 10:24:51 +0200 Subject: linter corrections --- client/components/cards/cardCustomFields.js | 256 ++++++++++++++-------------- 1 file changed, 128 insertions(+), 128 deletions(-) (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js index e014de4a..821ca02b 100644 --- a/client/components/cards/cardCustomFields.js +++ b/client/components/cards/cardCustomFields.js @@ -1,179 +1,179 @@ Template.cardCustomFieldsPopup.helpers({ - hasCustomField() { - const card = Cards.findOne(Session.get('currentCard')); - const customFieldId = this._id; - return card.customFieldIndex(customFieldId) > -1; - }, + hasCustomField() { + const card = Cards.findOne(Session.get('currentCard')); + const customFieldId = this._id; + return card.customFieldIndex(customFieldId) > -1; + }, }); Template.cardCustomFieldsPopup.events({ - 'click .js-select-field'(evt) { - const card = Cards.findOne(Session.get('currentCard')); - const customFieldId = this._id; - card.toggleCustomField(customFieldId); - evt.preventDefault(); - }, - 'click .js-settings'(evt) { - EscapeActions.executeUpTo('detailsPane'); - Sidebar.setView('customFields'); - evt.preventDefault(); - } + 'click .js-select-field'(evt) { + const card = Cards.findOne(Session.get('currentCard')); + const customFieldId = this._id; + card.toggleCustomField(customFieldId); + evt.preventDefault(); + }, + 'click .js-settings'(evt) { + EscapeActions.executeUpTo('detailsPane'); + Sidebar.setView('customFields'); + evt.preventDefault(); + }, }); // cardCustomField const CardCustomField = BlazeComponent.extendComponent({ - getTemplate() { - return 'cardCustomField-' + this.data().definition.type; - }, + getTemplate() { + return 'cardCustomField-${this.data().definition.type}'; + }, - onCreated() { - const self = this; - self.card = Cards.findOne(Session.get('currentCard')); - self.customFieldId = this.data()._id; - }, + onCreated() { + const self = this; + self.card = Cards.findOne(Session.get('currentCard')); + self.customFieldId = this.data()._id; + }, - canModifyCard() { - return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); - }, + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); + }, }); CardCustomField.register('cardCustomField'); // cardCustomField-text (class extends CardCustomField { - onCreated() { - super.onCreated(); - } + onCreated() { + super.onCreated(); + } - events() { - return [{ - 'submit .js-card-customfield-text'(evt) { - evt.preventDefault(); - const value = this.currentComponent().getValue(); - this.card.setCustomField(this.customFieldId, value); - }, - }]; - } + events() { + return [{ + 'submit .js-card-customfield-text'(evt) { + evt.preventDefault(); + const value = this.currentComponent().getValue(); + this.card.setCustomField(this.customFieldId, value); + }, + }]; + } }).register('cardCustomField-text'); // cardCustomField-number (class extends CardCustomField { - onCreated() { - super.onCreated(); - } + onCreated() { + super.onCreated(); + } - events() { - return [{ - 'submit .js-card-customfield-number'(evt) { - evt.preventDefault(); - const value = parseInt(this.find('input').value); - this.card.setCustomField(this.customFieldId, value); - }, - }]; - } + events() { + return [{ + 'submit .js-card-customfield-number'(evt) { + evt.preventDefault(); + const value = parseInt(this.find('input').value, 10); + this.card.setCustomField(this.customFieldId, value); + }, + }]; + } }).register('cardCustomField-number'); // cardCustomField-date (class extends CardCustomField { - onCreated() { - super.onCreated(); - const self = this; - self.date = ReactiveVar(); - self.now = ReactiveVar(moment()); - window.setInterval(() => { - self.now.set(moment()); - }, 60000); - - self.autorun(() => { - self.date.set(moment(self.data().value)); - }); - } - - showDate() { + onCreated() { + super.onCreated(); + const self = this; + self.date = ReactiveVar(); + self.now = ReactiveVar(moment()); + window.setInterval(() => { + self.now.set(moment()); + }, 60000); + + self.autorun(() => { + self.date.set(moment(self.data().value)); + }); + } + + showDate() { // this will start working once mquandalle:moment // is updated to at least moment.js 2.10.5 // until then, the date is displayed in the "L" format - return this.date.get().calendar(null, { - sameElse: 'llll', - }); - } + return this.date.get().calendar(null, { + sameElse: 'llll', + }); + } - showISODate() { - return this.date.get().toISOString(); - } + showISODate() { + return this.date.get().toISOString(); + } - classes() { - if (this.date.get().isBefore(this.now.get(), 'minute') && + classes() { + if (this.date.get().isBefore(this.now.get(), 'minute') && this.now.get().isBefore(this.data().value)) { - return 'current'; - } - return ''; + return 'current'; } + return ''; + } - showTitle() { - return `${TAPi18n.__('card-start-on')} ${this.date.get().format('LLLL')}`; - } + showTitle() { + return `${TAPi18n.__('card-start-on')} ${this.date.get().format('LLLL')}`; + } - events() { - return [{ - 'click .js-edit-date': Popup.open('cardCustomField-date'), - }]; - } + events() { + return [{ + 'click .js-edit-date': Popup.open('cardCustomField-date'), + }]; + } }).register('cardCustomField-date'); // cardCustomField-datePopup (class extends DatePicker { - onCreated() { - super.onCreated(); - const self = this; - self.card = Cards.findOne(Session.get('currentCard')); - self.customFieldId = this.data()._id; - this.data().value && this.date.set(moment(this.data().value)); - } - - _storeDate(date) { - this.card.setCustomField(this.customFieldId, date); - } - - _deleteDate() { - this.card.setCustomField(this.customFieldId, ''); - } + onCreated() { + super.onCreated(); + const self = this; + self.card = Cards.findOne(Session.get('currentCard')); + self.customFieldId = this.data()._id; + this.data().value && this.date.set(moment(this.data().value)); + } + + _storeDate(date) { + this.card.setCustomField(this.customFieldId, date); + } + + _deleteDate() { + this.card.setCustomField(this.customFieldId, ''); + } }).register('cardCustomField-datePopup'); // cardCustomField-dropdown (class extends CardCustomField { - onCreated() { - super.onCreated(); - this._items = this.data().definition.settings.dropdownItems; - this.items = this._items.slice(0); - this.items.unshift({ - _id: "", - name: TAPi18n.__('custom-field-dropdown-none') - }); - } - - selectedItem() { - const selected = this._items.find((item) => { - return item._id == this.data().value; - }); - return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown'); - } - - events() { - return [{ - 'submit .js-card-customfield-dropdown'(evt) { - evt.preventDefault(); - const value = this.find('select').value; - this.card.setCustomField(this.customFieldId, value); - }, - }]; - } + onCreated() { + super.onCreated(); + this._items = this.data().definition.settings.dropdownItems; + this.items = this._items.slice(0); + this.items.unshift({ + _id: '', + name: TAPi18n.__('custom-field-dropdown-none'), + }); + } + + selectedItem() { + const selected = this._items.find((item) => { + return item._id === this.data().value; + }); + return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown'); + } + + events() { + return [{ + 'submit .js-card-customfield-dropdown'(evt) { + evt.preventDefault(); + const value = this.find('select').value; + this.card.setCustomField(this.customFieldId, value); + }, + }]; + } -}).register('cardCustomField-dropdown'); \ No newline at end of file +}).register('cardCustomField-dropdown'); -- cgit v1.2.3-1-g7c22 From 838578657da4ed46be0e32091120c7554b07c102 Mon Sep 17 00:00:00 2001 From: Ignatz Date: Fri, 18 May 2018 10:43:43 +0200 Subject: template literals correction --- client/components/cards/cardCustomFields.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js index 821ca02b..019fcab5 100644 --- a/client/components/cards/cardCustomFields.js +++ b/client/components/cards/cardCustomFields.js @@ -24,7 +24,7 @@ Template.cardCustomFieldsPopup.events({ const CardCustomField = BlazeComponent.extendComponent({ getTemplate() { - return 'cardCustomField-${this.data().definition.type}'; + return `cardCustomField-${this.data().definition.type}`; }, onCreated() { -- cgit v1.2.3-1-g7c22 From ef99e6a6b1cd8d55fdab9ff94e7bfc3d5c538b8f Mon Sep 17 00:00:00 2001 From: Ignatz Date: Fri, 18 May 2018 11:13:01 +0200 Subject: indend corrections --- client/components/cards/cardCustomFields.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/components/cards/cardCustomFields.js') diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js index 019fcab5..aa50caec 100644 --- a/client/components/cards/cardCustomFields.js +++ b/client/components/cards/cardCustomFields.js @@ -95,9 +95,9 @@ CardCustomField.register('cardCustomField'); } showDate() { - // this will start working once mquandalle:moment - // is updated to at least moment.js 2.10.5 - // until then, the date is displayed in the "L" format + // this will start working once mquandalle:moment + // is updated to at least moment.js 2.10.5 + // until then, the date is displayed in the "L" format return this.date.get().calendar(null, { sameElse: 'llll', }); -- cgit v1.2.3-1-g7c22