From ade3c02122d262c72bd7c4fd1cbcab8e136184ba Mon Sep 17 00:00:00 2001 From: Pouyan Savoli Date: Fri, 25 Aug 2017 02:59:20 +0200 Subject: Create custom fields creation UI added to Board Menu, Model in progress --- client/components/sidebar/sidebar.js | 1 + client/components/sidebar/sidebarCustomFields.jade | 31 ++++++++++++ client/components/sidebar/sidebarCustomFields.js | 55 ++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 client/components/sidebar/sidebarCustomFields.jade create mode 100644 client/components/sidebar/sidebarCustomFields.js (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 1290fd13..59a2b42c 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -5,6 +5,7 @@ const defaultView = 'home'; const viewTitles = { filter: 'filter-cards', multiselection: 'multi-selection', + customFields: 'custom-fields', archives: 'archives', }; diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade new file mode 100644 index 00000000..33688441 --- /dev/null +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -0,0 +1,31 @@ +template(name="customFieldsSidebar") + ul.sidebar-list + each customsFields + li + a.name + span.sidebar-list-item-description + {{_ 'some name'}} + if currentUser.isBoardMember + hr + a.sidebar-btn.js-open-create-custom-field + i.fa.fa-plus + span {{_ 'Create Custom Field'}} + +template(name="createCustomFieldPopup") + form + label + | {{_ 'name'}} + input.js-field-name(type="text" name="field-name" autofocus) + label + | {{_ 'type'}} + select.js-field-type(name="field-type") + option(value="string") String + option(value="number") Number + option(value="checkbox") Checkbox + option(value="date") Date + option(value="DropdownList") Dropdown List + a.flex.js-field-show-on-card + .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") + + span {{_ 'show-field-on-card'}} + input.primary.wide(type="submit" value="{{_ 'save'}}") \ No newline at end of file diff --git a/client/components/sidebar/sidebarCustomFields.js b/client/components/sidebar/sidebarCustomFields.js new file mode 100644 index 00000000..da03f484 --- /dev/null +++ b/client/components/sidebar/sidebarCustomFields.js @@ -0,0 +1,55 @@ +BlazeComponent.extendComponent({ + + customFields() { + return CustomFields.find({ + boardId: Session.get('currentBoard'), + }); + }, + + events() { + return [{ + 'click .js-open-create-custom-field': Popup.open('createCustomField'), + 'click .js-edit-custom-field'() { + // todo + }, + 'click .js-delete-custom-field': Popup.afterConfirm('customFieldDelete', function() { + const customFieldId = this._id; + CustomFields.remove(customFieldId); + Popup.close(); + }), + }]; + }, + +}).register('customFieldsSidebar'); + +Template.createCustomFieldPopup.helpers({ + +}); + +Template.createCustomFieldPopup.events({ + 'click .js-field-show-on-card'(event) { + let $target = $(event.target); + if(!$target.hasClass('js-field-show-on-card')){ + $target = $target.parent(); + } + $target.find('.materialCheckBox').toggleClass('is-checked'); + $target.toggleClass('is-checked'); + }, + 'submit'(evt, tpl) { + evt.preventDefault(); + + const name = tpl.find('.js-field-name').value.trim(); + const type = tpl.find('.js-field-type').value.trim(); + const showOnCard = tpl.find('.js-field-show-on-card.is-checked') != null; + //console.log("Create",name,type,showOnCard); + + CustomFields.insert({ + boardId: Session.get('currentBoard'), + name: name, + type: type, + showOnCard: showOnCard + }); + + Popup.back(); + }, +}); \ No newline at end of file -- cgit v1.2.3-1-g7c22 From afd87e3caa1fedbe8fe5dbaefa485fee1ed85c71 Mon Sep 17 00:00:00 2001 From: Pouyan Savoli Date: Sun, 27 Aug 2017 22:31:24 +0200 Subject: many custom fields model and UI enhancements --- client/components/sidebar/sidebar.js | 2 +- client/components/sidebar/sidebar.styl | 61 ++++++++++++++-------- client/components/sidebar/sidebarCustomFields.jade | 44 +++++++++++----- client/components/sidebar/sidebarCustomFields.js | 36 +++++++++---- 4 files changed, 96 insertions(+), 47 deletions(-) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 59a2b42c..0ff73215 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -5,7 +5,7 @@ const defaultView = 'home'; const viewTitles = { filter: 'filter-cards', multiselection: 'multi-selection', - customFields: 'custom-fields', + customFields: 'configure-custom-fields', archives: 'archives', }; diff --git a/client/components/sidebar/sidebar.styl b/client/components/sidebar/sidebar.styl index 8f2f493e..740186b5 100644 --- a/client/components/sidebar/sidebar.styl +++ b/client/components/sidebar/sidebar.styl @@ -45,28 +45,45 @@ display: flex flex-direction: column - li > a - display: flex - height: 30px - margin: 0 - padding: 4px - border-radius: 3px - align-items: center - - &:hover - &, i, .quiet - color white - - .member, .card-label - margin-right: 7px - margin-top: 5px - - .sidebar-list-item-description - flex: 1 - overflow: ellipsis - - .fa.fa-check - margin: 0 4px + li + & > a + display: flex + height: 30px + margin: 0 + padding: 4px + border-radius: 3px + align-items: center + + &:hover + &, i, .quiet + color white + + .member, .card-label + margin-right: 7px + margin-top: 5px + + .minicard-edit-button + float: right + padding: 8px + border-radius: 3px + + .sidebar-list-item-description + flex: 1 + overflow: ellipsis + + .fa.fa-check + margin: 0 4px + + .minicard + padding: 6px 8px 4px + + .minicard-edit-button + float: right + padding: 4px + border-radius: 3px + + &:hover + background: #dbdbdb .sidebar-btn display: block diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade index 33688441..e17bb75d 100644 --- a/client/components/sidebar/sidebarCustomFields.jade +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -1,31 +1,49 @@ template(name="customFieldsSidebar") ul.sidebar-list - each customsFields + each customFields li - a.name - span.sidebar-list-item-description - {{_ 'some name'}} + div.minicard-wrapper.js-minicard + div.minicard + a.fa.fa-pencil.js-edit-custom-field.minicard-edit-button + div.minicard-title + | {{ name }} ({{ type }}) + if currentUser.isBoardMember hr a.sidebar-btn.js-open-create-custom-field i.fa.fa-plus - span {{_ 'Create Custom Field'}} + span {{_ 'createCustomField'}} template(name="createCustomFieldPopup") form label | {{_ 'name'}} - input.js-field-name(type="text" name="field-name" autofocus) + unless _id + input.js-field-name(type="text" name="field-name" autofocus) + else + input.js-field-name(type="text" name="field-name" value=name) + label | {{_ 'type'}} - select.js-field-type(name="field-type") - option(value="string") String - option(value="number") Number - option(value="checkbox") Checkbox - option(value="date") Date - option(value="DropdownList") Dropdown List + select.js-field-type(name="field-type" disabled="{{#if _id}}disabled{{/if}}") + each types + if selected + option(value=type selected="selected") {{name}} + else + option(value=type) {{name}} a.flex.js-field-show-on-card .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") span {{_ 'show-field-on-card'}} - input.primary.wide(type="submit" value="{{_ 'save'}}") \ No newline at end of file + button.primary.wide.left(type="submit") + | {{_ 'save'}} + if _id + button.negate.wide.right.js-delete-custom-field + | {{_ 'delete'}} + +template(name="editCustomFieldPopup") + | {{> createCustomFieldPopup}} + +template(name="deleteCustomFieldPopup") + p {{_ "custom-field-delete-pop"}} + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} \ No newline at end of file diff --git a/client/components/sidebar/sidebarCustomFields.js b/client/components/sidebar/sidebarCustomFields.js index da03f484..6ddd466e 100644 --- a/client/components/sidebar/sidebarCustomFields.js +++ b/client/components/sidebar/sidebarCustomFields.js @@ -9,21 +9,22 @@ BlazeComponent.extendComponent({ events() { return [{ 'click .js-open-create-custom-field': Popup.open('createCustomField'), - 'click .js-edit-custom-field'() { - // todo - }, - 'click .js-delete-custom-field': Popup.afterConfirm('customFieldDelete', function() { - const customFieldId = this._id; - CustomFields.remove(customFieldId); - Popup.close(); - }), + 'click .js-edit-custom-field': Popup.open('editCustomField'), }]; }, }).register('customFieldsSidebar'); Template.createCustomFieldPopup.helpers({ - + types() { + var currentType = this.type; + return ['text', 'number', 'checkbox', 'date', 'dropdown']. + map(type => {return { + type: type, + name: TAPi18n.__('custom-field-' + type), + selected: type == currentType, + }}); + }, }); Template.createCustomFieldPopup.events({ @@ -41,7 +42,7 @@ Template.createCustomFieldPopup.events({ const name = tpl.find('.js-field-name').value.trim(); const type = tpl.find('.js-field-type').value.trim(); const showOnCard = tpl.find('.js-field-show-on-card.is-checked') != null; - //console.log("Create",name,type,showOnCard); + //console.log('Create',name,type,showOnCard); CustomFields.insert({ boardId: Session.get('currentBoard'), @@ -52,4 +53,17 @@ Template.createCustomFieldPopup.events({ Popup.back(); }, -}); \ No newline at end of file + 'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() { + const customFieldId = this._id; + CustomFields.remove(customFieldId); + Popup.close(); + }), +}); + +/*Template.deleteCustomFieldPopup.events({ + 'submit'(evt) { + const customFieldId = this._id; + CustomFields.remove(customFieldId); + Popup.close(); + } +});*/ \ 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/sidebar/sidebar.js | 2 +- client/components/sidebar/sidebarCustomFields.jade | 23 ++-- client/components/sidebar/sidebarCustomFields.js | 129 +++++++++++++++------ 3 files changed, 109 insertions(+), 45 deletions(-) (limited to 'client/components/sidebar') diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 0ff73215..59a2b42c 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -5,7 +5,7 @@ const defaultView = 'home'; const viewTitles = { filter: 'filter-cards', multiselection: 'multi-selection', - customFields: 'configure-custom-fields', + customFields: 'custom-fields', archives: 'archives', }; diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade index e17bb75d..def083e9 100644 --- a/client/components/sidebar/sidebarCustomFields.jade +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -19,31 +19,34 @@ template(name="createCustomFieldPopup") label | {{_ 'name'}} unless _id - input.js-field-name(type="text" name="field-name" autofocus) + input.js-field-name(type="text" autofocus) else - input.js-field-name(type="text" name="field-name" value=name) + input.js-field-name(type="text" value=name) label | {{_ 'type'}} - select.js-field-type(name="field-type" disabled="{{#if _id}}disabled{{/if}}") + select.js-field-type(disabled="{{#if _id}}disabled{{/if}}") each types if selected - option(value=type selected="selected") {{name}} + option(value=value selected="selected") {{name}} else - option(value=type) {{name}} + option(value=value) {{name}} + div.js-field-settings.js-field-settings-dropdown(class="{{#if isTypeNotSelected 'dropdown'}}hide{{/if}}") + label + | {{_ 'custom-field-dropdown-options'}} + 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 .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") span {{_ 'show-field-on-card'}} - button.primary.wide.left(type="submit") + button.primary.wide.left(type="button") | {{_ 'save'}} if _id - button.negate.wide.right.js-delete-custom-field + button.negate.wide.right.js-delete-custom-field(type="button") | {{_ 'delete'}} -template(name="editCustomFieldPopup") - | {{> createCustomFieldPopup}} - template(name="deleteCustomFieldPopup") p {{_ "custom-field-delete-pop"}} button.js-confirm.negate.full(type="submit") {{_ 'delete'}} \ No newline at end of file diff --git a/client/components/sidebar/sidebarCustomFields.js b/client/components/sidebar/sidebarCustomFields.js index 6ddd466e..139b8a42 100644 --- a/client/components/sidebar/sidebarCustomFields.js +++ b/client/components/sidebar/sidebarCustomFields.js @@ -15,50 +15,111 @@ BlazeComponent.extendComponent({ }).register('customFieldsSidebar'); -Template.createCustomFieldPopup.helpers({ +const CreateCustomFieldPopup = BlazeComponent.extendComponent({ + + _types: ['text', 'number', 'checkbox', 'date', 'dropdown'], + + onCreated() { + this.type = new ReactiveVar((this.data().type) ? this.data().type : this._types[0]); + this.dropdownItems = new ReactiveVar((this.data().settings && this.data().settings.dropdownItems) ? this.data().settings.dropdownItems : []); + }, + types() { - var currentType = this.type; - return ['text', 'number', 'checkbox', 'date', 'dropdown']. - map(type => {return { - type: type, - name: TAPi18n.__('custom-field-' + type), - selected: type == currentType, - }}); + const currentType = this.data().type; + return this._types. + map(type => {return { + value: type, + name: TAPi18n.__('custom-field-' + type), + selected: type == currentType, + }}); + }, + + isTypeNotSelected(type) { + return this.type.get() !== type; + }, + + getDropdownItems() { + var items = this.dropdownItems.get(); + Array.from(this.findAll('.js-field-settings-dropdown input')).forEach((el, index) => { + //console.log('each item!', index, el.value); + if (!items[index]) items[index] = { + _id: Random.id(6), + }; + items[index].name = el.value.trim(); + }); + return items; }, -}); -Template.createCustomFieldPopup.events({ - 'click .js-field-show-on-card'(event) { - let $target = $(event.target); - if(!$target.hasClass('js-field-show-on-card')){ - $target = $target.parent(); + getSettings() { + let settings = {}; + switch (this.type.get()) { + case 'dropdown': + let dropdownItems = this.getDropdownItems().filter(item => !!item.name.trim()); + settings.dropdownItems = dropdownItems; + break; } - $target.find('.materialCheckBox').toggleClass('is-checked'); - $target.toggleClass('is-checked'); + return settings; }, - 'submit'(evt, tpl) { - evt.preventDefault(); - const name = tpl.find('.js-field-name').value.trim(); - const type = tpl.find('.js-field-type').value.trim(); - const showOnCard = tpl.find('.js-field-show-on-card.is-checked') != null; - //console.log('Create',name,type,showOnCard); + events() { + return [{ + 'change .js-field-type'(evt) { + const value = evt.target.value; + this.type.set(value); + }, + 'keydown .js-dropdown-item.last'(evt) { + if (evt.target.value.trim() && evt.keyCode === 13) { + let items = this.getDropdownItems(); + this.dropdownItems.set(items); + evt.target.value = ''; + } + }, + 'click .js-field-show-on-card'(evt) { + let $target = $(evt.target); + if(!$target.hasClass('js-field-show-on-card')){ + $target = $target.parent(); + } + $target.find('.materialCheckBox').toggleClass('is-checked'); + $target.toggleClass('is-checked'); + }, + 'click .primary'(evt) { + evt.preventDefault(); + + const data = { + boardId: Session.get('currentBoard'), + name: this.find('.js-field-name').value.trim(), + type: this.type.get(), + settings: this.getSettings(), + showOnCard: this.find('.js-field-show-on-card.is-checked') != null + } - CustomFields.insert({ - boardId: Session.get('currentBoard'), - name: name, - type: type, - showOnCard: showOnCard - }); + // insert or update + if (!this.data()._id) { + CustomFields.insert(data); + } else { + CustomFields.update(this.data()._id, {$set: data}); + } - Popup.back(); + Popup.back(); + }, + 'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() { + const customFieldId = this._id; + CustomFields.remove(customFieldId); + Popup.close(); + }), + }]; }, - 'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() { - const customFieldId = this._id; - CustomFields.remove(customFieldId); - Popup.close(); - }), + }); +CreateCustomFieldPopup.register('createCustomFieldPopup'); + +(class extends CreateCustomFieldPopup { + + template() { + return 'createCustomFieldPopup'; + } + +}).register('editCustomFieldPopup'); /*Template.deleteCustomFieldPopup.events({ 'submit'(evt) { -- cgit v1.2.3-1-g7c22