ru.coon 2.7.4 → 2.7.6

package/src/common/component/editor/CharacteristicLoaderByCharacteristicEntityPlugin.js

@@ -1,41 +1,41 @@
-/**
- * Заменяет инициализацию редактора характеристик на загрузку характеристик через стандартный сервис
- */
-Ext.define('Coon.common.component.editor.CharacteristicLoaderByCharacteristicEntityPlugin', {
-    extend: 'Coon.common.component.editor.CharacteristicLoaderPlugin',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.CharacteristicLoaderByCharacteristicEntityPlugin'
-    ],
-    alias: 'plugin.CharacteristicLoaderByCharacteristicEntityPlugin',
-
-    loadURL: 'CharacteristicList/getByCharacteristicEntity',
-    saveURL: 'CharacteristicList/saveByCharacteristicEntity',
-
-    getMergeObject: function() {
-        const obj = this.callParent();
-        obj.doInit = function(ID, characteristicEntity, effectiveDate, entityType, entityType2, entityType3, entityType4, entityType5, entryPoint) {
-            this.model = {};
-            this.model.ID = ID;
-            this.model.characteristicEntity = characteristicEntity;
-            this.model.entityType = entityType;
-            this.model.entityType2 = entityType2;
-            this.model.entityType3 = entityType3;
-            this.model.entityType4 = entityType4;
-            this.model.entityType5 = entityType5;
-            this.model.entryPoint = entryPoint;
-            this.model.effectiveDate = this.exactDate ?
-                (effectiveDate ? new Date(effectiveDate) : new Date()) :
-                (Ext.Date.getFirstDateOfMonth(effectiveDate ? new Date(effectiveDate) : new Date()));
-
-            if (this.resetDateOnSave) {
-                this.defaultModel = {};
-                this.defaultModel.effectiveDate = this.model.effectiveDate;
-            }
-
-            this.setDate(this.model.effectiveDate);
-            this.load();
-        };
-        return obj;
-    },
-});
-
+/**
+ * Заменяет инициализацию редактора характеристик на загрузку характеристик через стандартный сервис
+ */
+Ext.define('Coon.common.component.editor.CharacteristicLoaderByCharacteristicEntityPlugin', {
+    extend: 'Coon.common.component.editor.CharacteristicLoaderPlugin',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.CharacteristicLoaderByCharacteristicEntityPlugin'
+    ],
+    alias: 'plugin.CharacteristicLoaderByCharacteristicEntityPlugin',
+
+    loadURL: 'CharacteristicList/getByCharacteristicEntity',
+    saveURL: 'CharacteristicList/saveByCharacteristicEntity',
+
+    getMergeObject: function() {
+        const obj = this.callParent();
+        obj.doInit = function(ID, characteristicEntity, effectiveDate, entityType, entityType2, entityType3, entityType4, entityType5, entryPoint) {
+            this.model = {};
+            this.model.ID = ID;
+            this.model.characteristicEntity = characteristicEntity;
+            this.model.entityType = entityType;
+            this.model.entityType2 = entityType2;
+            this.model.entityType3 = entityType3;
+            this.model.entityType4 = entityType4;
+            this.model.entityType5 = entityType5;
+            this.model.entryPoint = entryPoint;
+            this.model.effectiveDate = this.exactDate ?
+                (effectiveDate ? new Date(effectiveDate) : new Date()) :
+                (Ext.Date.getFirstDateOfMonth(effectiveDate ? new Date(effectiveDate) : new Date()));
+
+            if (this.resetDateOnSave) {
+                this.defaultModel = {};
+                this.defaultModel.effectiveDate = this.model.effectiveDate;
+            }
+
+            this.setDate(this.model.effectiveDate);
+            this.load();
+        };
+        return obj;
+    },
+});
+

package/src/common/component/editor/CharacteristicTypeLoaderPlugin.js

@@ -1,38 +1,38 @@
-Ext.define('Coon.common.component.editor.CharacteristicTypeLoaderPlugin', {
-    extend: 'Coon.common.component.editor.CharacteristicLoaderPlugin',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.CharacteristicTypeLoaderPlugin'
-    ],
-    alias: 'plugin.CharacteristicTypeLoaderPlugin',
-    loadURL: 'CharacteristicList/getHistory',
-
-    doInit: function(ID, entity, characteristicEntity, effectiveDate, characteristicType) {
-        this.model = {};
-        this.model.ID = ID;
-        this.model.entity = entity;
-        this.model.characteristicEntity = characteristicEntity;
-        this.model.effectiveDate = effectiveDate;
-        this.model.characteristicType = characteristicType;
-
-        this.setDate(effectiveDate);
-        this.load();
-    },
-
-    getMergeObject: function() {
-        const obj = this.callParent();
-        obj.doInit = function(ID, entity, characteristicEntity, effectiveDate, characteristicType) {
-            this.model = {};
-            this.model.ID = ID;
-            this.model.subentityId = entity;
-            this.model.characteristicEntity = characteristicEntity;
-            this.model.effectiveDate = this.exactDate ?
-                (effectiveDate ? new Date(effectiveDate) : new Date()) :
-                (Ext.Date.getFirstDateOfMonth(effectiveDate ? new Date(effectiveDate) : new Date()));
-            this.model.characteristicType = characteristicType;
-
-            this.setDate(effectiveDate);
-            this.load();
-        };
-        return obj;
-    },
-});
+Ext.define('Coon.common.component.editor.CharacteristicTypeLoaderPlugin', {
+    extend: 'Coon.common.component.editor.CharacteristicLoaderPlugin',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.CharacteristicTypeLoaderPlugin'
+    ],
+    alias: 'plugin.CharacteristicTypeLoaderPlugin',
+    loadURL: 'CharacteristicList/getHistory',
+
+    doInit: function(ID, entity, characteristicEntity, effectiveDate, characteristicType) {
+        this.model = {};
+        this.model.ID = ID;
+        this.model.entity = entity;
+        this.model.characteristicEntity = characteristicEntity;
+        this.model.effectiveDate = effectiveDate;
+        this.model.characteristicType = characteristicType;
+
+        this.setDate(effectiveDate);
+        this.load();
+    },
+
+    getMergeObject: function() {
+        const obj = this.callParent();
+        obj.doInit = function(ID, entity, characteristicEntity, effectiveDate, characteristicType) {
+            this.model = {};
+            this.model.ID = ID;
+            this.model.subentityId = entity;
+            this.model.characteristicEntity = characteristicEntity;
+            this.model.effectiveDate = this.exactDate ?
+                (effectiveDate ? new Date(effectiveDate) : new Date()) :
+                (Ext.Date.getFirstDateOfMonth(effectiveDate ? new Date(effectiveDate) : new Date()));
+            this.model.characteristicType = characteristicType;
+
+            this.setDate(effectiveDate);
+            this.load();
+        };
+        return obj;
+    },
+});

package/src/common/component/editor/HistoryTypedCharacteristicEditor.js

@@ -1,240 +1,240 @@
-/**
- * Редактор характеристик с функциональностью редактирования по типам
- */
-Ext.define('Coon.common.component.editor.HistoryTypedCharacteristicEditor', {
-    extend: 'Coon.common.component.editor.TypedCharacteristicEditor',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.editor.HistoryTypedCharacteristicEditor'
-    ],
-    alias: 'widget.HistoryTypedCharacteristicEditor',
-    config: {
-        enableHistoryPanel: true,
-        calenderHidden: false,
-        dateWidth: 90,
-        calendarFormat: 'F Y',
-        useHistoryPanelWithDeletedChars: false,
-        showDateColumn: true,
-    },
-
-    initComponent: function() {
-        this.historyButton = new Ext.Button({
-            text: this.useHistoryPanelWithDeletedChars ? 'История' : 'Вся история',
-            iconCls: 'x-ccb-btn-hist',
-            handler: function() {
-                this.openHistory();
-            }.bind(this),
-            hidden: !this.enableHistoryPanel,
-        });
-
-        this.historyCharButton = new Ext.Button({
-            text: 'История',
-            iconCls: 'x-ccb-btn-hist',
-            handler: function() {
-                this.openCharHistory();
-            }.bind(this),
-            hidden: !this.enableHistoryPanel || this.useHistoryPanelWithDeletedChars,
-            disabled: true,
-        });
-
-        this.historyAuditButton = new Ext.Button({
-            text: 'Аудит',
-            iconCls: 'x-ccb-btn-hist',
-            handler: function() {
-                this.openHistoryUserAudit();
-            }.bind(this),
-            hidden: !this.enableHistoryPanel || !this.useHistoryPanelWithDeletedChars,
-        });
-
-        this.calendar = Ext.create({
-            xtype: 'datefield',
-            allowBlank: false,
-            margin: 10,
-            hidden: this.calenderHidden,
-            format: this.calendarFormat,
-        });
-
-        this.calendar.on('validate', this.validateDateHandler, this);
-        this.calendar.on('select', this.changeCalendarHandler, this);
-
-        this.tbarItems = [
-            this.calendar,
-            this.historyButton,
-            this.historyCharButton,
-            this.historyAuditButton
-        ];
-
-        this.callParent();
-    },
-
-    createColumns: function() {
-        const columns = this.callParent();
-
-        const actions = !this.readOnly && columns.items.pop();
-
-        if (this.showDateColumn) {
-            columns.items.push(this.createCMEffectiveDate());
-        }
-
-        if (!this.readOnly) {
-            columns.items.push(actions);
-        }
-        return columns;
-    },
-
-    createCMEffectiveDate: function() {
-        const ns = Coon.report.model.CharacteristicBeanFields;
-
-        return {
-            xtype: 'hintDateColumn',
-            header: 'Дата начала',
-            tdCls: 'effective-at-column',
-            width: this.dateWidth,
-            dataIndex: ns.$effectiveDate,
-            sortable: true,
-        };
-    },
-
-    setDate: function(date) {
-        this.callParent();
-        this.calendar.setValue(date);
-    },
-
-    changeDate: function(date) {
-        if (!date) {
-            date = new Date().getFirstDateOfMonth();
-        }
-
-        this.setDate(date);
-        this.changeCalendarHandler();
-    },
-
-    changeCalendarHandler: function() {
-        const date = this.calendar.getValue();
-        if (date) {
-            this.effectiveDate = Ext.util.Format.date(date, Coon.format.dateInternal);
-            this.fireEvent('changeDate', this, date);
-        }
-    },
-
-    validateDateHandler: function(calendar, date) {
-        if ((this.minDate && this.minDate > date) || (this.maxDate && this.maxDate < date)) {
-            return false;
-        }
-    },
-
-    setDateRestrictions: function(minDate, maxDate) {
-        if (minDate && !(minDate instanceof Date)) {
-            minDate = new Date(minDate);
-        }
-        if (maxDate && !(maxDate instanceof Date)) {
-            maxDate = new Date(maxDate);
-        }
-        this.minDate = minDate;
-        this.maxDate = maxDate;
-        this.calendar.setMinValue(this.minDate);
-        this.calendar.setMaxValue(this.maxDate);
-    },
-
-    getHistoryWindow: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanel');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'Вся история',
-            maximized: true,
-            maximizable: false,
-        });
-
-        return this.historyWindow;
-    },
-
-    getHistoryWindowWithDeletedChars: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelWithDeletedChars');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'Вся история',
-            maximized: true,
-            maximizable: false,
-        });
-
-        return this.historyWindow;
-    },
-
-    getHistoryAuditWindow: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelAudit');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'История характеристик',
-            maximized: true,
-        });
-
-        return this.historyWindow;
-    },
-
-    getUserAuditWindow: function() {
-        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryUserAudit');
-        this.historyWindow = Ext.widget('WindowWrap', {
-            items: panel,
-            title: 'Аудит',
-            maximized: true,
-        });
-
-        return this.historyWindow;
-    },
-
-    openHistory: function() {
-        const date = this.calendar.getValue();
-        if (date) {
-            if (this.useHistoryPanelWithDeletedChars) {
-                const ns = Coon.report.model.CharacteristicBeanFields;
-                const charTypeCd = this.getSelected() && this.getSelected().get(ns.$type);
-                const win = this.getHistoryWindowWithDeletedChars();
-                win.show();
-                win.content.doInit(
-                    this.model.ID,
-                    this.model.subentityId,
-                    this.model.characteristicEntity,
-                    charTypeCd,
-                    date
-                );
-            } else {
-                const win = this.getHistoryWindow();
-                win.show();
-                win.content.doInit(
-                    this.model.ID,
-                    this.model.subentityId,
-                    this.model.characteristicEntity,
-                    date
-                );
-            }
-        }
-    },
-
-    openCharHistory: function() {
-        const date = this.calendar.getValue();
-        const ns = Coon.report.model.CharacteristicBeanFields;
-        const charTypeCd = this.getSelected().get(ns.$type);
-        if (date && charTypeCd) {
-            const win = this.getHistoryAuditWindow();
-            win.show();
-            win.content.doInit(
-                this.model.ID,
-                this.model.subentityId,
-                this.model.characteristicEntity,
-                charTypeCd,
-                date
-            );
-        }
-    },
-
-    openHistoryUserAudit: function() {
-        if (this.useHistoryPanelWithDeletedChars) {
-            const win = this.getUserAuditWindow();
-            win.show();
-            win.content.doInit(
-                this.model.ID,
-                this.model.subentityId,
-                this.model.characteristicEntity
-            );
-        }
-    },
-});
+/**
+ * Редактор характеристик с функциональностью редактирования по типам
+ */
+Ext.define('Coon.common.component.editor.HistoryTypedCharacteristicEditor', {
+    extend: 'Coon.common.component.editor.TypedCharacteristicEditor',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.editor.HistoryTypedCharacteristicEditor'
+    ],
+    alias: 'widget.HistoryTypedCharacteristicEditor',
+    config: {
+        enableHistoryPanel: true,
+        calenderHidden: false,
+        dateWidth: 90,
+        calendarFormat: 'F Y',
+        useHistoryPanelWithDeletedChars: false,
+        showDateColumn: true,
+    },
+
+    initComponent: function() {
+        this.historyButton = new Ext.Button({
+            text: this.useHistoryPanelWithDeletedChars ? 'История' : 'Вся история',
+            iconCls: 'x-ccb-btn-hist',
+            handler: function() {
+                this.openHistory();
+            }.bind(this),
+            hidden: !this.enableHistoryPanel,
+        });
+
+        this.historyCharButton = new Ext.Button({
+            text: 'История',
+            iconCls: 'x-ccb-btn-hist',
+            handler: function() {
+                this.openCharHistory();
+            }.bind(this),
+            hidden: !this.enableHistoryPanel || this.useHistoryPanelWithDeletedChars,
+            disabled: true,
+        });
+
+        this.historyAuditButton = new Ext.Button({
+            text: 'Аудит',
+            iconCls: 'x-ccb-btn-hist',
+            handler: function() {
+                this.openHistoryUserAudit();
+            }.bind(this),
+            hidden: !this.enableHistoryPanel || !this.useHistoryPanelWithDeletedChars,
+        });
+
+        this.calendar = Ext.create({
+            xtype: 'datefield',
+            allowBlank: false,
+            margin: 10,
+            hidden: this.calenderHidden,
+            format: this.calendarFormat,
+        });
+
+        this.calendar.on('validate', this.validateDateHandler, this);
+        this.calendar.on('select', this.changeCalendarHandler, this);
+
+        this.tbarItems = [
+            this.calendar,
+            this.historyButton,
+            this.historyCharButton,
+            this.historyAuditButton
+        ];
+
+        this.callParent();
+    },
+
+    createColumns: function() {
+        const columns = this.callParent();
+
+        const actions = !this.readOnly && columns.items.pop();
+
+        if (this.showDateColumn) {
+            columns.items.push(this.createCMEffectiveDate());
+        }
+
+        if (!this.readOnly) {
+            columns.items.push(actions);
+        }
+        return columns;
+    },
+
+    createCMEffectiveDate: function() {
+        const ns = Coon.report.model.CharacteristicBeanFields;
+
+        return {
+            xtype: 'hintDateColumn',
+            header: 'Дата начала',
+            tdCls: 'effective-at-column',
+            width: this.dateWidth,
+            dataIndex: ns.$effectiveDate,
+            sortable: true,
+        };
+    },
+
+    setDate: function(date) {
+        this.callParent();
+        this.calendar.setValue(date);
+    },
+
+    changeDate: function(date) {
+        if (!date) {
+            date = new Date().getFirstDateOfMonth();
+        }
+
+        this.setDate(date);
+        this.changeCalendarHandler();
+    },
+
+    changeCalendarHandler: function() {
+        const date = this.calendar.getValue();
+        if (date) {
+            this.effectiveDate = Ext.util.Format.date(date, Coon.format.dateInternal);
+            this.fireEvent('changeDate', this, date);
+        }
+    },
+
+    validateDateHandler: function(calendar, date) {
+        if ((this.minDate && this.minDate > date) || (this.maxDate && this.maxDate < date)) {
+            return false;
+        }
+    },
+
+    setDateRestrictions: function(minDate, maxDate) {
+        if (minDate && !(minDate instanceof Date)) {
+            minDate = new Date(minDate);
+        }
+        if (maxDate && !(maxDate instanceof Date)) {
+            maxDate = new Date(maxDate);
+        }
+        this.minDate = minDate;
+        this.maxDate = maxDate;
+        this.calendar.setMinValue(this.minDate);
+        this.calendar.setMaxValue(this.maxDate);
+    },
+
+    getHistoryWindow: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanel');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'Вся история',
+            maximized: true,
+            maximizable: false,
+        });
+
+        return this.historyWindow;
+    },
+
+    getHistoryWindowWithDeletedChars: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelWithDeletedChars');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'Вся история',
+            maximized: true,
+            maximizable: false,
+        });
+
+        return this.historyWindow;
+    },
+
+    getHistoryAuditWindow: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryPanelAudit');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'История характеристик',
+            maximized: true,
+        });
+
+        return this.historyWindow;
+    },
+
+    getUserAuditWindow: function() {
+        const panel = Ext.create('Coon.common.component.editor.CharacteristicHistoryUserAudit');
+        this.historyWindow = Ext.widget('WindowWrap', {
+            items: panel,
+            title: 'Аудит',
+            maximized: true,
+        });
+
+        return this.historyWindow;
+    },
+
+    openHistory: function() {
+        const date = this.calendar.getValue();
+        if (date) {
+            if (this.useHistoryPanelWithDeletedChars) {
+                const ns = Coon.report.model.CharacteristicBeanFields;
+                const charTypeCd = this.getSelected() && this.getSelected().get(ns.$type);
+                const win = this.getHistoryWindowWithDeletedChars();
+                win.show();
+                win.content.doInit(
+                    this.model.ID,
+                    this.model.subentityId,
+                    this.model.characteristicEntity,
+                    charTypeCd,
+                    date
+                );
+            } else {
+                const win = this.getHistoryWindow();
+                win.show();
+                win.content.doInit(
+                    this.model.ID,
+                    this.model.subentityId,
+                    this.model.characteristicEntity,
+                    date
+                );
+            }
+        }
+    },
+
+    openCharHistory: function() {
+        const date = this.calendar.getValue();
+        const ns = Coon.report.model.CharacteristicBeanFields;
+        const charTypeCd = this.getSelected().get(ns.$type);
+        if (date && charTypeCd) {
+            const win = this.getHistoryAuditWindow();
+            win.show();
+            win.content.doInit(
+                this.model.ID,
+                this.model.subentityId,
+                this.model.characteristicEntity,
+                charTypeCd,
+                date
+            );
+        }
+    },
+
+    openHistoryUserAudit: function() {
+        if (this.useHistoryPanelWithDeletedChars) {
+            const win = this.getUserAuditWindow();
+            win.show();
+            win.content.doInit(
+                this.model.ID,
+                this.model.subentityId,
+                this.model.characteristicEntity
+            );
+        }
+    },
+});

package/src/common/component/editor/TypedCharacteristicEditor.scss

@@ -1,7 +1,7 @@
-.TypedCharacteristicEditor {
-    @include CharacteristicGridEditor();
-    .x-btn-icon-left > .x-btn-icon-el-default-toolbar-small,
-    .x-btn-icon-right > .x-btn-icon-el-default-toolbar-small {
-    width: 24px !important;
-    }
-}
+.TypedCharacteristicEditor {
+    @include CharacteristicGridEditor();
+    .x-btn-icon-left > .x-btn-icon-el-default-toolbar-small,
+    .x-btn-icon-right > .x-btn-icon-el-default-toolbar-small {
+    width: 24px !important;
+    }
+}