Merge branch 'development' into feature-2527-CampaignDashboard

Author: barnabartha

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseExportDto.java

@@ -45,7 +45,6 @@
 import de.symeda.sormas.api.person.Sex;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.symptoms.SymptomsDto;
-import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.api.utils.HideForCountriesExcept;
 import de.symeda.sormas.api.utils.Order;
 import de.symeda.sormas.api.utils.PersonalData;
@@ -186,10 +185,10 @@ public class CaseExportDto implements Serializable {
 	private int numberOfPrescriptions;
 	private int numberOfTreatments;
 	private int numberOfClinicalVisits;
-	private CaseExportSampleDto sample1 = new CaseExportSampleDto();
-	private CaseExportSampleDto sample2 = new CaseExportSampleDto();
-	private CaseExportSampleDto sample3 = new CaseExportSampleDto();
-	private List<CaseExportSampleDto> otherSamples = new ArrayList<>();
+	private EmbeddedSampleExportDto sample1 = new EmbeddedSampleExportDto();
+	private EmbeddedSampleExportDto sample2 = new EmbeddedSampleExportDto();
+	private EmbeddedSampleExportDto sample3 = new EmbeddedSampleExportDto();
+	private List<EmbeddedSampleExportDto> otherSamples = new ArrayList<>();
 
 	private QuarantineType quarantine;
 	@SensitiveData
@@ -1104,7 +1103,7 @@ public int getNumberOfClinicalVisits() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public Date getSampleDateTime1() {
-		return sample1.dateTime;
+		return sample1.getDateTime();
 	}
 
 	@Order(121)
@@ -1113,7 +1112,7 @@ public Date getSampleDateTime1() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public String getSampleLab1() {
-		return sample1.lab;
+		return sample1.getLab();
 	}
 
 	@Order(122)
@@ -1122,7 +1121,7 @@ public String getSampleLab1() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public PathogenTestResultType getSampleResult1() {
-		return sample1.result;
+		return sample1.getResult();
 	}
 
 	@Order(123)
@@ -1131,7 +1130,7 @@ public PathogenTestResultType getSampleResult1() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public Date getSampleDateTime2() {
-		return sample2.dateTime;
+		return sample2.getDateTime();
 	}
 
 	@Order(124)
@@ -1140,7 +1139,7 @@ public Date getSampleDateTime2() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public String getSampleLab2() {
-		return sample2.lab;
+		return sample2.getLab();
 	}
 
 	@Order(125)
@@ -1149,7 +1148,7 @@ public String getSampleLab2() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public PathogenTestResultType getSampleResult2() {
-		return sample2.result;
+		return sample2.getResult();
 	}
 
 	@Order(126)
@@ -1158,7 +1157,7 @@ public PathogenTestResultType getSampleResult2() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public Date getSampleDateTime3() {
-		return sample3.dateTime;
+		return sample3.getDateTime();
 	}
 
 	@Order(127)
@@ -1167,7 +1166,7 @@ public Date getSampleDateTime3() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public String getSampleLab3() {
-		return sample3.lab;
+		return sample3.getLab();
 	}
 
 	@Order(128)
@@ -1176,7 +1175,7 @@ public String getSampleLab3() {
 	@ExportProperty(value = SAMPLE_INFORMATION, combined = true)
 	@ExportGroup(ExportGroupType.ADDITIONAL)
 	public PathogenTestResultType getSampleResult3() {
-		return sample3.result;
+		return sample3.getResult();
 	}
 
 	@Order(130)
@@ -1188,7 +1187,7 @@ public String getOtherSamplesString() {
 		StringBuilder samples = new StringBuilder();
 		String separator = ", ";
 
-		for (CaseExportSampleDto sample : otherSamples) {
+		for (EmbeddedSampleExportDto sample : otherSamples) {
 			samples.append(sample.formatString()).append(separator);
 		}
 
@@ -1457,71 +1456,42 @@ public void setNumberOfClinicalVisits(int numberOfClinicalVisits) {
 		this.numberOfClinicalVisits = numberOfClinicalVisits;
 	}
 
-	public CaseExportSampleDto getSample1() {
+	public EmbeddedSampleExportDto getSample1() {
 		return sample1;
 	}
 
-	public void setSample1(CaseExportSampleDto sample1) {
+	public void setSample1(EmbeddedSampleExportDto sample1) {
 		this.sample1 = sample1;
 	}
 
-	public CaseExportSampleDto getSample2() {
+	public EmbeddedSampleExportDto getSample2() {
 		return sample2;
 	}
 
-	public void setSample2(CaseExportSampleDto sample2) {
+	public void setSample2(EmbeddedSampleExportDto sample2) {
 		this.sample2 = sample2;
 	}
 
-	public CaseExportSampleDto getSample3() {
+	public EmbeddedSampleExportDto getSample3() {
 		return sample3;
 	}
 
-	public void setSample3(CaseExportSampleDto sample3) {
+	public void setSample3(EmbeddedSampleExportDto sample3) {
 		this.sample3 = sample3;
 	}
 
-	public List<CaseExportSampleDto> getOtherSamples() {
+	public List<EmbeddedSampleExportDto> getOtherSamples() {
 		return otherSamples;
 	}
 
-	public void addOtherSample(CaseExportSampleDto otherSample) {
+	public void addOtherSample(EmbeddedSampleExportDto otherSample) {
 		this.otherSamples.add(otherSample);
 	}
 
 	public CaseJurisdictionDto getJurisdiction() {
 		return jurisdiction;
 	}
 
-	public static class CaseExportSampleDto implements Serializable {
-
-		private Date dateTime;
-		@SensitiveData
-		private String lab;
-		private PathogenTestResultType result;
-
-		public CaseExportSampleDto() {
-		}
-
-		public CaseExportSampleDto(Date dateTime, String lab, PathogenTestResultType result) {
-			this.dateTime = dateTime;
-			this.lab = lab;
-			this.result = result;
-		}
-
-		public String formatString() {
-			StringBuilder sb = new StringBuilder();
-
-			sb.append(DateHelper.formatDateForExport(dateTime)).append(" (");
-			if (lab != null && lab.length() > 0) {
-				sb.append(lab).append(", ");
-			}
-			sb.append(result).append(")");
-
-			return sb.toString();
-		}
-	}
-
 	public void setFollowUpStatus(FollowUpStatus followUpStatus) {
 		this.followUpStatus = followUpStatus;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/caze/EmbeddedSampleExportDto.java

@@ -0,0 +1,81 @@
+/*
+ * ******************************************************************************
+ * * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * * Copyright © 2016-2020 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * *
+ * * This program is free software: you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License as published by
+ * * the Free Software Foundation, either version 3 of the License, or
+ * * (at your option) any later version.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * ******************************************************************************
+ */
+
+package de.symeda.sormas.api.caze;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import de.symeda.sormas.api.sample.PathogenTestResultType;
+import de.symeda.sormas.api.utils.DateHelper;
+import de.symeda.sormas.api.utils.SensitiveData;
+
+public class EmbeddedSampleExportDto implements Serializable {
+
+	private Date dateTime;
+	@SensitiveData
+	private String lab;
+	private PathogenTestResultType result;
+
+	public EmbeddedSampleExportDto() {
+	}
+
+	public EmbeddedSampleExportDto(Date dateTime, String lab, PathogenTestResultType result) {
+		this.dateTime = dateTime;
+		this.lab = lab;
+		this.result = result;
+	}
+
+	public String formatString() {
+		StringBuilder sb = new StringBuilder();
+
+		sb.append(DateHelper.formatDateForExport(dateTime)).append(" (");
+		if (lab != null && lab.length() > 0) {
+			sb.append(lab).append(", ");
+		}
+		sb.append(result).append(")");
+
+		return sb.toString();
+	}
+
+	public Date getDateTime() {
+		return dateTime;
+	}
+
+	public void setDateTime(Date dateTime) {
+		this.dateTime = dateTime;
+	}
+
+	public String getLab() {
+		return lab;
+	}
+
+	public void setLab(String lab) {
+		this.lab = lab;
+	}
+
+	public PathogenTestResultType getResult() {
+		return result;
+	}
+
+	public void setResult(PathogenTestResultType result) {
+		this.result = result;
+	}
+}