Skip to content

Commit 69cd399

Browse files
author
Martin Wahnschaffe
committed
[GITFLOW]merging 'release-0.6.0' into 'master'
2 parents f78e5fb + ab5ef85 commit 69cd399

File tree

330 files changed

+20945
-22874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+20945
-22874
lines changed

‎sormas-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>de.symeda.sormas</groupId>
44
<artifactId>sormas-base</artifactId>
5-
<version>0.5.1</version>
5+
<version>0.6.0</version>
66
<relativePath>../sormas-base</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>

‎sormas-api/src/main/java/de/symeda/sormas/api/Disease.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public enum Disease {
99
MEASLES,
1010
YELLOW_FEVER,
1111
DENGUE,
12+
MONKEYPOX,
1213
OTHER
1314
;
1415

@@ -23,4 +24,8 @@ public String toShortString() {
2324
public String getName() {
2425
return this.name();
2526
}
27+
28+
public boolean hasContactFollowUp() {
29+
return this == EVD || this == LASSA || this == AVIAN_INFLUENCA || this == MONKEYPOX || this == OTHER;
30+
}
2631
}

‎sormas-api/src/main/java/de/symeda/sormas/api/I18nProperties.java

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class I18nProperties {
1010

1111
private final Properties fieldCaptionProperties;
1212
private final Properties fieldDescriptionProperties;
13-
private final Properties buttonCaptionProperties;
13+
private final Properties fragmentProperties;
1414
private final Properties enumProperties;
1515

1616
private static I18nProperties getInstance() {
@@ -44,14 +44,32 @@ public static String getEnumCaption(Enum value, String addition) {
4444
/**
4545
* Uses <param>key</param> as default value
4646
*/
47-
public static String getButtonCaption(String key) {
48-
return getButtonCaption(key, key);
47+
public static String getFragment(String key) {
48+
return getFragment(key, key);
4949
}
5050

51-
public static String getButtonCaption(String key, String defaultValue) {
52-
return getInstance().buttonCaptionProperties.getProperty(key, defaultValue);
51+
public static String getFragment(String key, String defaultValue) {
52+
return getInstance().fragmentProperties.getProperty(key, defaultValue);
5353
}
5454

55+
/**
56+
* Uses <param>key</param> as default value
57+
*/
58+
public static String getPrefixFragment(String prefix, String key) {
59+
return getPrefixFragment(prefix, key, key);
60+
}
61+
62+
public static String getPrefixFragment(String prefix, String key, String defaultValue) {
63+
String result = null;
64+
if (prefix != null) {
65+
result = getInstance().fragmentProperties.getProperty(prefix+"."+key);
66+
}
67+
if (result == null) {
68+
result = getFragment(key, defaultValue);
69+
}
70+
return result;
71+
}
72+
5573
/**
5674
* Uses <param>key</param> as default value
5775
*/
@@ -110,7 +128,7 @@ public static String getPrefixFieldDescription(String prefix, String key, String
110128
private I18nProperties() {
111129
fieldCaptionProperties = loadProperties("/fieldCaptions.properties");
112130
fieldDescriptionProperties = loadProperties("/fieldDescriptions.properties");
113-
buttonCaptionProperties = loadProperties("/buttonCaptions.properties");
131+
fragmentProperties = loadProperties("/fragments.properties");
114132
enumProperties = loadProperties("/enum.properties");
115133
}
116134

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class CaseDataDto extends CaseReferenceDto {
4848
public static final String MEASLES_VACCINATION_INFO_SOURCE = "measlesVaccinationInfoSource";
4949
public static final String YELLOW_FEVER_VACCINATION = "yellowFeverVaccination";
5050
public static final String YELLOW_FEVER_VACCINATION_INFO_SOURCE = "yellowFeverVaccinationInfoSource";
51+
public static final String SMALLPOX_VACCINATION_SCAR = "smallpoxVaccinationScar";
5152
public static final String EPID_NUMBER = "epidNumber";
5253
public static final String REPORT_LAT = "reportLat";
5354
public static final String REPORT_LON = "reportLon";
@@ -83,14 +84,18 @@ public class CaseDataDto extends CaseReferenceDto {
8384
private Vaccination yellowFeverVaccination;
8485
@Diseases({Disease.YELLOW_FEVER})
8586
private VaccinationInfoSource yellowFeverVaccinationInfoSource;
87+
@Diseases({Disease.MONKEYPOX})
88+
private YesNoUnknown smallpoxVaccinationScar;
8689

8790
private String epidNumber;
8891

8992
private UserReferenceDto surveillanceOfficer;
9093
private UserReferenceDto caseOfficer;
9194

92-
private Float reportLat;
93-
private Float reportLon;
95+
private Double reportLat;
96+
private Double reportLon;
97+
private Float reportLatLonAccuracy;
98+
9499

95100
public CaseClassification getCaseClassification() {
96101
return caseClassification;
@@ -284,6 +289,14 @@ public void setYellowFeverVaccinationInfoSource(VaccinationInfoSource yellowFeve
284289
this.yellowFeverVaccinationInfoSource = yellowFeverVaccinationInfoSource;
285290
}
286291

292+
public YesNoUnknown getSmallpoxVaccinationScar() {
293+
return smallpoxVaccinationScar;
294+
}
295+
296+
public void setSmallpoxVaccinationScar(YesNoUnknown smallpoxVaccinationScar) {
297+
this.smallpoxVaccinationScar = smallpoxVaccinationScar;
298+
}
299+
287300
public String getEpidNumber() {
288301
return epidNumber;
289302
}
@@ -292,20 +305,28 @@ public void setEpidNumber(String epidNumber) {
292305
this.epidNumber = epidNumber;
293306
}
294307

295-
public Float getReportLat() {
308+
public Double getReportLat() {
296309
return reportLat;
297310
}
298311

299-
public void setReportLat(Float reportLat) {
312+
public void setReportLat(Double reportLat) {
300313
this.reportLat = reportLat;
301314
}
302315

303-
public Float getReportLon() {
316+
public Double getReportLon() {
304317
return reportLon;
305318
}
306319

307-
public void setReportLon(Float reportLon) {
320+
public void setReportLon(Double reportLon) {
308321
this.reportLon = reportLon;
309322
}
310323

324+
public Float getReportLatLonAccuracy() {
325+
return reportLatLonAccuracy;
326+
}
327+
328+
public void setReportLatLonAccuracy(Float reportLatLonAccuracy) {
329+
this.reportLatLonAccuracy = reportLatLonAccuracy;
330+
}
331+
311332
}

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
import de.symeda.sormas.api.Disease;
1010
import de.symeda.sormas.api.facility.FacilityReferenceDto;
1111
import de.symeda.sormas.api.region.CommunityReferenceDto;
12+
import de.symeda.sormas.api.region.DistrictReferenceDto;
1213
import de.symeda.sormas.api.region.RegionReferenceDto;
1314
import de.symeda.sormas.api.user.UserReferenceDto;
15+
import de.symeda.sormas.api.utils.EpiWeek;
1416

1517
@Remote
1618
public interface CaseFacade {
@@ -19,8 +21,8 @@ public interface CaseFacade {
1921

2022
List<CaseDataDto> getAllCasesByDisease(Disease disease, String userUuid);
2123

22-
List<CaseDataDto> getAllCasesBetween(Date fromDate, Date toDate, Disease disease, String userUuid);
23-
24+
List<CaseDataDto> getAllCasesBetween(Date fromDate, Date toDate, DistrictReferenceDto districtRef, Disease disease, String userUuid);
25+
2426
CaseDataDto getCaseDataByUuid(String uuid);
2527

2628
CaseDataDto saveCase(CaseDataDto dto);

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,20 @@ public class ContactDto extends ContactReferenceDto {
3737
private Date lastContactDate;
3838
private ContactProximity contactProximity;
3939
private ContactClassification contactClassification;
40-
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA})
40+
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA,Disease.MONKEYPOX,Disease.OTHER})
4141
private FollowUpStatus followUpStatus;
42-
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA})
42+
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA,Disease.MONKEYPOX,Disease.OTHER})
4343
private String followUpComment;
44-
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA})
44+
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA,Disease.MONKEYPOX,Disease.OTHER})
4545
private Date followUpUntil;
46-
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA})
46+
@Diseases({Disease.EVD,Disease.LASSA,Disease.CHOLERA,Disease.MONKEYPOX,Disease.OTHER})
4747
private UserReferenceDto contactOfficer;
4848
private String description;
4949
private ContactRelation relationToCase;
50-
private Float reportLat;
51-
private Float reportLon;
52-
50+
private Double reportLat;
51+
private Double reportLon;
52+
private Float reportLatLonAccuracy;
53+
5354
public PersonReferenceDto getPerson() {
5455
return person;
5556
}
@@ -123,16 +124,16 @@ public ContactRelation getRelationToCase() {
123124
public void setRelationToCase(ContactRelation relationToCase) {
124125
this.relationToCase = relationToCase;
125126
}
126-
public Float getReportLat() {
127+
public Double getReportLat() {
127128
return reportLat;
128129
}
129-
public void setReportLat(Float reportLat) {
130+
public void setReportLat(Double reportLat) {
130131
this.reportLat = reportLat;
131132
}
132-
public Float getReportLon() {
133+
public Double getReportLon() {
133134
return reportLon;
134135
}
135-
public void setReportLon(Float reportLon) {
136+
public void setReportLon(Double reportLon) {
136137
this.reportLon = reportLon;
137138
}
138139
public String getFollowUpComment() {
@@ -141,5 +142,11 @@ public String getFollowUpComment() {
141142
public void setFollowUpComment(String followUpComment) {
142143
this.followUpComment = followUpComment;
143144
}
145+
public Float getReportLatLonAccuracy() {
146+
return reportLatLonAccuracy;
147+
}
148+
public void setReportLatLonAccuracy(Float reportLatLonAccuracy) {
149+
this.reportLatLonAccuracy = reportLatLonAccuracy;
150+
}
144151

145152
}

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactFacade.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77

88
import de.symeda.sormas.api.Disease;
99
import de.symeda.sormas.api.caze.CaseReferenceDto;
10+
import de.symeda.sormas.api.region.DistrictReferenceDto;
1011
import de.symeda.sormas.api.user.UserReferenceDto;
12+
import de.symeda.sormas.api.utils.EpiWeek;
1113

1214
@Remote
1315
public interface ContactFacade {
1416

1517
List<ContactDto> getAllContactsAfter(Date date, String userUuid);
1618

17-
List<ContactDto> getFollowUpBetween(Date fromDate, Date toDate, Disease disease, String userUuid);
19+
List<ContactDto> getFollowUpBetween(Date fromDate, Date toDate, DistrictReferenceDto districtRef, Disease disease, String userUuid);
1820

1921
List<ContactDto> getAllByCase(CaseReferenceDto caseRef);
2022

@@ -38,5 +40,5 @@ public interface ContactFacade {
3840

3941
List<ContactDto> getByUuids(List<String> uuids);
4042

41-
List<ContactMapDto> getMapContacts(Date fromDate, Date toDate, Disease disease, String userUuid);
43+
List<ContactMapDto> getMapContacts(Date fromDate, Date toDate, DistrictReferenceDto districtRef, Disease disease, String userUuid);
4244
}

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactMapDto.java

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,57 @@
11
package de.symeda.sormas.api.contact;
22

3-
import java.util.Date;
3+
import de.symeda.sormas.api.visit.VisitReferenceDto;
44

55
public class ContactMapDto extends ContactReferenceDto {
66

77
private static final long serialVersionUID = -7764607075875188799L;
88

99
public static final String I18N_PREFIX = "Contact";
1010

11-
public static final String LAST_VISIT_DATE_TIME = "lastVisitDateTime";
11+
public static final String LAST_VISIT = "lastVisit";
12+
public static final String CONTACT_CLASSIFICATION = "contactClassification";
1213
public static final String REPORT_LAT = "reportLat";
1314
public static final String REPORT_LON = "reportLon";
1415

15-
private Date lastVisitDateTime;
16-
private Float reportLat;
17-
private Float reportLon;
16+
private VisitReferenceDto lastVisit;
17+
private ContactClassification contactClassification;
18+
private Double reportLat;
19+
private Double reportLon;
20+
private Float reportLatLonAccuracy;
1821

19-
public Date getLastVisitDateTime() {
20-
return lastVisitDateTime;
22+
public VisitReferenceDto getLastVisit() {
23+
return lastVisit;
2124
}
22-
public void setLastVisitDateTime(Date lastVisitDateTime) {
23-
this.lastVisitDateTime = lastVisitDateTime;
25+
public void setLastVisit(VisitReferenceDto lastVisit) {
26+
this.lastVisit = lastVisit;
27+
}
28+
29+
public ContactClassification getContactClassification() {
30+
return contactClassification;
31+
}
32+
public void setContactClassification(ContactClassification contactClassification) {
33+
this.contactClassification = contactClassification;
2434
}
2535

26-
public Float getReportLat() {
36+
public Double getReportLat() {
2737
return reportLat;
2838
}
29-
public void setReportLat(Float reportLat) {
39+
public void setReportLat(Double reportLat) {
3040
this.reportLat = reportLat;
3141
}
3242

33-
public Float getReportLon() {
43+
public Double getReportLon() {
3444
return reportLon;
3545
}
36-
public void setReportLon(Float reportLon) {
46+
public void setReportLon(Double reportLon) {
3747
this.reportLon = reportLon;
3848
}
49+
50+
public Float getReportLatLonAccuracy() {
51+
return reportLatLonAccuracy;
52+
}
53+
public void setReportLatLonAccuracy(Float reportLatLonAccuracy) {
54+
this.reportLatLonAccuracy = reportLatLonAccuracy;
55+
}
3956

4057
}

‎sormas-api/src/main/java/de/symeda/sormas/api/epidata/AnimalCondition.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package de.symeda.sormas.api.epidata;
2+
3+
import de.symeda.sormas.api.I18nProperties;
4+
5+
public enum AnimalCondition {
6+
7+
ALIVE,
8+
DEAD,
9+
PROCESSED,
10+
UNKNOWN;
11+
12+
public String toString() {
13+
return I18nProperties.getEnumCaption(this);
14+
}
15+
16+
}

0 commit comments

Comments
 (0)