Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#13070 - Add export (basic and detailed) and import #13103

Merged
merged 18 commits into from
Jun 4, 2024
Merged

#13070 - Add export (basic and detailed) and import #13103

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f821172
#13070 - Add basic and detailed export
carina29 May 22, 2024
5af9c75
Merge branch 'development' into #13070-Add_import_and_export_for_self…
carina29 May 23, 2024
018293b
#13070 - Add new fields to the Detailed export + fixes
carina29 May 24, 2024
9499d86
#13070 - Self report import, part 1
carina29 May 28, 2024
a7f4413
#13070 - Import
carina29 May 28, 2024
8b173ff
Merge branch 'development' into #13070-Add_import_and_export_for_self…
carina29 May 28, 2024
0eb464c
#13070 - Delete the columns after "comment" from import template
carina29 May 30, 2024
f32756a
#13070 - Delete District column from Detailed export
carina29 May 30, 2024
b6fa414
#13070 - Import guids + changes
carina29 May 31, 2024
9c708c9
#13070 - Changes related to the import testing
carina29 Jun 3, 2024
15fe6d1
#13070 - Changes
carina29 Jun 3, 2024
fa539a5
#13070 - Add missing validation
carina29 Jun 3, 2024
1dfbf84
#13070 - Fixes
carina29 Jun 3, 2024
d7ec8bc
Merge branch 'development' into #13070-Add_import_and_export_for_self…
carina29 Jun 3, 2024
708efde
#13070 - Fix failing unit test
carina29 Jun 4, 2024
b4f42ac
#13070 - Refactoring after review comments
carina29 Jun 4, 2024
480ca6f
Merge branch 'development' into #13070-Add_import_and_export_for_self…
carina29 Jun 4, 2024
3011d6a
#13070 - Eliminating unnecessary if
carina29 Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/FacadeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,16 +2186,20 @@ 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";
String SelfReport_caseReference = "SelfReport.caseReference";
String SelfReport_comment = "SelfReport.comment";
String SelfReport_contactDate = "SelfReport.contactDate";
String SelfReport_dateOfSymptoms = "SelfReport.dateOfSymptoms";
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";
Expand Down
2 changes: 2 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,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";
Expand Down Expand Up @@ -668,6 +669,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";
Expand Down
3 changes: 3 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 6 additions & 0 deletions sormas-api/src/main/java/de/symeda/sormas/api/importexport/ImportFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -148,4 +150,8 @@ public interface ImportFacade {
String getEnvironmentImportTemplateFilePath();

String getEnvironmentImportTemplateFileName();

String getSelfReportImportTemplateFilePath();

String getSelfReportImportTemplateFileName();
}
Loading
Loading