ru.coon 2.5.34 → 2.5.35

package/src/report/component/reportpanel/FilterPanelLegend.scss

@@ -1,23 +1,23 @@
-.FilterPanelLegend {
-    $required-flag-color: dynamic(#bf1313);
-    $required-text-color: dynamic(#878ea2);
-    font-size: 12px;
-    margin: 5px;
-    .required-flag {
-        font-size: 18px;
-        color: $required-flag-color;
-    }
-    .required-text {
-        color: $required-text-color !important;
-        .info-icon {
-            font-size: 14px;
-        }
-    }
-    .blink_me {
-        animation: blinker 200ms linear infinite;
-    }
-}
-
-@keyframes blinker {
-    50% { opacity: 0; }
-}
+.FilterPanelLegend {
+    $required-flag-color: dynamic(#bf1313);
+    $required-text-color: dynamic(#878ea2);
+    font-size: 12px;
+    margin: 5px;
+    .required-flag {
+        font-size: 18px;
+        color: $required-flag-color;
+    }
+    .required-text {
+        color: $required-text-color !important;
+        .info-icon {
+            font-size: 14px;
+        }
+    }
+    .blink_me {
+        animation: blinker 200ms linear infinite;
+    }
+}
+
+@keyframes blinker {
+    50% { opacity: 0; }
+}

package/src/report/component/reportpanel/ReportGrid.scss

@@ -1,19 +1,19 @@
-.ReportGrid {
-  .x-grid-header-ct {
-
-    .x-column-header-group {
-      border-right: 1px solid $panel-header-background-color !important;
-    }
-
-    .x-group-header {
-      .x-column-header-group-item {
-        border-top: 1px solid $panel-header-background-color !important;
-        border-right: 1px solid $panel-header-background-color;
-      }
-
-      .x-column-header-sub-group {
-        border-top: 1px solid $panel-header-background-color;
-      }
-    }
-  }
-}
+.ReportGrid {
+  .x-grid-header-ct {
+
+    .x-column-header-group {
+      border-right: 1px solid $panel-header-background-color !important;
+    }
+
+    .x-group-header {
+      .x-column-header-group-item {
+        border-top: 1px solid $panel-header-background-color !important;
+        border-right: 1px solid $panel-header-background-color;
+      }
+
+      .x-column-header-sub-group {
+        border-top: 1px solid $panel-header-background-color;
+      }
+    }
+  }
+}

package/src/report/component/reportpanel/ReportStore.js

@@ -1,55 +1,55 @@
-Ext.define('Coon.report.component.reportpanel.ReportStore', {
-    extend: 'Ext.data.Store',
-    alias: 'store.ReportStore',
-    xtype: 'reportstore',
-    alternateClassName: [
-        'Coon.report.component.ReportStore'
-    ],
-    uses: [],
-    requires: ['Ext.data.Store'],
-    fields: undefined,
-    groupField: undefined,
-    sorters: undefined,
-    proxy: {
-        type: 'ajax',
-        $configStrict: false,
-        getMethod: function() {
-            return 'POST';
-        },
-        getHeaders: function() {
-            return {'X-CSRF-Token': localStorage.getItem('CSRFToken')};
-        },
-        url: 'ReportFormData/get',
-        reader: {
-            type: 'json',
-            rootProperty: 'list',
-            totalProperty: 'totalCount',
-        },
-        timeout: Coon.SystemProperties.getAsInteger('REPORT_DATA_WAIT_TIMEOUT', 2 * 60 * 1000),
-    },
-    pageSize: 0,
-    autoLoad: false,
-
-    loadWithReportParams: function(loadStoreObject) {
-        if (loadStoreObject && loadStoreObject.params) {
-            const storeParam = [];
-            const paramList = loadStoreObject.params.parameterList;
-            if (Ext.isObject(paramList)) {
-                for (const param in paramList) {
-                    if (paramList.hasOwnProperty(param)) {
-                        storeParam.push({
-                            type: param,
-                            value: paramList[param],
-                        });
-                    }
-                }
-                loadStoreObject.params.parameterList = Ext.encode(storeParam);
-            } else if (Ext.isArray(paramList)) {
-                loadStoreObject.params.parameterList = Ext.encode(loadStoreObject.params.parameterList);
-            } else if (!Ext.isString(paramList)) {
-                loadStoreObject.params.parameterList = Ext.encode(storeParam);
-            }
-        }
-        return this.load(loadStoreObject);
-    },
-});
+Ext.define('Coon.report.component.reportpanel.ReportStore', {
+    extend: 'Ext.data.Store',
+    alias: 'store.ReportStore',
+    xtype: 'reportstore',
+    alternateClassName: [
+        'Coon.report.component.ReportStore'
+    ],
+    uses: [],
+    requires: ['Ext.data.Store'],
+    fields: undefined,
+    groupField: undefined,
+    sorters: undefined,
+    proxy: {
+        type: 'ajax',
+        $configStrict: false,
+        getMethod: function() {
+            return 'POST';
+        },
+        getHeaders: function() {
+            return {'X-CSRF-Token': localStorage.getItem('CSRFToken')};
+        },
+        url: 'ReportFormData/get',
+        reader: {
+            type: 'json',
+            rootProperty: 'list',
+            totalProperty: 'totalCount',
+        },
+        timeout: Coon.SystemProperties.getAsInteger('REPORT_DATA_WAIT_TIMEOUT', 2 * 60 * 1000),
+    },
+    pageSize: 0,
+    autoLoad: false,
+
+    loadWithReportParams: function(loadStoreObject) {
+        if (loadStoreObject && loadStoreObject.params) {
+            const storeParam = [];
+            const paramList = loadStoreObject.params.parameterList;
+            if (Ext.isObject(paramList)) {
+                for (const param in paramList) {
+                    if (paramList.hasOwnProperty(param)) {
+                        storeParam.push({
+                            type: param,
+                            value: paramList[param],
+                        });
+                    }
+                }
+                loadStoreObject.params.parameterList = Ext.encode(storeParam);
+            } else if (Ext.isArray(paramList)) {
+                loadStoreObject.params.parameterList = Ext.encode(loadStoreObject.params.parameterList);
+            } else if (!Ext.isString(paramList)) {
+                loadStoreObject.params.parameterList = Ext.encode(storeParam);
+            }
+        }
+        return this.load(loadStoreObject);
+    },
+});

package/src/report/component/reportpanel/ReportTreeStore.js

@@ -1,38 +1,38 @@
-Ext.define('Coon.report.component.reportpanel.ReportTreeStore', {
-    extend: 'Ext.data.TreeStore',
-    alias: 'store.ReportTreeStore',
-    xtype: 'ReportTreeStore',
-    uses: [],
-    alternateClassName: [
-        'Coon.report.component.ReportTreeStore'
-    ],
-    fields: undefined,
-    groupField: undefined,
-    sorters: undefined,
-    filterer: 'bottomup',
-    proxy: {
-        type: 'ajax',
-        $configStrict: false,
-        getMethod: function() {
-            return 'POST';
-        },
-        url: 'ReportFormData/get',
-        reader: {
-            type: 'json',
-            rootProperty: 'list',
-            totalProperty: 'totalCount',
-            successProperty: undefined,
-            transform: 'transformToTree',
-        },
-        timeout: Coon.SystemProperties.getAsInteger('REPORT_DATA_WAIT_TIMEOUT', 2 * 60 * 1000),
-    },
-    pageSize: 0,
-    autoLoad: false,
-    load: function(options) {
-        if (options && options.params) {
-            this.getProxy().setExtraParams(options.params);
-            this.getRoot() && this.getRoot().expand();
-        }
-        this.callParent(arguments);
-    },
-});
+Ext.define('Coon.report.component.reportpanel.ReportTreeStore', {
+    extend: 'Ext.data.TreeStore',
+    alias: 'store.ReportTreeStore',
+    xtype: 'ReportTreeStore',
+    uses: [],
+    alternateClassName: [
+        'Coon.report.component.ReportTreeStore'
+    ],
+    fields: undefined,
+    groupField: undefined,
+    sorters: undefined,
+    filterer: 'bottomup',
+    proxy: {
+        type: 'ajax',
+        $configStrict: false,
+        getMethod: function() {
+            return 'POST';
+        },
+        url: 'ReportFormData/get',
+        reader: {
+            type: 'json',
+            rootProperty: 'list',
+            totalProperty: 'totalCount',
+            successProperty: undefined,
+            transform: 'transformToTree',
+        },
+        timeout: Coon.SystemProperties.getAsInteger('REPORT_DATA_WAIT_TIMEOUT', 2 * 60 * 1000),
+    },
+    pageSize: 0,
+    autoLoad: false,
+    load: function(options) {
+        if (options && options.params) {
+            this.getProxy().setExtraParams(options.params);
+            this.getRoot() && this.getRoot().expand();
+        }
+        this.callParent(arguments);
+    },
+});

package/src/report/component/settings/AddVersioningTab.js

@@ -1,19 +1,19 @@
-Ext.define('Coon.report.component.settings.AddVersioningTab', {
-    extend: 'Ext.Mixin',
-
-    mixinConfig: {
-        before: {
-            init: 'initAction',
-        },
-    },
-
-    initAction: function() {
-        if (this.isEnabled()) {
-            this.getView().add({xtype: 'ReportFormHistoryPanel'});
-        }
-    },
-
-    isEnabled: function() {
-        return Coon.setup.getOption('reportVersioning');
-    },
-});
+Ext.define('Coon.report.component.settings.AddVersioningTab', {
+    extend: 'Ext.Mixin',
+
+    mixinConfig: {
+        before: {
+            init: 'initAction',
+        },
+    },
+
+    initAction: function() {
+        if (this.isEnabled()) {
+            this.getView().add({xtype: 'ReportFormHistoryPanel'});
+        }
+    },
+
+    isEnabled: function() {
+        return Coon.setup.getOption('reportVersioning');
+    },
+});

package/src/report/component/settings/ReportFormEditPanel.scss

@@ -1,87 +1,87 @@
-.ReportFormEditPanel {
-  .highlight-filter-field {
-    .x-form-trigger-wrap-default {
-      background-color: rgba(0, 120, 201, 0.2);
-    }
-  }
-
-  .ReportFormPluginGrid {
-    .x-btn-default-toolbar-small {
-      .svg-icon {
-        background-color: $base-color;
-      }
-    }
-  }
-
-  .deletedRecord {
-    color: darkred;
-    text-decoration: line-through;
-  }
-
-  .readOnlyRecord {
-    .x-grid-td {
-      background-color: #f5f5f5;
-      color: #555;
-    }
-  }
-
-  .readOnlyDeletedRecord {
-    .x-grid-td {
-      color: darkred;
-      text-decoration: line-through;
-      background-color: #f5f5f5;
-    }
-  }
-
-  .x-grid-item {
-    .excluded-record {
-      color: #ff9e9e;
-    }
-
-    .duplicate-record{
-      outline: 1px solid #cb89ff;
-    }
-  }
-
-  .x-panel-body {
-    background-color: white;
-  }
-
-  .textareastyle {
-    margin-top: 10px;
-
-    textarea {
-      padding: 6px;
-    }
-  }
-
-  .x-form-textarea-body {
-    height: inherit;
-  }
-
-  .x-segmented-button {
-    border: 1px solid #3d6780;
-    border-radius: 6px;
-    overflow: hidden;
-
-    .x-segmented-button-item {
-      padding: 6px 8px;
-      background-color: #ffffff;
-      .x-btn-inner {
-        color: #3d6780;
-      }
-
-      &.x-btn-pressed {
-        background-color: #3d6780;
-        .x-btn-inner {
-          color: #ffffff;
-        }
-      }
-    }
-
-    & > *:not(:last-child) {
-      border-right: 1px solid #3d6780;
-    }
-  }
-}
-
+.ReportFormEditPanel {
+  .highlight-filter-field {
+    .x-form-trigger-wrap-default {
+      background-color: rgba(0, 120, 201, 0.2);
+    }
+  }
+
+  .ReportFormPluginGrid {
+    .x-btn-default-toolbar-small {
+      .svg-icon {
+        background-color: $base-color;
+      }
+    }
+  }
+
+  .deletedRecord {
+    color: darkred;
+    text-decoration: line-through;
+  }
+
+  .readOnlyRecord {
+    .x-grid-td {
+      background-color: #f5f5f5;
+      color: #555;
+    }
+  }
+
+  .readOnlyDeletedRecord {
+    .x-grid-td {
+      color: darkred;
+      text-decoration: line-through;
+      background-color: #f5f5f5;
+    }
+  }
+
+  .x-grid-item {
+    .excluded-record {
+      color: #ff9e9e;
+    }
+
+    .duplicate-record{
+      outline: 1px solid #cb89ff;
+    }
+  }
+
+  .x-panel-body {
+    background-color: white;
+  }
+
+  .textareastyle {
+    margin-top: 10px;
+
+    textarea {
+      padding: 6px;
+    }
+  }
+
+  .x-form-textarea-body {
+    height: inherit;
+  }
+
+  .x-segmented-button {
+    border: 1px solid #3d6780;
+    border-radius: 6px;
+    overflow: hidden;
+
+    .x-segmented-button-item {
+      padding: 6px 8px;
+      background-color: #ffffff;
+      .x-btn-inner {
+        color: #3d6780;
+      }
+
+      &.x-btn-pressed {
+        background-color: #3d6780;
+        .x-btn-inner {
+          color: #ffffff;
+        }
+      }
+    }
+
+    & > *:not(:last-child) {
+      border-right: 1px solid #3d6780;
+    }
+  }
+}
+

package/src/report/component/settings/field/ReportFormFieldsGrid.scss

@@ -1,5 +1,5 @@
-.ReportFormFieldsGrid {
-  .x-tree-icon-leaf {
-    color: lightgrey;
-  }
-}
+.ReportFormFieldsGrid {
+  .x-tree-icon-leaf {
+    color: lightgrey;
+  }
+}

package/src/report/component/settings/parameter/ReportFormParameterEditPanel.js

@@ -1,64 +1,64 @@
-Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPanel', {
-    extend: 'Ext.panel.Panel',
-    alias: 'widget.ReportFormParameterEditPanel',
-    alternateClassName: 'Sigma.component.report.settings.ReportFormParameterEditPanel',
-    requires: [
-        'Coon.report.component.settings.ReportFieldPropertiesGrid',
-        'Coon.report.component.settings.parameter.ReportFormParametersGrid'
-    ],
-    controller: 'reportformparametereditpanelcontroller',
-    frame: true,
-    title: 'Параметры',
-    layout: 'border',
-    defaults: {
-        border: false,
-        split: true,
-    },
-    items: [
-        {
-            region: 'center',
-            layout: 'border',
-            items: [
-                {
-                    xtype: 'ReportFormParametersGrid',
-                    region: 'center',
-                    reference: 'parametersGrid',
-                    bind: {
-                        data: '{report.parameters}',
-                    },
-                    listeners: {
-                        'showfilterpanel': 'showFilterPanel',
-                    },
-                },
-                {
-                    xtype: 'ReportPropertiesGrid',
-                    width: 500,
-                    scrollable: true,
-                    split: true,
-                    frame: false,
-                    region: 'east',
-                    reference: 'parameterProperties',
-                    bind: {
-                        enableAddProps: '{enableAddParamProps}',
-                        data: '{parametersGrid.selection.properties}',
-                    },
-                }
-            ],
-        },
-        {
-            xtype: 'panel',
-            title: 'Предпросмотр панели фильтрации отчета',
-            region: 'south',
-            scrollable: true,
-            split: true,
-            height: 400,
-            reference: 'filterPanelContainer',
-            tbar: [{
-                text: 'Обновить',
-                ui: 'blue-text-button-border',
-                handler: 'showFilterPanel',
-            }],
-        }
-    ],
-});
-
+Ext.define('Coon.report.component.settings.parameter.ReportFormParameterEditPanel', {
+    extend: 'Ext.panel.Panel',
+    alias: 'widget.ReportFormParameterEditPanel',
+    alternateClassName: 'Sigma.component.report.settings.ReportFormParameterEditPanel',
+    requires: [
+        'Coon.report.component.settings.ReportFieldPropertiesGrid',
+        'Coon.report.component.settings.parameter.ReportFormParametersGrid'
+    ],
+    controller: 'reportformparametereditpanelcontroller',
+    frame: true,
+    title: 'Параметры',
+    layout: 'border',
+    defaults: {
+        border: false,
+        split: true,
+    },
+    items: [
+        {
+            region: 'center',
+            layout: 'border',
+            items: [
+                {
+                    xtype: 'ReportFormParametersGrid',
+                    region: 'center',
+                    reference: 'parametersGrid',
+                    bind: {
+                        data: '{report.parameters}',
+                    },
+                    listeners: {
+                        'showfilterpanel': 'showFilterPanel',
+                    },
+                },
+                {
+                    xtype: 'ReportPropertiesGrid',
+                    width: 500,
+                    scrollable: true,
+                    split: true,
+                    frame: false,
+                    region: 'east',
+                    reference: 'parameterProperties',
+                    bind: {
+                        enableAddProps: '{enableAddParamProps}',
+                        data: '{parametersGrid.selection.properties}',
+                    },
+                }
+            ],
+        },
+        {
+            xtype: 'panel',
+            title: 'Предпросмотр панели фильтрации отчета',
+            region: 'south',
+            scrollable: true,
+            split: true,
+            height: 400,
+            reference: 'filterPanelContainer',
+            tbar: [{
+                text: 'Обновить',
+                ui: 'blue-text-button-border',
+                handler: 'showFilterPanel',
+            }],
+        }
+    ],
+});
+