Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into SI-2942-Radius-0-bei-Filterpopup
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-column-definition.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-column-definition.ts
index d9ff356..eb14ef8 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-column-definition.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-column-definition.ts
@@ -214,8 +214,8 @@
colId: 'radius',
headerName: 'GridFailure.RadiusInM',
sortable: true,
- comparator: sortAlphaNum,
suppressMovable: true,
+ valueGetter: param => (param.data.radius !== null ? param.data.radius.toString() : null),
filter: 'setFilterComponent',
},
{
diff --git a/projects/grid-failure-information-app/src/app/shared/utility/utilityHelpers.ts b/projects/grid-failure-information-app/src/app/shared/utility/utilityHelpers.ts
index ba97cda..7ddcc1f 100644
--- a/projects/grid-failure-information-app/src/app/shared/utility/utilityHelpers.ts
+++ b/projects/grid-failure-information-app/src/app/shared/utility/utilityHelpers.ts
@@ -109,7 +109,9 @@
}
export function convertEmptyValueToNull(value: string): string {
- return !value || value.toString().trim() === '' ? null : value;
+ if (value === null || value.toString().trim() === '') {
+ return null;
+ } else return value;
}
export function getDependencyPropertyFromControlId(controlId: string): string {
