reverting general workflow

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/docgeneneration/DocumentWorkflow.java

@@ -21,7 +21,6 @@
 import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_EVENT_ACTIONS;
 import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_EVENT_PARTICIPANT;
 import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_EVENT_PARTICIPANTS;
-import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_GENERAL;
 import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_PATHOGEN_TEST;
 import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_PERSON;
 import static de.symeda.sormas.api.docgeneneration.RootEntityType.ROOT_SAMPLE;
@@ -55,8 +54,7 @@ public enum DocumentWorkflow {
 		ROOT_USER,
 		ROOT_SAMPLE,
 		ROOT_PATHOGEN_TEST,
-		ROOT_VACCINATION,
-		ROOT_GENERAL),
+		ROOT_VACCINATION),
 	QUARANTINE_ORDER_CONTACT(DocumentWorkflowType.DOCUMENT,
 		"quarantineContact",
 		DOCX,
@@ -66,8 +64,7 @@ public enum DocumentWorkflow {
 		ROOT_USER,
 		ROOT_SAMPLE,
 		ROOT_PATHOGEN_TEST,
-		ROOT_VACCINATION,
-		ROOT_GENERAL),
+		ROOT_VACCINATION),
 	QUARANTINE_ORDER_EVENT_PARTICIPANT(DocumentWorkflowType.DOCUMENT,
 		"quarantineEventParticipant",
 		DOCX,
@@ -77,16 +74,14 @@ public enum DocumentWorkflow {
 		ROOT_USER,
 		ROOT_SAMPLE,
 		ROOT_PATHOGEN_TEST,
-		ROOT_VACCINATION,
-		ROOT_GENERAL),
+		ROOT_VACCINATION),
 	QUARANTINE_ORDER_TRAVEL_ENTRY(DocumentWorkflowType.DOCUMENT,
 		"quarantineTravelEntry",
 		DOCX,
 		UserRight.DOCUMENT_TEMPLATE_MANAGEMENT,
 		ROOT_TRAVEL_ENTRY,
 		ROOT_PERSON,
-		ROOT_USER,
-		ROOT_GENERAL),
+		ROOT_USER),
 	EVENT_HANDOUT(DocumentWorkflowType.DOCUMENT,
 		"eventHandout",
 		HTML,

sormas-api/src/main/java/de/symeda/sormas/api/docgeneneration/RootEntityType.java

@@ -28,8 +28,7 @@ public enum RootEntityType {
 	ROOT_EVENT_ACTIONS("eventActions"),
 	ROOT_EVENT_PARTICIPANTS("eventParticipants"),
 	ROOT_TRAVEL_ENTRY("travelEntry"),
-	ROOT_VACCINATION("vaccination"),
-	ROOT_GENERAL("general");
+	ROOT_VACCINATION("vaccination");
 
 	private final String entityName;
 

sormas-backend/src/main/java/de/symeda/sormas/backend/docgeneration/DocumentTemplateFacadeEjb.java

@@ -19,11 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
 import java.util.List;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -233,11 +229,6 @@ private Properties prepareProperties(
 					continue;
 				}
 
-				// check if the entity is from a general.
-				if (rootEntityType == RootEntityType.ROOT_GENERAL) {
-					fillGeneralValues(documentVariables, properties, propertyKey);
-				}
-
 				Object entity = entities.getEntity(rootEntityType);
 				if (entity instanceof HasUuid) {
 					if (documentWorkflow.isDocx() || propertyKey.contains(propertySeparator)) {
@@ -293,33 +284,6 @@ private Properties prepareProperties(
 		return properties;
 	}
 
-	private void fillGeneralValues(DocumentVariables documentVariables, Properties properties, String propertyKey) {
-		// finding the general property key. Based on the type, formatStyle is deciding.
-		// general properties are allowed only doc-formatted files.
-		Optional<String> generalPropertyOpt = documentVariables.getVariables()
-			.stream()
-			.filter(e -> e.startsWith(RootEntityType.ROOT_GENERAL.getEntityName() + "."))
-			.filter(e -> e.equals(propertyKey))
-			.findAny();
-
-		if (generalPropertyOpt.isPresent()) {
-			String generalProperty = generalPropertyOpt.get();
-			String dateType = generalProperty.substring(generalProperty.lastIndexOf('.') + 1);
-			FormatStyle formatStyle;
-			switch (dateType) {
-			case "medium":
-				formatStyle = FormatStyle.MEDIUM;
-				break;
-			case "short":
-			default:
-				formatStyle = FormatStyle.SHORT;
-			}
-			String propertyValue =
-				LocalDate.now().format(DateTimeFormatter.ofLocalizedDate(formatStyle).withLocale(I18nProperties.getUserLanguage().getLocale()));
-			properties.setProperty(generalProperty, propertyValue);
-		}
-	}
-
 	private byte[] generateDocumentDocx(File templateFile, Properties properties) throws DocumentTemplateException {
 		return templateEngine.generateDocumentDocx(properties, templateFile);
 	}