Merge branch 'SI-77' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into SI-444
diff --git a/i18n/grid-failure.de.json b/i18n/grid-failure.de.json
index 7200f95..e3300b2 100644
--- a/i18n/grid-failure.de.json
+++ b/i18n/grid-failure.de.json
@@ -33,7 +33,8 @@
"InternalRemark": "Interne Bemerkungen",
"Postcode": "Postleitzahl",
"PressureLevel": "Druckstufe",
- "Radius": "Radius",
+ "RadiusInM": "Radius in m",
+ "RadiusInMeter": "Radius in Meter",
"Responsibility": "Zuständigkeit",
"StationDescription": "Bezeichnung",
"StatusExtern": "Status (extern)",
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index 246edf0..d373824 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
@@ -463,7 +463,7 @@
<!-- radius -->
<div class="form-group row">
- <label for="radius" class="col-sm-2 col-form-label">{{ 'GridFailure.Radius' | translate }}</label>
+ <label for="radius" class="col-sm-2 col-form-label">{{ 'GridFailure.RadiusInMeter' | translate }}</label>
<div class="col-sm-4">
<select
required
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 cbc9d8e..c2a99e5 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
@@ -156,7 +156,7 @@
},
{
field: 'radius',
- headerName: 'GridFailure.Radius',
+ headerName: 'GridFailure.RadiusInM',
sortable: true,
filter: 'setFilterComponent',
},
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts
index 441104f..2e3c085 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list-for-condensation-column-definition.ts
@@ -156,7 +156,7 @@
},
{
field: 'radius',
- headerName: 'GridFailure.Radius',
+ headerName: 'GridFailure.RadiusInM',
sortable: true,
filter: 'setFilterComponent',
},
diff --git a/projects/grid-failure-information-app/src/app/shared/models/failure-radius.model.ts b/projects/grid-failure-information-app/src/app/shared/models/failure-radius.model.ts
index 66c4aeb..686774a 100644
--- a/projects/grid-failure-information-app/src/app/shared/models/failure-radius.model.ts
+++ b/projects/grid-failure-information-app/src/app/shared/models/failure-radius.model.ts
@@ -12,7 +12,7 @@
********************************************************************************/
export class FailureRadius {
public id: string = null;
- public radius: string = null;
+ public radius: number = null;
public constructor(data: any = null) {
Object.keys(data || {})
diff --git a/projects/grid-failure-information-app/src/app/shared/models/grid-failure.model.ts b/projects/grid-failure-information-app/src/app/shared/models/grid-failure.model.ts
index 1f2e1fd..84f5da7 100644
--- a/projects/grid-failure-information-app/src/app/shared/models/grid-failure.model.ts
+++ b/projects/grid-failure-information-app/src/app/shared/models/grid-failure.model.ts
@@ -31,7 +31,7 @@
public internalRemark: string = null;
public postcode: string = null;
public pressureLevel: string = null;
- public radius: string = null;
+ public radius: number = null;
public radiusId: string = null;
public responsibility: string = null;
public stationDescription: string = null;
