Merge pull request #13103 from SORMAS-Foundation/#13070-Add_import_an…

…d_export_for_self_reporting #13070 - Add export (basic and detailed) and import
SORMAS-Foundation · Jun 4, 2024 · 0b15207 · 0b15207
2 parents 663094f + 3011d6a
commit 0b15207
Show file tree

Hide file tree

Showing 41 changed files with 1,451 additions and 60 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java
@@ -88,6 +88,7 @@
 import de.symeda.sormas.api.sample.PathogenTestFacade;
 import de.symeda.sormas.api.sample.SampleFacade;
 import de.symeda.sormas.api.selfreport.SelfReportFacade;
+import de.symeda.sormas.api.selfreport.SelfReportImportFacade;
 import de.symeda.sormas.api.share.ExternalShareInfoFacade;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasEncryptionFacade;
 import de.symeda.sormas.api.sormastosormas.SormasToSormasFacade;
@@ -534,6 +535,10 @@ public static SelfReportFacade getSelfReportFacade() {
 		return get().lookupEjbRemote(SelfReportFacade.class);
 	}
 
+	public static SelfReportImportFacade getSelfReportImportFacade() {
+		return get().lookupEjbRemote(SelfReportImportFacade.class);
+	}
+
 	@SuppressWarnings("unchecked")
 	public <P> P lookupEjbRemote(Class<P> clazz) {
 		try {

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -2186,6 +2186,7 @@ public interface Captions {
 	String selectSimilarSample = "selectSimilarSample";
 	String SelfReport = "SelfReport";
 	String SelfReport_address = "SelfReport.address";
+	String SelfReport_birthDate = "SelfReport.birthDate";
 	String SelfReport_birthdateDD = "SelfReport.birthdateDD";
 	String SelfReport_birthdateMM = "SelfReport.birthdateMM";
 	String SelfReport_birthdateYYYY = "SelfReport.birthdateYYYY";
@@ -2196,7 +2197,9 @@ public interface Captions {
 	String SelfReport_dateOfTest = "SelfReport.dateOfTest";
 	String SelfReport_dateWorkplace = "SelfReport.dateWorkplace";
 	String SelfReport_disease = "SelfReport.disease";
+	String SelfReport_diseaseDetails = "SelfReport.diseaseDetails";
 	String SelfReport_diseaseVariant = "SelfReport.diseaseVariant";
+	String SelfReport_diseaseVariantDetails = "SelfReport.diseaseVariantDetails";
 	String SelfReport_email = "SelfReport.email";
 	String SelfReport_firstName = "SelfReport.firstName";
 	String SelfReport_investigationStatus = "SelfReport.investigationStatus";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
@@ -281,6 +281,7 @@ public interface Strings {
 	String entitySample = "entitySample";
 	String entitySamples = "entitySamples";
 	String entitySelfReport = "entitySelfReport";
+	String entitySelfReports = "entitySelfReports";
 	String entityStatistics = "entityStatistics";
 	String entitySubcontinents = "entitySubcontinents";
 	String entityTask = "entityTask";
@@ -671,6 +672,7 @@ public interface Strings {
 	String headingImportPointsOfEntry = "headingImportPointsOfEntry";
 	String headingImportPopulationData = "headingImportPopulationData";
 	String headingImportRegions = "headingImportRegions";
+	String headingImportSelfReports = "headingImportSelfReports";
 	String headingImportSubcontinents = "headingImportSubcontinents";
 	String headingImportTravelEntries = "headingImportTravelEntries";
 	String headingInformationSource = "headingInformationSource";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java
@@ -140,12 +140,15 @@ public interface Validations {
 	String importRegionAlreadyExists = "importRegionAlreadyExists";
 	String importRegionNotInServerCountry = "importRegionNotInServerCountry";
 	String importRegionNotUnique = "importRegionNotUnique";
+	String importSelfReportPropertyTypeNotAllowed = "importSelfReportPropertyTypeNotAllowed";
+	String importSelfReportUnexpectedError = "importSelfReportUnexpectedError";
 	String importSubcontinentAlreadyExists = "importSubcontinentAlreadyExists";
 	String importSubcontinentNotUnique = "importSubcontinentNotUnique";
 	String importUnexpectedError = "importUnexpectedError";
 	String importWrongDataTypeError = "importWrongDataTypeError";
 	String infrastructureDataLocked = "infrastructureDataLocked";
 	String invalidNationalHealthId = "invalidNationalHealthId";
+	String invalidSelfReportType = "invalidSelfReportType";
 	String investigationStatusUnclassifiedCase = "investigationStatusUnclassifiedCase";
 	String jurisdictionChangeUserAssignment = "jurisdictionChangeUserAssignment";
 	String latitudeBetween = "latitudeBetween";

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/importexport/ImportFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/importexport/ImportFacade.java
@@ -71,6 +71,8 @@ public interface ImportFacade {
 
 	void generateEnvironmentImportTemplateFile(List<FeatureConfigurationDto> featureConfigurations) throws IOException;
 
+	void generateSelfReportImportTemplateFile(List<FeatureConfigurationDto> featureConfigurations) throws IOException, NoSuchFieldException;
+
 	String getCaseImportTemplateFileName();
 
 	String getCaseImportTemplateFilePath();
@@ -148,4 +150,8 @@ public interface ImportFacade {
 	String getEnvironmentImportTemplateFilePath();
 
 	String getEnvironmentImportTemplateFileName();
+
+	String getSelfReportImportTemplateFilePath();
+
+	String getSelfReportImportTemplateFileName();
 }