Include captions comment in CSV

Author: vidi42

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

@@ -111,6 +111,7 @@ public interface Captions {
 	String aggregateReportReportFound = "aggregateReportReportFound";
 	String aggregateReportThisWeek = "aggregateReportThisWeek";
 	String all = "all";
+	String Area_archived = "Area.archived";
 	String Area_externalId = "Area.externalId";
 	String areaActiveAreas = "areaActiveAreas";
 	String areaAllAreas = "areaAllAreas";
@@ -364,6 +365,7 @@ public interface Captions {
 	String columnDiseaseShort = "columnDiseaseShort";
 	String columnNumberOfPendingTasks = "columnNumberOfPendingTasks";
 	String community = "community";
+	String Community_archived = "Community.archived";
 	String Community_externalID = "Community.externalID";
 	String communityActiveCommunities = "communityActiveCommunities";
 	String communityAllCommunities = "communityAllCommunities";
@@ -439,6 +441,9 @@ public interface Captions {
 	String Contact_relationToCase = "Contact.relationToCase";
 	String Contact_reportDateTime = "Contact.reportDateTime";
 	String Contact_reportingUser = "Contact.reportingUser";
+	String Contact_reportLat = "Contact.reportLat";
+	String Contact_reportLon = "Contact.reportLon";
+	String Contact_reportLatLonAccuracy = "Contact.reportLatLonAccuracy";
 	String Contact_resultingCase = "Contact.resultingCase";
 	String Contact_resultingCaseUser = "Contact.resultingCaseUser";
 	String Contact_tracingApp = "Contact.tracingApp";
@@ -640,6 +645,7 @@ public interface Captions {
 	String DiseaseBurden_outbreakDistrictCount = "DiseaseBurden.outbreakDistrictCount";
 	String DiseaseBurden_previousCaseCount = "DiseaseBurden.previousCaseCount";
 	String district = "district";
+	String District_archived = "District.archived";
 	String District_epidCode = "District.epidCode";
 	String District_externalID = "District.externalID";
 	String District_growthRate = "District.growthRate";
@@ -802,6 +808,7 @@ public interface Captions {
 	String exportSamples = "exportSamples";
 	String exportSelectSormasData = "exportSelectSormasData";
 	String exportSormasData = "exportSormasData";
+	String Facility_archived = "Facility.archived";
 	String Facility_city = "Facility.city";
 	String Facility_community = "Facility.community";
 	String Facility_district = "Facility.district";
@@ -811,6 +818,7 @@ public interface Captions {
 	String Facility_name = "Facility.name";
 	String Facility_NO_FACILITY = "Facility.NO_FACILITY";
 	String Facility_OTHER_FACILITY = "Facility.OTHER_FACILITY";
+	String Facility_publicOwnership = "Facility.publicOwnership";
 	String Facility_region = "Facility.region";
 	String Facility_type = "Facility.type";
 	String Facility_typeGroup = "Facility.typeGroup";
@@ -1094,6 +1102,7 @@ public interface Captions {
 	String PrescriptionExport_caseUuid = "PrescriptionExport.caseUuid";
 	String prescriptionNewPrescription = "prescriptionNewPrescription";
 	String region = "region";
+	String Region_archived = "Region.archived";
 	String Region_epidCode = "Region.epidCode";
 	String Region_externalID = "Region.externalID";
 	String Region_growthRate = "Region.growthRate";

sormas-api/src/main/java/de/symeda/sormas/api/utils/CSVCommentLineValidator.java

@@ -23,12 +23,15 @@
 import org.apache.commons.lang3.StringUtils;
 
 /**
+ * CSV Line validator which fails whenever a line which starts with {@link #DEFAULT_COMMENT_LINE_PREFIX} is found.
+ * Can be used to ignore commented CSV file lines.
+ *
  * @author Alex Vidrean
  * @since 14-Sep-20
  */
 public class CSVCommentLineValidator implements LineValidator {
 
-	private final String DEFAULT_COMMENT_LINE_PREFIX = "##";
+	public static final String DEFAULT_COMMENT_LINE_PREFIX = "##";
 
 	public static final String ERROR_MESSAGE = "comment";
 

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

@@ -162,6 +162,7 @@ AggregateReport.pointOfEntry=Point of Entry
 areaActiveAreas = Active areas
 areaArchivedAreas = Archived areas
 areaAllAreas = All areas
+Area.archived = Archived
 Area.externalId = External ID
 
 # Bulk actions
@@ -437,6 +438,7 @@ columnDiseaseShort=Disease
 columnNumberOfPendingTasks=Pending tasks
 
 # Community
+Community.archived=Archived
 Community.externalID=External ID
 
 communityActiveCommunities=Active communities
@@ -525,6 +527,9 @@ Contact.relationDescription=Relationship description
 Contact.relationToCase=Relationship with case
 Contact.reportDateTime=Report date
 Contact.reportingUser=Reporting user
+Contact.reportLat=Report GPS latitude
+Contact.reportLon=Report GPS longitude
+Contact.reportLatLonAccuracy=Report GPS accuracy in m
 Contact.resultingCase=Resulting case
 Contact.resultingCaseUser=Resulting case assigned by
 Contact.uuid=Contact ID
@@ -726,6 +731,7 @@ districtActiveDistricts=Active districts
 districtArchivedDistricts=Archived districts
 districtAllDistricts=All districts
 
+District.archived=Archived
 District.epidCode=Epid code
 District.growthRate=Growth rate
 District.population=Population
@@ -912,6 +918,7 @@ facilityAllFacilities=All facilities
 Facility.NO_FACILITY=Home or other place
 Facility.OTHER_FACILITY=Other facility
 
+Facility.archived=Archived
 Facility.city=City
 Facility.community=Community
 Facility.district=District
@@ -1222,6 +1229,7 @@ regionActiveRegions=Active regions
 regionArchivedRegions=Archived regions
 regionAllRegions=All regions
 
+Region.archived=Archived
 Region.epidCode=Epid code
 Region.growthRate=Growth rate
 Region.population=Population

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

@@ -531,6 +531,7 @@ districtActiveDistricts = Active districts
 districtArchivedDistricts = Archived districts
 districtAllDistricts = All districts
 
+District.archived=Archived
 District.epidCode = Epid code
 District.growthRate = Growth rate
 District.population = Population
@@ -1480,4 +1481,4 @@ WeeklyReportRegionSummary.informantZeroReports = Number of informant zero report
 WeeklyReportRegionSummary.officers = Number of officers
 WeeklyReportRegionSummary.officerReports = Number of officers reports
 WeeklyReportRegionSummary.officerReportPercentage = Percentage
-WeeklyReportRegionSummary.officerZeroReports = Number of officer zero reports
+WeeklyReportRegionSummary.officerZeroReports = Number of officer zero reports

sormas-api/src/main/resources/captions_de-CH.properties

@@ -162,6 +162,7 @@ AggregateReport.pointOfEntry=Einreiseort
 areaActiveAreas = Aktive Gebiete
 areaArchivedAreas = Archivierte Gebiete
 areaAllAreas = Alle Gebiete
+Area.archived = Archiviert
 Area.externalId = Externe ID
 
 # Bulk actions
@@ -437,6 +438,7 @@ columnDiseaseShort=Krankheit
 columnNumberOfPendingTasks=Ausstehende Aufgaben
 
 # Community
+Community.archived = Archiviert
 Community.externalID=Externe ID
 
 communityActiveCommunities=Aktive Gemeinden
@@ -525,6 +527,9 @@ Contact.relationDescription=Beschreibung der Beziehung
 Contact.relationToCase=Beziehung mit Fall
 Contact.reportDateTime=Meldedatum
 Contact.reportingUser=Meldender Nutzer
+Contact.reportLat=Gemeldeter GPS-Breitengrad
+Contact.reportLon=Gemeldeter GPS-Längengrad
+Contact.reportLatLonAccuracy=GPS-Genauigkeit in m
 Contact.resultingCase=Resultierender Fall
 Contact.resultingCaseUser=Resultierender Fall zugewiesen von
 Contact.uuid=Kontakt-ID
@@ -726,6 +731,7 @@ districtActiveDistricts=Aktive Bezirke
 districtArchivedDistricts=Archivierte Bezirke
 districtAllDistricts=Alle Bezirke
 
+District.archived=Archiviert
 District.epidCode=EPID-Nummer
 District.growthRate=Wachstumsrate
 District.population=Bevölkerung
@@ -912,6 +918,7 @@ facilityAllFacilities=Alle Einrichtungen
 Facility.NO_FACILITY=Zuhause oder anderer Ort
 Facility.OTHER_FACILITY=Andere Einrichtung
 
+Facility.archived=Archiviert
 Facility.city=Stadt
 Facility.community=Gemeinde
 Facility.district=Bezirk
@@ -1222,6 +1229,7 @@ regionActiveRegions=Aktive Kantone
 regionArchivedRegions=Archivierte Kantone
 regionAllRegions=Alle Kantone
 
+Region.archived=Archiviert
 Region.epidCode=EPID-Nummer
 Region.growthRate=Wachstumsrate
 Region.population=Bevölkerung

sormas-api/src/main/resources/captions_de-DE.properties

@@ -162,6 +162,7 @@ AggregateReport.pointOfEntry=Einreiseort
 areaActiveAreas = Aktive Gebiete
 areaArchivedAreas = Archivierte Gebiete
 areaAllAreas = Alle Gebiete
+Area.archived = Archiviert
 Area.externalId = Externe ID
 
 # Bulk actions
@@ -437,6 +438,7 @@ columnDiseaseShort=Krankheit
 columnNumberOfPendingTasks=Ausstehende Aufgaben
 
 # Community
+Community.archived = Archiviert
 Community.externalID=Externe ID
 
 communityActiveCommunities=Aktive Gemeinden
@@ -525,6 +527,9 @@ Contact.relationDescription=Beschreibung der Beziehung
 Contact.relationToCase=Beziehung mit Fall
 Contact.reportDateTime=Meldedatum
 Contact.reportingUser=Meldender Nutzer
+Contact.reportLat=Gemeldeter GPS-Breitengrad
+Contact.reportLon=Gemeldeter GPS-Längengrad
+Contact.reportLatLonAccuracy=GPS-Genauigkeit in m
 Contact.resultingCase=Resultierender Fall
 Contact.resultingCaseUser=Resultierender Fall zugewiesen von
 Contact.uuid=Kontakt-ID
@@ -726,6 +731,7 @@ districtActiveDistricts=Aktive Landkreise
 districtArchivedDistricts=Archivierte Landkreise
 districtAllDistricts=Alle Landkreise
 
+District.archived=Archiviert
 District.epidCode=EPID-Nummer
 District.growthRate=Wachstumsrate
 District.population=Bevölkerung
@@ -912,6 +918,7 @@ facilityAllFacilities=Alle Einrichtungen
 Facility.NO_FACILITY=Zuhause oder anderer Ort
 Facility.OTHER_FACILITY=Andere Einrichtung
 
+Facility.archived=Archiviert
 Facility.city=Stadt
 Facility.community=Gemeinde
 Facility.district=Landkreis/Kreisfreie Stadt
@@ -1222,6 +1229,7 @@ regionActiveRegions=Aktive Bundesländer
 regionArchivedRegions=Archivierte Bundesländer
 regionAllRegions=Alle Bundesländer
 
+Region.archived=Archiviert
 Region.epidCode=EPID-Nummer
 Region.growthRate=Wachstumsrate
 Region.population=Bevölkerung

sormas-api/src/main/resources/captions_en-AF.properties

@@ -162,6 +162,7 @@ AggregateReport.pointOfEntry=Point of Entry
 areaActiveAreas = Active regions
 areaArchivedAreas = Archived regions
 areaAllAreas = All regions
+Area.archived = Archived
 Area.externalId = External ID
 
 # Bulk actions
@@ -435,6 +436,7 @@ columnDiseaseShort=Disease
 columnNumberOfPendingTasks=Pending tasks
 
 # Community
+Community.archived = Archived
 Community.externalID=External ID
 
 communityActiveCommunities=Active clusters
@@ -523,6 +525,9 @@ Contact.relationDescription=Relationship description
 Contact.relationToCase=Relationship with case
 Contact.reportDateTime=Report date
 Contact.reportingUser=Reporting user
+Contact.reportLat=Report GPS latitude
+Contact.reportLon=Report GPS longitude
+Contact.reportLatLonAccuracy=Report GPS accuracy in m
 Contact.resultingCase=Resulting case
 Contact.resultingCaseUser=Resulting case assigned by
 Contact.uuid=Contact ID
@@ -722,6 +727,7 @@ districtActiveDistricts=Active districts
 districtArchivedDistricts=Archived districts
 districtAllDistricts=All districts
 
+District.archived=Archived
 District.epidCode=Epid code
 District.growthRate=Growth rate
 District.population=Population
@@ -908,6 +914,7 @@ facilityAllFacilities=All facilities
 Facility.NO_FACILITY=Home or other place
 Facility.OTHER_FACILITY=Other facility
 
+Facility.archived=Archived
 Facility.city=City
 Facility.community=Cluster
 Facility.district=District
@@ -1218,6 +1225,7 @@ regionActiveRegions=Active provinces
 regionArchivedRegions=Archived provinces
 regionAllRegions=All provinces
 
+Region.archived=Archived
 Region.epidCode=Epid code
 Region.growthRate=Growth rate
 Region.population=Population

sormas-api/src/main/resources/captions_es-CU.properties

@@ -162,6 +162,7 @@ AggregateReport.pointOfEntry=Punto de entrada
 areaActiveAreas = Zonas activas
 areaArchivedAreas = Zonas archivadas
 areaAllAreas = Todas las zonas
+Area.archived = Archivado
 Area.externalId = ID externa
 
 # Bulk actions
@@ -435,6 +436,7 @@ columnDiseaseShort=Enfermedad
 columnNumberOfPendingTasks=Tareas pendientes
 
 # Community
+Community.archived = Archivado
 Community.externalID=ID externa
 
 communityActiveCommunities=Áreas de salud activas
@@ -523,6 +525,9 @@ Contact.relationDescription=Descripción de la relación
 Contact.relationToCase=Relación con el caso
 Contact.reportDateTime=Fecha del informe
 Contact.reportingUser=Usuario informante
+Contact.reportLat=Latitud GPS del informe
+Contact.reportLon=Longitud GPS del informe
+Contact.reportLatLonAccuracy=Precisión GPS del informe en m
 Contact.resultingCase=Caso resultante
 Contact.resultingCaseUser=Caso resultante asignado por
 Contact.uuid=ID del contacto
@@ -722,6 +727,7 @@ districtActiveDistricts=Municipios activos
 districtArchivedDistricts=Municipios archivados
 districtAllDistricts=Todos los municipios
 
+District.archived=Archivado
 District.epidCode=Código epid
 District.growthRate=Tasa de crecimiento
 District.population=Población
@@ -908,6 +914,7 @@ facilityAllFacilities=Todas las instalaciones
 Facility.NO_FACILITY=Casa u otro lugar
 Facility.OTHER_FACILITY=Otra instalación
 
+Facility.archived=Archivado
 Facility.city=Ciudad
 Facility.community=Área de salud
 Facility.district=Municipio
@@ -1218,6 +1225,7 @@ regionActiveRegions=Provincias activas
 regionArchivedRegions=Provincias archivadas
 regionAllRegions=Todas las provincias
 
+Region.archived=Archivado
 Region.epidCode=Código epid
 Region.growthRate=Tasa de crecimiento
 Region.population=Población

sormas-api/src/main/resources/captions_es-EC.properties

@@ -162,6 +162,7 @@ AggregateReport.pointOfEntry=Punto de arribo
 areaActiveAreas = Active areas
 areaArchivedAreas = Archived areas
 areaAllAreas = All areas
+Area.archived = Archivado
 Area.externalId = External ID
 
 # Bulk actions
@@ -435,6 +436,7 @@ columnDiseaseShort=Enfermedad
 columnNumberOfPendingTasks=Tareas pendientes
 
 # Community
+Community.archived = Archivado
 Community.externalID=Id Externo
 
 communityActiveCommunities=Comunidades activas
@@ -523,6 +525,9 @@ Contact.relationDescription=Descripción de relación
 Contact.relationToCase=Relación con el caso
 Contact.reportDateTime=Fecha de informe
 Contact.reportingUser=Usuario informante
+Contact.reportLat=Latitud GPS del informe
+Contact.reportLon=Longitud GPS del informe
+Contact.reportLatLonAccuracy=Precisión GPS del informe en m
 Contact.resultingCase=Caso resultante
 Contact.resultingCaseUser=Caso resultante asignado por
 Contact.uuid=Id de contacto
@@ -722,6 +727,7 @@ districtActiveDistricts=Distritos activos
 districtArchivedDistricts=Distritos archivados
 districtAllDistricts=Todos los distritos
 
+District.archived=Archivado
 District.epidCode=Código epidemiológico
 District.growthRate=Tasa de crecimiento
 District.population=Población
@@ -908,6 +914,7 @@ facilityAllFacilities=All facilities
 Facility.NO_FACILITY=Hogar u otro lugar
 Facility.OTHER_FACILITY=Other facility
 
+Facility.archived=Archivado
 Facility.city=City
 Facility.community=Community
 Facility.district=District
@@ -1218,6 +1225,7 @@ regionActiveRegions=Regiones activas
 regionArchivedRegions=Regiones archivadas
 regionAllRegions=Todas las regiones
 
+Region.archived=Archivado
 Region.epidCode=Código epidemiológico
 Region.growthRate=Tasa de crecimiento
 Region.population=Población