@qrvey/utils 1.1.5 → 1.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -13,7 +13,7 @@ function getFilterColumnLabel(column) {
|
|
|
13
13
|
if (isComplexColumn_1.isComplexColumn(column) && column.property != null)
|
|
14
14
|
labels.push(constants_1.COLUMN_COMPLEX_VALUE[column.property].shortLabel);
|
|
15
15
|
if (column.aggregate != null)
|
|
16
|
-
labels.push(column.aggregate);
|
|
16
|
+
labels.push(constants_1.AGGREGATE_ABBREVIATION[column.aggregate]);
|
|
17
17
|
if (column.calculation != null)
|
|
18
18
|
labels.push(column.calculation);
|
|
19
19
|
return labels.length > 0 ? `(${labels.join(' - ')})` : '';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isComplexColumn } from "../../../qrvey/isComplexColumn";
|
|
2
|
-
import { COLUMN_COMPLEX_VALUE } from "../../../constants";
|
|
2
|
+
import { AGGREGATE_ABBREVIATION, COLUMN_COMPLEX_VALUE } from "../../../constants";
|
|
3
3
|
/**
|
|
4
4
|
* Get an string of the properties of the given filter column.
|
|
5
5
|
* @param column The filter column
|
|
@@ -10,7 +10,7 @@ export function getFilterColumnLabel(column) {
|
|
|
10
10
|
if (isComplexColumn(column) && column.property != null)
|
|
11
11
|
labels.push(COLUMN_COMPLEX_VALUE[column.property].shortLabel);
|
|
12
12
|
if (column.aggregate != null)
|
|
13
|
-
labels.push(column.aggregate);
|
|
13
|
+
labels.push(AGGREGATE_ABBREVIATION[column.aggregate]);
|
|
14
14
|
if (column.calculation != null)
|
|
15
15
|
labels.push(column.calculation);
|
|
16
16
|
return labels.length > 0 ? `(${labels.join(' - ')})` : '';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isComplexColumn } from "../../../qrvey/isComplexColumn";
|
|
2
2
|
import { IFUColumn } from "../../interfaces";
|
|
3
|
-
import { COLUMN_COMPLEX_VALUE } from "../../../constants";
|
|
3
|
+
import { AGGREGATE_ABBREVIATION, COLUMN_COMPLEX_VALUE } from "../../../constants";
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* Get an string of the properties of the given filter column.
|
|
@@ -10,7 +10,7 @@ import { COLUMN_COMPLEX_VALUE } from "../../../constants";
|
|
|
10
10
|
export function getFilterColumnLabel(column: IFUColumn): string {
|
|
11
11
|
const labels: string[] = [];
|
|
12
12
|
if (isComplexColumn(column as any) && column.property != null) labels.push(COLUMN_COMPLEX_VALUE[column.property].shortLabel);
|
|
13
|
-
if (column.aggregate != null) labels.push(column.aggregate);
|
|
13
|
+
if (column.aggregate != null) labels.push(AGGREGATE_ABBREVIATION[column.aggregate]);
|
|
14
14
|
if (column.calculation != null) labels.push(column.calculation);
|
|
15
15
|
|
|
16
16
|
return labels.length > 0 ? `(${labels.join(' - ')})` : '';
|