ru.coon 2.5.67 → 2.6.0

package/src/common/component/YearPanel.js

@@ -1,76 +1,76 @@
-Ext.define('Coon.common.component.YearView', {
-    extend: 'Ext.Panel',
-    alternateClassName: [
-        'SigmaUtilities.view.common.component.YearView'
-    ],
-    allowBlank: false,
-    layout: 'hbox',
-
-    initComponent: function() {
-        const year = new Date().getFullYear();
-        const yearData = [];
-        let yearCur = year + 2;
-        const minYear = 1990;
-        do {
-            yearCur--;
-            yearData.push([yearCur, yearCur]);
-        } while (yearCur > minYear);
-
-        const yearStore = new Ext.data.ArrayStore({
-            fields: ['id', 'name'],
-            data: yearData,
-        });
-
-        this.yearSelector = new Ext.form.ComboBox({
-            flex: 1,
-            store: yearStore,
-            displayField: 'name',
-            valueField: 'id',
-            typeAhead: true,
-            mode: 'local',
-            triggerAction: 'all',
-            selectOnFocus: true,
-            getState: function() {
-                return {value: this.getValue()};
-            },
-            applyState: function(state) {
-                if (Ext.isEmpty(state) || Ext.isEmpty(state.value)) {
-                    this.setValue(new Date().getFullYear());
-                } else {
-                    this.setValue(state.value);
-                }
-            },
-            allowBlank: this.allowBlank,
-        });
-
-        this.items = [
-            this.yearSelector
-        ];
-
-        this.callParent();
-    },
-
-    doInit: function(startYear) {
-        this.setValue(startYear);
-    },
-
-    clear: function() {
-        Coon.Function.clearAllFieldsOnForm(this);
-    },
-
-    validate: function() {
-        return Coon.Function.validateAllFieldsOnForm(this);
-    },
-
-    setValue: function(startYear) {
-        if (startYear) {
-            this.yearSelector.setValue(startYear);
-        } else {
-            this.clear();
-        }
-    },
-
-    getValue: function() {
-        return this.yearSelector.getValue();
-    },
-});
+Ext.define('Coon.common.component.YearView', {
+    extend: 'Ext.Panel',
+    alternateClassName: [
+        'SigmaUtilities.view.common.component.YearView'
+    ],
+    allowBlank: false,
+    layout: 'hbox',
+
+    initComponent: function() {
+        const year = new Date().getFullYear();
+        const yearData = [];
+        let yearCur = year + 2;
+        const minYear = 1990;
+        do {
+            yearCur--;
+            yearData.push([yearCur, yearCur]);
+        } while (yearCur > minYear);
+
+        const yearStore = new Ext.data.ArrayStore({
+            fields: ['id', 'name'],
+            data: yearData,
+        });
+
+        this.yearSelector = new Ext.form.ComboBox({
+            flex: 1,
+            store: yearStore,
+            displayField: 'name',
+            valueField: 'id',
+            typeAhead: true,
+            mode: 'local',
+            triggerAction: 'all',
+            selectOnFocus: true,
+            getState: function() {
+                return {value: this.getValue()};
+            },
+            applyState: function(state) {
+                if (Ext.isEmpty(state) || Ext.isEmpty(state.value)) {
+                    this.setValue(new Date().getFullYear());
+                } else {
+                    this.setValue(state.value);
+                }
+            },
+            allowBlank: this.allowBlank,
+        });
+
+        this.items = [
+            this.yearSelector
+        ];
+
+        this.callParent();
+    },
+
+    doInit: function(startYear) {
+        this.setValue(startYear);
+    },
+
+    clear: function() {
+        Coon.Function.clearAllFieldsOnForm(this);
+    },
+
+    validate: function() {
+        return Coon.Function.validateAllFieldsOnForm(this);
+    },
+
+    setValue: function(startYear) {
+        if (startYear) {
+            this.yearSelector.setValue(startYear);
+        } else {
+            this.clear();
+        }
+    },
+
+    getValue: function() {
+        return this.yearSelector.getValue();
+    },
+});

package/src/common/component/characteristic/CharacteristicPanel.js

@@ -7,6 +7,7 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanel', {
             entity: null,
             isNew: false,
             groups: null,
+            title: 'Редактирование сущности',
         },
         stores: {
             characteristicEntityStore: {
@@ -15,6 +16,9 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanel', {
             },
         },
     },
+    bind: {
+        title: '{title}',
+    },
     layout: {
         type: 'vbox',
         align: 'stretch',
@@ -36,91 +40,107 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanel', {
             reference: 'entityForm',
             bodyPadding: 5,
             layout: 'anchor',
-            defaults: {
-                anchor: '100%',
-                xtype: 'container',
-                layout: 'column',
-                defaults: {
-                    columnWidth: 0.33,
-                    xtype: 'textfield',
-                    margin: '0 0 0 15px',
-                },
-            },
             items: [
                 {
-                    items: [
-                        {
-                            fieldLabel: 'Код',
-                            name: 'entity',
-                            reference: 'entityField',
-                            margin: 0,
-                            allowBlank: false,
-                            bind: {
-                                disabled: '{!isNew}',
-                            },
+                    anchor: '100%',
+                    bind: {
+                        collapsed: '{!!entity}',
+                        title: 'Данные сущности {entity}',
+                    },
+                    defaults: {
+                        xtype: 'container',
+                        flex: 1,
+                        layout: 'column',
+                        defaults: {
+                            columnWidth: 0.33,
+                            xtype: 'textfield',
+                            margin: '0 0 0 15px',
                         },
-                        {
-                            xtype: 'combo',
-                            reference: 'characteristicEntityCombo',
-                            fieldLabel: 'Класс сущности',
-                            name: 'characteristicEntity',
-                            allowBlank: false,
-                            queryMode: 'local',
-                            displayField: 'description',
-                            valueField: 'value',
-                            bind: {
-                                store: '{characteristicEntityStore}',
-                            },
-                        },
-                        {
-                            fieldLabel: 'Тип сущности',
-                            name: 'entityType',
-                        }
-                    ],
-                },
-                {
+                    },
+                    xtype: 'fieldset',
+                    collapsible: true,
+                    layout: {
+                        type: 'vbox',
+                        align: 'stretch',
+                    },
                     items: [
                         {
-                            fieldLabel: 'Тип сущности 2-го порядка',
-                            margin: 0,
-                            name: 'entityType2',
+                            items: [
+                                {
+                                    fieldLabel: 'Код',
+                                    name: 'entity',
+                                    reference: 'entityField',
+                                    margin: 0,
+                                    allowBlank: false,
+                                    bind: {
+                                        disabled: '{!isNew}',
+                                    },
+                                },
+                                {
+                                    xtype: 'combo',
+                                    reference: 'characteristicEntityCombo',
+                                    fieldLabel: 'Класс сущности',
+                                    name: 'characteristicEntity',
+                                    allowBlank: false,
+                                    queryMode: 'local',
+                                    displayField: 'description',
+                                    valueField: 'value',
+                                    bind: {
+                                        store: '{characteristicEntityStore}',
+                                    },
+                                },
+                                {
+                                    fieldLabel: 'Тип сущности',
+                                    name: 'entityType',
+                                }
+                            ],
                         },
                         {
-                            fieldLabel: 'Тип сущности 3-го порядка',
-                            name: 'entityType3',
+                            items: [
+                                {
+                                    fieldLabel: 'Тип сущности 2-го порядка',
+                                    margin: 0,
+                                    name: 'entityType2',
+                                },
+                                {
+                                    fieldLabel: 'Тип сущности 3-го порядка',
+                                    name: 'entityType3',
+                                },
+                                {
+                                    fieldLabel: 'Тип сущности 4-го порядка',
+                                    name: 'entityType4',
+                                }
+                            ],
                         },
                         {
-                            fieldLabel: 'Тип сущности 4-го порядка',
-                            name: 'entityType4',
-                        }
-                    ],
-                },
-                {
-                    items: [
-                        {
-                            fieldLabel: 'Тип сущности 5-го порядка',
-                            name: 'entityType5',
-                            margin: 0,
-                        },
-                        {
-                            fieldLabel: 'entryPoint',
-                            name: 'cmEntryPoint',
+                            items: [
+                                {
+                                    fieldLabel: 'Тип сущности 5-го порядка',
+                                    name: 'entityType5',
+                                    margin: 0,
+                                },
+                                {
+                                    fieldLabel: 'entryPoint',
+                                    name: 'cmEntryPoint',
+                                },
+                                {
+                                    fieldLabel: 'Описание',
+                                    name: 'description',
+                                    allowBlank: false,
+                                }
+                            ],
                         },
                         {
-                            fieldLabel: 'Описание',
-                            name: 'description',
-                            allowBlank: false,
+                            boxLabel: 'Отображать только эффективные значения для предопределенных характеристик',
+                            xtype: 'checkbox',
+                            name: 'isEffective',
+                            labelWidth: 500,
+                            labelTextAlign: 'right',
+                            boxLabelAlign: 'after',
                         }
                     ],
-                },
-                {
-                    boxLabel: 'Отображать только эффективные значения для предопределенных характеристик',
-                    xtype: 'checkbox',
-                    name: 'isEffective',
-                    labelWidth: 500,
-                    labelTextAlign: 'right',
-                    boxLabelAlign: 'after',
                 }
+
             ],
         },
         {

package/src/common/component/characteristic/CharacteristicPanelController.js

@@ -13,14 +13,19 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanelControlle
 
     doInitForm: function(entity) {
         const vm = this.getViewModel();
-        vm.set('entity', entity || null);
+        entity = entity || vm.get('entity') || null;
+        vm.set('entity', entity);
         vm.set('isNew', !vm.get('entity'));
         if (entity) {
+            vm.set('title', 'Редактирование сущности ' + entity);
             this.lookup('characteristicAlgorithmList').doInit(entity);
             this.lookup('characteristicEditor').doInit(entity, 'SUBENTITY');
             this.load();
+        } else {
+            vm.set('title', 'Добавление новой сущности ');
         }
         this.initCharacteristicEntityStore();
+        this.lookup('entityForm').isValid();
     },
 
     doInitFormGroupReload: function(entity) {
@@ -65,9 +70,12 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanelControlle
             const isNew = this.getViewModel().get('isNew');
             data.isNew = isNew;
             this.getView().mask('Сохранение');
-            const command = Ext.create('Iswe.command.IsweSaveEntity');
-            command.on('complete', function() {
-                this.getView().unmask();
+            const me = this;
+            Coon.util.promisifyCmd(
+                'Iswe.command.IsweSaveEntity',
+                data
+            ).then(() => {
+                me.getView().unmask();
                 if (isNew) {
                     this.getViewModel().set('isNew', false);
                     this.doInitForm(data['entity']);
@@ -76,8 +84,15 @@ Ext.define('Coon.uielement.component.characteristic.CharacteristicPanelControlle
                     this.lookup('characteristicEditor').save();
                     this.lookup('characteristicAlgorithmList').save();
                 }
-            }, this);
-            command.execute(data);
+            }).catch((error) => {
+                me.getView().unmask();
+                Ext.Msg.show({
+                    title: 'Ошибка',
+                    message: error.responceText,
+                    icon: Ext.Msg.ERROR,
+                    buttons: Ext.Msg.OK,
+                });
+            });
         }
     },
     validate: function() {

package/src/common/component/characteristic/characteristicAlgorithm/AlgorithmChainEditWindow.js

@@ -42,48 +42,41 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
         {
             xtype: 'form',
             reference: 'formPanel',
-            bodyPadding: 5,
-            layout: 'anchor',
+            bodyPadding: 10,
+            layout: 'column',
             defaults: {
-                anchor: '100%',
-                xtype: 'fieldset',
-                layout: 'column',
-                title: 'Данные цепочки алгоритмов',
-                defaults: {
-                    columnWidth: 0.5,
-                    allowBlank: false,
-                    xtype: 'textfield',
-                    margin: '0 0 0 15px',
-                },
+                columnWidth: 0.5,
+                allowBlank: false,
+                xtype: 'textfield',
+                margin: '0 0 0 15px',
             },
-            items: [{
-                items: [
-                    {
-                        fieldLabel: 'Код',
-                        name: 'AlgorithmChain',
-                        margin: 0,
-                        bind: {
-                            disabled: '{!isNew}',
-                        },
+            items: [
+                {
+                    fieldLabel: 'Код',
+                    name: 'AlgorithmChain',
+                    margin: 0,
+                    bind: {
+                        disabled: '{!isNew}',
                     },
-                    {
-                        fieldLabel: 'Наименование',
-                        name: 'description',
-                    }
-                ],
-            }],
+                },
+                {
+                    fieldLabel: 'Наименование',
+                    name: 'description',
+                }
+            ],
         },
         {
             xtype: 'panel',
+            margin: '10px 0 0 0',
             flex: 1,
             layout: {
-                type: 'hbox',
-                align: 'stretch',
+                type: 'border',
             },
             items: [
                 {
                     reference: 'algorithmChainBindList',
                     flex: 2,
+                    region: 'center',
                     xtype: 'AlgorithmChainBindList',
                     listeners: {
                         beforeselect: 'onBeforeSelectAlgorithmChainBindList',
@@ -93,6 +86,8 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
                     xtype: 'AlgorithmChainBindDependencyList',
                     reference: 'algorithmChainBindDependencyList',
                     flex: 1,
+                    split: true,
+                    region: 'east',
                     bind: {
                         disabled: '{!record}',
                     },

package/src/common/component/characteristic/characteristicAlgorithm/AlgorithmChainSearchWindow.js

@@ -1,7 +1,7 @@
 Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.AlgorithmChainSearchWindow', {
     extend: 'Ext.window.Window',
     xtype: 'AlgorithmChainSearchWindow',
-    width: '80%',
+    width: 800,
     closeAction: 'hide',
     modal: true,
     title: 'Поиск цепочки алгоритмов',
@@ -124,6 +124,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
                             columnWidth: 0.12,
                             margin: '15px 0 0 10px',
                             text: 'Поиск',
+                            ui: 'orange-button',
                             handler: 'searchHandler',
                         }
                     ],
@@ -176,6 +177,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Algo
                     },
                     {
                         header: 'Название',
+                        flex: 1,
                         dataIndex: 'description',
                         xtype: 'hintColumn',
                     }

package/src/common/component/characteristic/characteristicAlgorithm/CharacteristicAlgorithmList.js

@@ -14,6 +14,14 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
                 }
                 return false;
             },
+            selectionChange: function(get) {
+                const rec = get('record');
+                if (rec) {
+                    this.set('buttonText', rec.get('isDeleted') ? 'Восстановить': 'Удалить');
+                } else {
+                    this.set('buttonText', 'Удалить');
+                }
+            },
         },
         stores: {
             mainStore: {
@@ -26,6 +34,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
             },
         },
         data: {
+            buttonText: 'Удалить',
             record: null,
         },
     },
@@ -54,10 +63,10 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
                 },
             },
             {
-                text: 'Удалить',
                 handler: 'deleteHandler',
                 bind: {
                     disabled: '{!record}',
+                    text: '{buttonText}',
                 },
             }
         ],
@@ -66,7 +75,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
         {
             header: 'Тип элемента',
             flex: 1,
-            dataIndex: 'AlgorithmChain',
+            dataIndex: 'AlgoritmChain',
             renderer: function(value) {
                 return value ? 'Цепочка' : 'Алгоритм';
             },
@@ -74,9 +83,9 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
         {
             header: 'Идентификатор',
             flex: 1,
-            dataIndex: 'AlgorithmChain',
+            dataIndex: 'algoritmChain',
             renderer: function(value, meta, record) {
-                return value ? value : record.get('AlgorithmID');
+                return value ? value : record.get('AlgoritmID');
             },
         },
         {

package/src/common/component/characteristic/characteristicAlgorithm/CharacteristicAlgorithmListController.js

@@ -19,7 +19,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
     load: function() {
         const command = Ext.create('Iswe.command.IsweGetAlgorithmChainBind');
         command.on('complete', function(data) {
-            this.getViewModel().getStore('mainStore').loadData(data['algorithmChainList'] || []);
+            this.getViewModel().getStore('mainStore').loadData(data['algoritmChainList'] || []);
         }, this);
         command.execute(this.subentity);
     },
@@ -78,13 +78,18 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
     },
 
     deleteHandler: function() {
-        const record = this.getViewModel().get('record');
+        const vm = this.getViewModel();
+        const record = vm.get('record');
         if (record) {
             if (record.isNew) {
                 this.getViewModel().getStore('mainStore').remove(record);
+                vm.set('buttonText', 'Удалить');
             } else {
                 record.set('isDeleted', !record.get('isDeleted'));
+                vm.set('buttonText', record.get('isDeleted') ? 'Восстановить': 'Удалить');
             }
+        } else {
+            vm.set('buttonText', 'Удалить');
         }
     },
 
@@ -111,7 +116,7 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
                     this.getView().unmask();
                 }
                 this.getView().fireEvent('save', this);
-                this.getViewModel().getStore('mainStore').loadData(response['algorithmChainList'] || []);
+                this.getViewModel().getStore('mainStore').loadData(response['algoritmChainList'] || []);
             }, this);
             command.execute(this.subentity, Ext.encode(this.getData()));
         }

package/src/common/component/characteristic/characteristicAlgorithm/CharacteristicAlgorithmSearchWindow.js

@@ -1,11 +1,12 @@
 Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.CharacteristicAlgorithmSearchWindow', {
     extend: 'Ext.window.Window',
     xtype: 'CharacteristicAlgorithmSearchWindow',
-    width: '80%',
+    width: 600,
     closeAction: 'hide',
     title: 'Поиск алгоритма',
     modal: true,
     height: '80%',
+    layout: 'fit',
     controller: {
         choose: function() {
             this.getView().fireEvent('choose', this.getViewModel().get('record'));
@@ -47,12 +48,11 @@ Ext.define('Coon.uielement.component.characteristic.characteristicAlgorithm.Char
         {
             xtype: 'ReportPanel',
             reference: 'algReport',
-            flex: 1,
             reportId: 'ISWE_ALG_SEARCH',
             scrollable: true,
-            hideFilterPanel: false,
+            hideFilterPanel: true,
             header: false,
-            autoFilter: false,
+            autoFilter: true,
             listeners: {
                 configured: 'onConfigured',
             },