forgot one file on master merge
MODIFY
src/server/rest/v1/service/ChargingStationService.ts
src/server/rest/v1/service/ChargingStationService.ts
@@ -1556,18 +1556,16 @@ export default class ChargingStationService {
const getCreatedOnCell = (chargingStation: ChargingStation, i18nManager: I18nManager) => {
if (chargingStation.createdOn) {
return [i18nManager.formatDateTime(chargingStation.createdOn, 'L') + ' ' + i18nManager.formatDateTime(chargingStation.createdOn, 'LT')];
- } else {
- return [i18nManager.translate('general.invalidDate') + ' ' + i18nManager.translate('general.invalidTime')];
- }
}
+ return [i18nManager.translate('general.invalidDate') + ' ' + i18nManager.translate('general.invalidTime')];
+ };
// Build coordinates cell
const getCoordinatesCell = (chargingStation: ChargingStation) => {
if (chargingStation.coordinates && chargingStation.coordinates.length === 2) {
- return [chargingStation.coordinates[1], chargingStation.coordinates[0]]
- } else {
- return ['', '']
- }
+ return [chargingStation.coordinates[1], chargingStation.coordinates[0]];
}
+ return ['', ''];
+ };
let headers = null;
const i18nManager = I18nManager.getInstanceForLocale(req.user.locale);
// Header
@@ -1611,31 +1609,9 @@ export default class ChargingStationService {
i18nManager.formatDateTime(chargingStation.lastReboot, 'L') + ' ' + i18nManager.formatDateTime(chargingStation.lastReboot, 'LT'),
chargingStation.maximumPower,
chargingStation.powerLimitUnit
-<<<<<<< HEAD
].map((value) => typeof value === 'string' ? '"' + value.replace('"', '""') + '"' : value);
return row;
}).join(Constants.CR_LF);
-=======
- ].map((value) => typeof value === 'string' ? '"' + value.replace('"', '""') + '"' : value);
- return row;
- }).join(Constants.CR_LF);
- // Build createdOn cell
- const getCreatedOnCell = (chargingStation: ChargingStation, i18nManager: I18nManager) => {
- if (chargingStation.createdOn) {
- return [i18nManager.formatDateTime(chargingStation.createdOn, 'L') + ' ' + i18nManager.formatDateTime(chargingStation.createdOn, 'LT')];
- }
- return [i18nManager.translate('general.invalidDate') + ' ' + i18nManager.translate('general.invalidTime')];
-
- };
- // Build coordinates cell
- const getCoordinatesCell = (chargingStation: ChargingStation) => {
- if (chargingStation.coordinates && chargingStation.coordinates.length === 2) {
- return [chargingStation.coordinates[1], chargingStation.coordinates[0]];
- }
- return ['', ''];
-
- };
->>>>>>> master-qa
return Utils.isNullOrUndefined(headers) ? Constants.CR_LF + rows : [headers, rows].join(Constants.CR_LF);
}

forgot one file on master merge