SORMAS-Foundation#2993

- update data dictionary
- fix error when doin bulk country archiving
- update missing csv language key
- update country relevance status language keys

Author: [email protected]

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -560,6 +560,9 @@ public interface Captions {
 	String Country_externalId = "Country.externalId";
 	String Country_isoCode = "Country.isoCode";
 	String Country_unoCode = "Country.unoCode";
+	String countryActiveCountries = "countryActiveCountries";
+	String countryAllCountries = "countryAllCountries";
+	String countryArchivedCountries = "countryArchivedCountries";
 	String creationDate = "creationDate";
 	String dashboardAlive = "dashboardAlive";
 	String dashboardApplyCustomFilter = "dashboardApplyCustomFilter";

sormas-api/src/main/resources/captions.properties

@@ -1332,6 +1332,10 @@ PrescriptionExport.caseUuid=Case ID
 PrescriptionExport.caseName=Case name
 
 # Country
+countryActiveCountries=Active countries
+countryArchivedCountries=Archived countries
+countryAllCountries=All countries
+
 Country.archived=Archived
 Country.externalId=External ID
 Country.defaultName=Default name

sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx

@@ -673,7 +673,7 @@ messageMissingEpiWeekFilter = Please fill in both epi week filter fields
 messageNoCasesSelected = You have not selected any cases
 messageNoClinicalVisitsSelected = You have not selected any clinical assessments
 messageNoContactsSelected = You have not selected any contacts
-messageNoCsvFile = You have not selected a file to upload. Please select a .csv file containing the cases you want to import from your computer.
+messageNoCsvFile = You have not selected a file to upload. Please select a .csv file containing the data you want to import from your computer.
 messageNoDocumentTemplateUploadFile = You have not selected a file to upload. Please select a .docx template file you want to import from your computer.
 messageNoDocumentUploadFile = You have not selected a file to upload. Please select a file you want to import from your computer.
 messageNoEventParticipantsSelected = You have not selected any event participants

sormas-api/src/main/resources/doc/SORMAS_User_Rights.xlsx

@@ -27,6 +27,7 @@
 import java.util.Date;
 import java.util.List;
 
+import de.symeda.sormas.api.region.CountryDto;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.util.AreaReference;
@@ -102,6 +103,7 @@ public void generateDataDictionary() throws FileNotFoundException, IOException {
 		createEntitySheet(workbook, EventDto.class, EventDto.I18N_PREFIX);
 		createEntitySheet(workbook, EventParticipantDto.class, EventParticipantDto.I18N_PREFIX);
 		createEntitySheet(workbook, FacilityDto.class, FacilityDto.I18N_PREFIX);
+		createEntitySheet(workbook, CountryDto.class, CountryDto.I18N_PREFIX);
 		createEntitySheet(workbook, RegionDto.class, RegionDto.I18N_PREFIX);
 		createEntitySheet(workbook, DistrictDto.class, DistrictDto.I18N_PREFIX);
 		createEntitySheet(workbook, CommunityDto.class, CommunityDto.I18N_PREFIX);

sormas-api/src/main/resources/strings.properties

@@ -184,7 +184,9 @@ private HorizontalLayout createFilterBar() {
 				relevanceStatusFilter.setId("relevanceStatus");
 				relevanceStatusFilter.setWidth(220, Unit.PERCENTAGE);
 				relevanceStatusFilter.setNullSelectionAllowed(false);
-				relevanceStatusFilter.addItems((Object[]) EntityRelevanceStatus.values());
+				relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ACTIVE, I18nProperties.getCaption(Captions.countryActiveCountries));
+				relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ARCHIVED, I18nProperties.getCaption(Captions.countryArchivedCountries));
+				relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ALL, I18nProperties.getCaption(Captions.countryAllCountries));
 				relevanceStatusFilter.addValueChangeListener(e -> {
 					criteria.relevanceStatus((EntityRelevanceStatus) e.getProperty().getValue());
 					navigateTo(criteria);

sormas-api/src/test/java/de/symeda/sormas/api/doc/DataDictionaryGenerator.java

@@ -42,6 +42,7 @@
 import de.symeda.sormas.api.region.AreaDto;
 import de.symeda.sormas.api.region.CommunityDto;
 import de.symeda.sormas.api.region.CountryDto;
+import de.symeda.sormas.api.region.CountryIndexDto;
 import de.symeda.sormas.api.region.DistrictDto;
 import de.symeda.sormas.api.region.DistrictIndexDto;
 import de.symeda.sormas.api.region.RegionDto;
@@ -682,7 +683,7 @@ public void archiveOrDearchiveAllSelectedItems(
 						}
 						break;
 					case COUNTRY:
-						for (CountryDto selectedRow : (Collection<CountryDto>) selectedRows) {
+						for (CountryIndexDto selectedRow : (Collection<CountryIndexDto>) selectedRows) {
 							if (archive) {
 								FacadeProvider.getCountryFacade().archive(selectedRow.getUuid());
 							} else {