ru.coon 2.7.30 → 2.7.32

package/CHANGELOG.md

@@ -1,11 +1,31 @@
+# Version 2.7.32, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/40925f0ca399d6d5da42511e20b8c7fa10acadaf)
+* ## Features
+* <span style='color:green'>feat: HT-8492: create new type field</span> ([0657da], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0657da1e4ba8e54a47eaca571cf71596c8107c7c))
+
+* update: CHANGELOG.md ([1e8b7b], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e8b7b6e038fb0ea66ce786f648af3e4934afc11))
+
+# Version 2.7.31, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/b6fab6651c567feee5d735e2fd1af27ea315d393)
+* ## Features
+* <span style='color:green'>feat: HT-8131 add TreeNestingToolbarButtonPlugin</span> ([15ec59], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/15ec59a4f41473a5d0cd8a174c641875ec95418b))
+
+* ## Fixes
+* <span style='color:red'> HT-8910 При загрузке страницы в LocalPagingComboPicker проверяется, что выполнена загрузка и есть страницы</span> ([c7f82c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c7f82cd4743eb568d75fb188217d3d3bfc1eba1a))
+* <span style='color:red'> HT-8131 changed the menu order</span> ([e8b203], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/e8b203fb937bd9acb9464cc48115764a227d31ba))
+
+* update: CHANGELOG.md ([935b5a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/935b5a73025d3ff9cdf61188e1b3fb1f754b84da))
+
 # Version 2.7.30, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a72ce199d2d79b7a5dcb52cc81cd68e46f34829a)
 * ## Fixes
 * <span style='color:red'> HT-8422: set filter panel height on afterlayout</span> ([d65a92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/d65a9277c2fcedaba912ff40ba7a912049bdd7f7))
+* <span style='color:red'> HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([0a7edf], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/0a7edf4357213fd7872ecb361ce47261b3102b4c))
+* <span style='color:red'> HT-8131 refactoring</span> ([f2b72a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/f2b72a804d99b23988f0e25d2f5e0ec831c694bb))
 
 * update: CHANGELOG.md ([880435], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/88043579448bda38f9c2b2ec4d159a2d502dba5a))
 
 # Version 2.7.29, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/567513e38f7c7e6b90e1873785d5fb69e9fb9f4b)
 * ## Fixes
+* <span style='color:red'> HT-8131 set new menu</span> ([19b735], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/19b73537c87c685cdf11156c4cc95e120b7eb89e))
+* <span style='color:red'> HT-8131 renaming</span> ([6a84ad], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/6a84ad2ca12ee556278e9f2bb25a9fe94b8ae38e))
 * <span style='color:red'> CustomValueCheckBox updateCheckedCls by transformed value. Closes HT-8838.</span> ([1ac9e0], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1ac9e0051d72938c2942a2d528e40fd9b20ca4a0))
 
 * add CoonQtip plugin for adding tooltip on fields with missing tooltip feature ([49dabd], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/49dabdd3c14afd50413d8a1b9a027a9fbd78713d))
@@ -111,6 +131,9 @@
 * update: CHANGELOG.md ([7e0d7a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7e0d7a025de88c42cf8a8e93ff0a7450339b21d6))
 
 # Version 2.0.104, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7358f6f6fdd7dc823e356d7a40416fab2dadd3cc)
+* ## Features
+* <span style='color:green'>feat: HT-8131 refactoring</span> ([de3817], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/de3817d1517e3b9153dca662361e900cf1b1208a))
+
 * ## Fixes
 * <span style='color:red'> HT-8422: fix colors</span> ([c97c54], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c97c546e5688fbba054bce8bc0655261972b7a27))
 * <span style='color:red'> HT-8422: fix colors</span> ([eae5f9], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/eae5f92b6d3b4629e79232cf8e214ac89114be78))
@@ -122,8 +145,10 @@
 
 # Version 2.7.15, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1e27a6d56071c26951813a36d45daf805a6f750d)
 * ## Features
+* <span style='color:green'>feat: HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([9e7242], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/9e7242dadb2907ac135dd9e6bd2bf7309ef5996f))
 * <span style='color:green'>feat: Вывод сообщения об ошибках при инициализации плагинов отчета. Closes HT-8531.</span> ([a35d09], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a35d09c39f20263dd032f6accc9d175a8241e111))
 * <span style='color:green'>feat: Добавлено логирование ошибки, при возврате отчетом более одной строки. Related to HT-8223.</span> ([34491c], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/34491c4ee3f5dc6d26f5c04652796d563c9fb6c4))
+* <span style='color:green'>feat: HT-8131 add universal button for collapse/expand report lines in a hierarchy</span> ([4da24d], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4da24d2084419d57871be03bda1d714bc3e2cc7b))
 
 * ## Fixes
 * <span style='color:red'> HT-8257: publish state only on tab change and prepare data to save</span> ([81e5a6], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/81e5a64bf6c1f106f477877a94d61d5da55faf36))
@@ -135,6 +160,7 @@
 * ## Fixes
 * <span style='color:red'> BFL-3938: check plugin attribute is no=t empty and check row objects</span> ([94ce92], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/94ce92a1ee3d9a7313462b061a1b7ec8868c3275))
 
+* upd ([da0796], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/da07969de4fad7688b9119331e1f5867fc7aff89))
 * update: CHANGELOG.md ([91bb31], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/91bb31ecc6eac439793205fd9b9d7f748483ff8d))
 
 # Version 2.7.13, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/c2a509ebbdf7d3ddd07faaf3a42f0ef759a31cc4)
@@ -192,6 +218,7 @@
 # Version 2.7.6, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/ab36a4fa8f1d7894eb9bbf8bac33276c7659f90d)
 * HT-8373 fix: Исправлена ошибка валидации параметров (свойств параметра)... ([46513a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/46513a1a976cb7440777508f13356667e72fd98f))
 * HT-7448 feat: Изменяемый размер и сохранение состояния панели "Настройки команды" в ExecuteCommandButtonPluginConfigPanel. ([933ca2], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/933ca2edf1999a4e0f8bdfb0c54a4d4da4bfa603))
+* draft ([8a1a53], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8a1a5352f5639bbe634b737e0c07b202412ac986))
 * update: CHANGELOG.md ([baca35], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/baca356d93e141e0bb134de87f2cb60b1c15d0dc))
 
 # Version 2.7.5, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/98f5d7b3391db7e90e8818d6071c674b71cb6afd)
@@ -199,6 +226,7 @@
 * <span style='color:green'>feat: TR-67883: reload main navigation on change menu structure</span> ([a6a849], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a6a849e812bc3988abadc526aa4829830eb89ed2))
 
 * HT-7448 fix: Исправление проверки валидности параметров команды ([99c08a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/99c08a16a68766ece123b717ef48400b14f51d54))
+* draft ([589349], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/58934923b2f9959c9ea4b3e4e5833f5bba3ced04))
 * update: CHANGELOG.md ([90c0e8], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/90c0e823dcf1d3687c38ada3d6711a84fa15e083))
 
 # Version 2.7.4, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/7becde7cc7cfb8254525c8beca11cbd4604b8181)

package/package.json

@@ -4,7 +4,7 @@
     "name": "ru.coon"
   },
   "description": "",
-  "version": "2.7.30",
+  "version": "2.7.32",
   "repository": {
     "type": "git",
     "url": "git+http://gitlab-dbr.sigma-it.local/dbr/ru.coon"

package/src/common/field/PeriodByReportField.js

@@ -0,0 +1,139 @@
+Ext.define('Coon.common.field.PeriodByReportField', {
+    extend: 'Coon.report.component.SimplestReportCombo',
+    xtype: 'PeriodByReportField',
+    config: {
+        periodEndName: undefined,
+        periodStart: undefined,
+        periodEnd: undefined,
+        dateFormatDB: 'Y-m',
+        /* defaultValueOpt: {
+            key: 'IS_DEFAULT',
+            value: 'Y',
+        },*/
+        defaultValueOpt: undefined,
+    },
+    setInitDateToEnd: false,
+    triggers: {
+        back: {
+            cls: 'x-fa fa-arrow-left',
+            handler: (cmp) => {
+                cmp.goBack();
+            },
+        },
+        forward: {
+            cls: 'x-fa fa-arrow-right',
+            handler: (cmp) => {
+                cmp.goForward();
+            },
+        },
+    },
+
+    goBack(setValToRef) {
+        if (!this.getValue()) {
+            return;
+        }
+        const store = this.getStore();
+        const curRecordPosition = store.find(this.valueField, this.getValue());
+        if (curRecordPosition >= 0 && curRecordPosition < (store.getData().length - 1)) {
+            const rec = store.getAt(curRecordPosition + 1);
+            rec && this.select(rec);
+            if (setValToRef) {
+                this.getPeriodStart() && this.getPeriodStart().setValue(rec.get(this.valueField));
+                this.getPeriodEnd() && this.getPeriodEnd().setValue(rec.get(this.valueField));
+            }
+            return;
+        }
+        if (this.getPeriodStart()) {
+            this.getPeriodStart().fireEvent('goBack', true);
+            return;
+        }
+    },
+
+    goForward(setValToRef) {
+        if (!this.getValue()) {
+            return;
+        }
+        const store = this.getStore();
+        const curRecordPosition = store.find(this.valueField, this.getValue());
+        if (curRecordPosition > 0) {
+            const rec = store.getAt(curRecordPosition - 1);
+            rec && this.select(rec);
+            return;
+        }
+    },
+
+    doInit(startDate) {
+        if (startDate && Ext.isDate(new Date(startDate))) {
+            this.setStartDate(startDate);
+        }
+    },
+
+    setStartDate(value) {
+        this.setValue(value);
+    },
+
+    setEndDate(value) {
+        const field = this.getEndField();
+        field && field.setValue(value);
+    },
+
+    getEndField() {
+        if (!this.getPeriodEndName()) {
+            return null;
+        };
+        const ownerCmp = this.up('FilterPanel') || this.up('[dataId=FilterPanel]') || this.up();
+        let cmpQuery = [];
+        if (ownerCmp) {
+            cmpQuery = Ext.ComponentQuery.query(`[name=${this.getPeriodEndName()}]`, ownerCmp);
+        }
+        return cmpQuery.length && this.setPeriodEnd(cmpQuery[0]) && cmpQuery[0];
+    },
+
+    onStoreLoad(store) {
+        if (this.getValue()) {
+            return;
+        }
+        const opt = this.getDefaultValueOpt();
+        let number = 0;
+        if (opt && opt.key && opt.value) {
+            number = store.find(opt.key, opt.value);
+        } else if (this.getPeriodEndName()) {
+            number = store.find(this.valueField, Ext.Date.format(new Date(), this.getDateFormatDB()));
+        }
+        if (this.getPeriodEndName()) {
+            this.setInitDateToEnd = true;
+        }
+        this.select(this.getStore().getAt(number >= 0 ? number : 0));
+    },
+
+    initComponent: function() {
+        this.callParent();
+        this.on('goForward', this.goForward, this);
+        this.on('goBack', this.goBack, this);
+        this.on('change', () => {
+            const startDate = this.getValue();
+            const fieldEndDate = this.getEndField();
+            if (fieldEndDate && startDate) {
+                fieldEndDate.setPeriodStart(this);
+                const endDate = fieldEndDate.getValue();
+                const filters = fieldEndDate.getStore().getFilters();
+
+                const fn = (item) => {
+                    return item.get(fieldEndDate.valueField) >= this.getValue();
+                };
+                filters.remove(fn);
+                filters.add(fn);
+                if (this.setInitDateToEnd) {
+                    this.setInitDateToEnd = false;
+                    fieldEndDate.setValue(startDate);
+                    fieldEndDate.getValue();
+                    return;
+                }
+                if (startDate > endDate) {
+                    fieldEndDate.setValue(startDate);
+                }
+            }
+        }, this);
+        this.getStore().on('load', this.onStoreLoad, this);
+    },
+});

package/src/common/field/checkbox/RoundCheckbox.js

@@ -0,0 +1,5 @@
+Ext.define('Coon.common.field.checkbox.RoundCheckbox', {
+    extend: 'Ext.form.field.Checkbox',
+    cls: 'RoundCheckbox',
+    xtype: ['roundcheckbox', 'RoundCheckbox'],
+});

package/src/common/field/checkbox/RoundCheckbox.scss

@@ -0,0 +1,48 @@
+.x-form-fieldCheckbox {
+  .x-form-field {
+    position: relative;
+  }
+  
+  .x-form-field label {
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 50%;
+    cursor: pointer;
+    height: 28px;
+    left: 0;
+    position: absolute;
+    top: 0;
+    width: 28px;
+  }
+  
+  .x-form-field label:after {
+    border: 2px solid #fff;
+    border-top: none;
+    border-right: none;
+    content: "";
+    height: 6px;
+    left: 7px;
+    opacity: 0;
+    position: absolute;
+    top: 8px;
+    transform: rotate(-45deg);
+    width: 12px;
+  }
+  
+  .x-form-field input[type="checkbox"] {
+    visibility: hidden;
+  }
+  
+  .x-form-field input[type="checkbox"]:checked + label {
+    background-color: #66bb6a;
+    border-color: #66bb6a;
+  }
+  
+  .x-form-field input[type="checkbox"]:checked + label:after {
+    opacity: 1;
+  }
+  
+  .x-form-item-body, .x-form-cb-wrap-inner {
+    margin: 0 auto;
+  }
+}

package/src/nav/MenuLoader.js

@@ -0,0 +1,23 @@
+Ext.define('Coon.nav.MenuLoader', {
+    singleton: true,
+
+    isLoaded: false,
+
+    load() {
+        return Coon.util.promisifyCmd('command.GetDynamicReportDataCommand', 'MENU_ALLITEMS')
+            .then((data) => {
+                if (Array.isArray(data.list)) {
+                    this.uiElementMap = data.list.reduce();
+                }
+                this.isLoaded = true;
+            });
+    },
+
+    get() {
+
+    },
+
+    isValidMenuItem(uiEmentId) {
+        return this.uiElementMap.has(uiEmentId);
+    },
+});

package/src/report/component/LocalPagingComboPicker.js

@@ -141,7 +141,7 @@ Ext.define('Coon.report.component.LocalPagingComboPicker', {
         const store = this.getStore();
         const picker = this.picker;
 
-        if (page && picker) {
+        if (page && picker && pageControl.count > 0) {
             if (page <= pageControl.count) {
                 pageControl.currentPage = page;
                 picker.pagingToolbar.setPageNumber(page);

package/src/report/plugin/configPanel/TreeNestingToolbarButtonPluginConfigPanel.js

@@ -0,0 +1,19 @@
+Ext.define('Coon.report.plugin.configPanel.TreeNestingToolbarButtonPluginConfigPanel', {
+    extend: 'Coon.report.plugin.configPanel.GridToolbarButtonPluginConfigPanel',
+    alias: 'widget.TreeNestingToolbarButtonPluginConfigPanel',
+    uses: [],
+    requires: [],
+
+    description: 'Универсальная кнопка сворачивая/разворачивания строк отчета в иерархии\t\n',
+    tags: ['Кнопка', 'Дерево', 'Группировка'],
+
+    config: {
+        pluginTypeSettings: {
+            defaultType: 'GRID_PLUGIN',
+            allowedTypes: [
+                'GRID_PLUGIN'
+            ],
+        },
+    },
+    scrollable: true,
+});

package/src/report/plugin/grid/ExportReportDataToFilePlugin.md

@@ -0,0 +1,7 @@
+**спецификация:**
+
+входные параметры:
+
+- exportFileFormat [xls/pdf]
+- allowUserSelectColumnsToUpload
+- addToSearchButton добавить в кнопку "поиск", в этом случае в качестве параметра отправляем текущие параметры из FilterPanel(useRawFilterParams: true)

package/src/report/plugin/grid/TreeNestingToolbarButtonPlugin.js

@@ -0,0 +1,128 @@
+Ext.define('Coon.report.plugin.grid.TreeNestingToolbarButtonPlugin', {
+    extend: 'Coon.report.plugin.grid.GridToolbarButtonPlugin',
+    alias: 'plugin.TreeNestingToolbarButtonPlugin',
+    uses: [],
+
+    parameters: [],
+    properties: {},
+
+    configurePanelWizard: 'TreeNestingToolbarButtonPluginConfigPanel',
+
+    isSingle: true,
+
+    createToolbarItem: function() {
+        this.nestingButton = Ext.create({
+            xtype: 'button',
+            iconCls: 'svg-icon svg-icon-scheme-3',
+            disabled: true,
+            width: 66,
+            height: 40,
+        });
+        return this.nestingButton;
+    },
+
+    customInit: function() {
+        const reportTree = this.component;
+
+        if (!reportTree instanceof Ext.tree.Panel) {
+            console.warn('Coon.report.plugin.grid.TreeFilterPlugin incorrect plugin placement');
+            return;
+        }
+
+        reportTree.getStore().on('load', function() {
+            const records = reportTree.getStore().getRange();
+            if (!records.length) {
+                return;
+            }
+
+            const menus = this.getMenu(reportTree);
+            this.nestingButton.setDisabled(false);
+            this.nestingButton.setMenu(menus, false);
+        }, this);
+    },
+
+    getMenu: function(reportTree) {
+        return [
+            {
+                text: 'Развернуть',
+                menu: this.collectionMenuItems(),
+            },
+            {
+                text: 'Развернуть всё',
+                handler: function() {
+                    Ext.suspendLayouts();
+                    reportTree.getView().getStore().suspendEvents();
+
+                    reportTree.expandAll();
+
+
+                    reportTree.getView().getStore().resumeEvents();
+                    reportTree.getView().refresh();
+                    Ext.resumeLayouts(true);
+                },
+            },
+            {
+                text: 'Свернуть всё',
+                handler: function() {
+                    Ext.suspendLayouts();
+                    reportTree.getView().getStore().suspendEvents();
+
+                    reportTree.collapseAll();
+
+
+                    reportTree.getView().getStore().resumeEvents();
+                    reportTree.getView().refresh();
+                    Ext.resumeLayouts(true);
+                },
+            }
+        ];
+    },
+
+    getGroupedRecords: function(nodes) {
+        return nodes.reduce((acc, node) => {
+            if (!node.hasChildNodes()) {
+                return acc;
+            }
+
+            const property = node.get('depth');
+            acc[property] = acc[property] || [];
+            acc[property].push(node);
+
+            const nestedAcc = this.getGroupedRecords(node.childNodes);
+            for (const nestedAccKey in nestedAcc) {
+                if (!acc[nestedAccKey]) {
+                    acc[nestedAccKey] = [];
+                }
+                acc[nestedAccKey] = acc[nestedAccKey].concat(nestedAcc[nestedAccKey]);
+            }
+
+            return acc;
+        }, {});
+    },
+
+    collectionMenuItems: function() {
+        const reportTree = this.component;
+        const groupedRecords = this.getGroupedRecords(reportTree.getRootNode().childNodes);
+
+        const menu = [];
+        for (const nestingLevel in groupedRecords) {
+            menu.push({
+                text: `Уровень ${nestingLevel}`,
+                handler: Ext.bind(function() {
+                    Ext.suspendLayouts();
+                    reportTree.getView().getStore().suspendEvents();
+
+                    for (const record of groupedRecords[nestingLevel]) {
+                        record.expand();
+                        record.collapseChildren(true);
+                    }
+
+                    reportTree.getView().getStore().resumeEvents();
+                    reportTree.getView().refresh();
+                    Ext.resumeLayouts(true);
+                }, this),
+            });
+        }
+        return menu;
+    },
+});

package/src/version.js

@@ -1,4 +1,4 @@
 Ext.define('Coon.version', {
     singleton: true,
-    number: '2.7.30',
+    number: '2.7.32',
 });