Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into SI-444
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 2d1cf77..8e61b63 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
@@ -12,6 +12,7 @@
********************************************************************************/
import { Router } from '@angular/router';
import { NgrxValueConverter, NgrxValueConverters } from 'ngrx-forms';
+import { FailureStation } from '@grid-failure-information-app/shared/models';
/**
* Returns formated date based on given culture
@@ -92,14 +93,12 @@
return null;
}
- const result = value.stationName;
- return NgrxValueConverters.objectToJSON.convertViewToStateValue(result);
+ if (value.stationName) return value.stationName;
+ else return value;
},
convertStateToViewValue(value) {
- if (value === null) {
- return null;
- }
-
- return value;
+ const failureStation: FailureStation = new FailureStation();
+ failureStation.stationName = value;
+ return failureStation;
},
};
