SI-1051 Platzhalter selbsterklärend
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java index 607132e..665cdbd 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/ExportService.java
@@ -161,20 +161,10 @@ this.contentReplaceMap = new HashMap<>(); - String title = tblFailureInfo.getTitle(); - if (title != null) { - contentReplaceMap.put(placeholderDto.getTitle(), title); - } - //TODO: // String directMeasureLink = getDirectMeasureLink(tblFailureInfo.getId()); // contentReplaceMap.put("$directFailureLink$", directMeasureLink); - String description = tblFailureInfo.getDescription(); - if(description != null) { - contentReplaceMap.put(placeholderDto.getDescription(), description); - } - String failureClassification = tblFailureInfo.getRefFailureClassification().getClassification(); if (failureClassification != null) { contentReplaceMap.put(placeholderDto.getFailureClassification(), failureClassification);
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/DistributionTextPlaceholderDto.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/DistributionTextPlaceholderDto.java index f0b3180..424fa46 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/DistributionTextPlaceholderDto.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/DistributionTextPlaceholderDto.java
@@ -21,8 +21,6 @@ @Data public class DistributionTextPlaceholderDto implements Serializable { - private String title; - private String description; private String failureClassification; private String failureType; private String responsibility;
diff --git a/gfsBackendService/src/main/resources/DistributionTextPlaceholder.json b/gfsBackendService/src/main/resources/DistributionTextPlaceholder.json index fa692e5..9d7b267 100644 --- a/gfsBackendService/src/main/resources/DistributionTextPlaceholder.json +++ b/gfsBackendService/src/main/resources/DistributionTextPlaceholder.json
@@ -1,19 +1,17 @@ { - "title": "$Title$", - "description": "$Description$", - "failureClassification": "$FailureClassification$", - "failureType": "$FailureType$", - "responsibility": "$Responsibility$", - "internExtern": "$InternExtern$", - "statusIntern": "$StatusIntern$", - "statusExtern": "$StatusExtern$", - "publicationStatus": "$PublicationStatus$", - "branch": "$Branch$", - "voltageLevel": "$VoltageLevel$", - "pressureLevel": "$PressureLevel$", - "failureBegin": "$FailureBegin$", - "failureEndPlanned": "$FailureEndPlanned$", - "failureEndResupplied": "$FailureEndResupplied$", - "expectedReason": "$ExpectedReason$", - "internalRemark": "$InternalRemark$" + "failureClassification": "$Klassifikation$", + "failureType": "$Typ$", + "responsibility": "$Zuständigkeit$", + "internExtern": "$Meldung_intern$", + "statusIntern": "$Status_intern$", + "statusExtern": "$Status_extern$", + "publicationStatus": "$Veröffentlichungsstatus$", + "branch": "$Sparte$", + "voltageLevel": "$Spannungsebene$", + "pressureLevel": "$Druckstufe$", + "failureBegin": "$Störungsbeginn_gemeldet$", + "failureEndPlanned": "$Störungsende_geplant$", + "failureEndResupplied": "$Störungsende_wiederversorgt$", + "expectedReason": "$Voraussichtlicher_Grund$", + "internalRemark": "$Interne_Bemerkungen$" }
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/DistributionTextPlacehoderServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/DistributionTextPlacehoderServiceTest.java index 94938e5..de80009 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/DistributionTextPlacehoderServiceTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/DistributionTextPlacehoderServiceTest.java
@@ -37,12 +37,12 @@ DistributionTextPlaceholderDto placeholderDto = placeholderService.getPlaceholder(); - assertEquals("$FailureClassification$", placeholderDto.getFailureClassification()); - assertEquals("$FailureType$", placeholderDto.getFailureType()); - assertEquals("$Responsibility$", placeholderDto.getResponsibility()); - assertEquals("$VoltageLevel$", placeholderDto.getVoltageLevel()); - assertEquals("$FailureBegin$", placeholderDto.getFailureBegin()); - assertEquals("$ExpectedReason$", placeholderDto.getExpectedReason()); + assertEquals("$Klassifikation$", placeholderDto.getFailureClassification()); + assertEquals("$Typ$", placeholderDto.getFailureType()); + assertEquals("$Zuständigkeit$", placeholderDto.getResponsibility()); + assertEquals("$Spannungsebene$", placeholderDto.getVoltageLevel()); + assertEquals("$Störungsbeginn_gemeldet$", placeholderDto.getFailureBegin()); + assertEquals("$Voraussichtlicher_Grund$", placeholderDto.getExpectedReason()); } }