Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit a3f3618

Browse files
MateStrysewskeMateStrysewske
committed
[GITFLOW]merging 'hotfix-1.51.1' into 'master'
2 parents 54dba9a + 0033255 commit a3f3618

44 files changed

Lines changed: 222 additions & 231 deletions

Some content is hidden

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

‎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>1.51.0</version>
5+
<version>1.51.1</version>
66
<relativePath>../sormas-base</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
4646
public static final String MUST_HAVE_NO_GEO_COORDINATES = "mustHaveNoGeoCoordinates";
4747
public static final String MUST_BE_PORT_HEALTH_CASE_WITHOUT_FACILITY = "mustBePortHealthCaseWithoutFacility";
4848
public static final String MUST_HAVE_CASE_MANAGEMENT_DATA = "mustHaveCaseManagementData";
49-
public static final String EXCLUDE_SHARED_CASES = "excludeSharedCases";
5049
public static final String WITHOUT_RESPONSIBLE_OFFICER = "withoutResponsibleOfficer";
5150
public static final String WITH_EXTENDED_QUARANTINE = "withExtendedQuarantine";
5251
public static final String WITH_REDUCED_QUARANTINE = "withReducedQuarantine";
@@ -102,7 +101,6 @@ public class CaseCriteria extends BaseCriteria implements Cloneable {
102101
private EntityRelevanceStatus relevanceStatus;
103102
private String sourceCaseInfoLike;
104103
private Date quarantineTo;
105-
public Boolean excludeSharedCases;
106104
private Integer birthdateYYYY;
107105
private Integer birthdateMM;
108106
private Integer birthdateDD;
@@ -472,14 +470,6 @@ public void setQuarantineTo(Date quarantineTo) {
472470
this.quarantineTo = quarantineTo;
473471
}
474472

475-
public Boolean getExcludeSharedCases() {
476-
return excludeSharedCases;
477-
}
478-
479-
public void setExcludeSharedCases(Boolean excludeSharedCases) {
480-
this.excludeSharedCases = excludeSharedCases;
481-
}
482-
483473
public Integer getBirthdateYYYY() {
484474
return birthdateYYYY;
485475
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@
5555
import de.symeda.sormas.api.utils.Required;
5656
import de.symeda.sormas.api.utils.SensitiveData;
5757
import de.symeda.sormas.api.utils.YesNoUnknown;
58-
5958
import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
6059
import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
6160
import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LatitudePseudonymizer;
6261
import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.LongitudePseudonymizer;
63-
import java.util.Date;
6462

6563
public class CaseDataDto extends PseudonymizableDto {
6664

@@ -190,7 +188,9 @@ public class CaseDataDto extends PseudonymizableDto {
190188
@EmbeddedPersonalData
191189
private PersonReferenceDto person;
192190
@Outbreaks
193-
@HideForCountries()
191+
@HideForCountries(countries = {
192+
COUNTRY_CODE_GERMANY,
193+
COUNTRY_CODE_SWITZERLAND })
194194
private String epidNumber;
195195
@Outbreaks
196196
@Required
@@ -362,7 +362,9 @@ public class CaseDataDto extends PseudonymizableDto {
362362
private String pointOfEntryDetails;
363363
@SensitiveData
364364
private String additionalDetails;
365-
@HideForCountriesExcept
365+
@HideForCountriesExcept(countries = {
366+
COUNTRY_CODE_GERMANY,
367+
COUNTRY_CODE_SWITZERLAND })
366368
private String externalID;
367369
private boolean sharedToCountry;
368370
private QuarantineType quarantine;

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ public class CaseExportDto implements Serializable {
236236
private String latestEventId;
237237
private String latestEventTitle;
238238
private EventStatus latestEventStatus;
239+
private String externalID;
239240

240241
//@formatter:off
241242
public CaseExportDto(long id, long personId, long personAddressId, long epiDataId, long symptomsId,
@@ -263,7 +264,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
263264
//Date onsetDate,
264265
Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
265266
VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
266-
long eventCount) {
267+
long eventCount, String externalID) {
267268
//@formatter:on
268269

269270
this.id = id;
@@ -340,6 +341,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
340341
this.followUpStatus = followUpStatus;
341342
this.followUpUntil = followUpUntil;
342343
this.eventCount = eventCount;
344+
this.externalID = externalID;
343345

344346
jurisdiction = new CaseJurisdictionDto(reportingUserUuid, regionUuid, districtUuid, communityUuid, healthFacilityUuid, pointOfEntryUuid);
345347
}
@@ -417,6 +419,16 @@ public String getEpidNumber() {
417419
}
418420

419421
@Order(4)
422+
@ExportTarget(caseExportTypes = {
423+
CaseExportType.CASE_SURVEILLANCE,
424+
CaseExportType.CASE_MANAGEMENT })
425+
@ExportProperty(CaseDataDto.EXTERNAL_ID)
426+
@ExportGroup(ExportGroupType.CORE)
427+
public String getExternalID() {
428+
return externalID;
429+
}
430+
431+
@Order(5)
420432
@ExportTarget(caseExportTypes = {
421433
CaseExportType.CASE_SURVEILLANCE,
422434
CaseExportType.CASE_MANAGEMENT })
@@ -1620,4 +1632,8 @@ public void setLatestEventTitle(String latestEventTitle) {
16201632
public void setLatestEventStatus(EventStatus latestEventStatus) {
16211633
this.latestEventStatus = latestEventStatus;
16221634
}
1635+
1636+
public void setExternalID(String externalID) {
1637+
this.externalID = externalID;
1638+
}
16231639
}

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public class ContactDto extends PseudonymizableDto {
111111
public static final String HEALTH_CONDITIONS = "healthConditions";
112112
public static final String END_OF_QUARANTINE_REASON = "endOfQuarantineReason";
113113
public static final String END_OF_QUARANTINE_REASON_DETAILS = "endOfQuarantineReasonDetails";
114-
public static final String RETURNING_TRAVELER = "returningTraveler";
114+
public static final String RETURNING_TRAVELER = "returningTraveler";
115115

116116
private CaseReferenceDto caze;
117117
private String caseIdExternalSystem;
@@ -164,6 +164,9 @@ public class ContactDto extends PseudonymizableDto {
164164
private ContactRelation relationToCase;
165165
@SensitiveData
166166
private String relationDescription;
167+
@HideForCountriesExcept(countries = {
168+
COUNTRY_CODE_GERMANY,
169+
COUNTRY_CODE_SWITZERLAND })
167170
private String externalID;
168171

169172
private boolean highPriority;
@@ -754,7 +757,7 @@ public HealthConditionsDto getHealthConditions() {
754757
public void setHealthConditions(HealthConditionsDto healthConditions) {
755758
this.healthConditions = healthConditions;
756759
}
757-
760+
758761
public SormasToSormasOriginInfoDto getSormasToSormasOriginInfo() {
759762
return sormasToSormasOriginInfo;
760763
}
@@ -787,11 +790,11 @@ public void setEndOfQuarantineReasonDetails(String endOfQuarantineReasonDetails)
787790
this.endOfQuarantineReasonDetails = endOfQuarantineReasonDetails;
788791
}
789792

790-
public YesNoUnknown getReturningTraveler() {
793+
public YesNoUnknown getReturningTraveler() {
791794
return returningTraveler;
792795
}
793796

794797
public void setReturningTraveler(YesNoUnknown returningTraveler) {
795798
this.returningTraveler = returningTraveler;
796-
}
799+
}
797800
}

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public class ContactExportDto implements Serializable {
139139
private final Long eventCount;
140140
private String latestEventId;
141141
private String latestEventTitle;
142+
private String externalID;
142143

143144
//@formatter:off
144145
public ContactExportDto(long id, long personId, String uuid, String sourceCaseUuid, CaseClassification caseClassification, Disease disease, String diseaseDetails,
@@ -156,7 +157,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
156157
String phone, String phoneOwner, OccupationType occupationType, String occupationDetails,
157158
String region, String district, String community,
158159
long epiDataId, YesNoUnknown traveled, YesNoUnknown burialAttended, YesNoUnknown directContactConfirmedCase, YesNoUnknown directContactProbableCase,
159-
YesNoUnknown contactWithRodent, YesNoUnknown returningTraveler, long eventCount,
160+
YesNoUnknown contactWithRodent, YesNoUnknown returningTraveler, long eventCount, String externalID,
160161
String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
161162
String caseReportingUserUuid, String caseRegionUui, String caseDistrictUud, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid
162163
) {
@@ -222,6 +223,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
222223
this.contactWithRodent = contactWithRodent;
223224
this.returningTraveler = returningTraveler;
224225
this.eventCount = eventCount;
226+
this.externalID = externalID;
225227

226228
CaseJurisdictionDto caseJurisdiction = caseReportingUserUuid != null
227229
? null
@@ -261,26 +263,31 @@ public String getUuid() {
261263
}
262264

263265
@Order(1)
266+
public String getExternalID() {
267+
return externalID;
268+
}
269+
270+
@Order(2)
264271
public String getSourceCaseUuid() {
265272
return sourceCaseUuid;
266273
}
267274

268-
@Order(2)
275+
@Order(3)
269276
public CaseClassification getCaseClassification() {
270277
return caseClassification;
271278
}
272279

273-
@Order(3)
280+
@Order(4)
274281
public String getDisease() {
275282
return disease;
276283
}
277284

278-
@Order(4)
285+
@Order(5)
279286
public ContactClassification getContactClassification() {
280287
return contactClassification;
281288
}
282289

283-
@Order(5)
290+
@Order(6)
284291
public Date getLastContactDate() {
285292
return lastContactDate;
286293
}
@@ -325,7 +332,7 @@ public String getDistrict() {
325332
return district;
326333
}
327334

328-
@Order(17)
335+
@Order(18)
329336
public String getCommunity() {
330337
return community;
331338
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
5757
Date followUpUntil, SymptomJournalStatus symptomJournalStatus, String contactOfficerUuid, String reportingUserUuid, Date reportDateTime,
5858
CaseClassification caseClassification,
5959
String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid,
60-
String caseHealthFacilityUuid, String casePointOfEntryUuid, Date changeDate,
60+
String caseHealthFacilityUuid, String casePointOfEntryUuid, Date changeDate, String externalID,
6161
Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
6262
String districtName, String city, String street, String houseNumber, String postalCode, String phone,
6363
String reportingUserFirstName, String reportingUserLastName, int visitCount, long eventCount
@@ -68,7 +68,7 @@ public ContactIndexDetailedDto(String uuid, String personFirstName, String perso
6868
super(uuid, personFirstName, personLastName, cazeUuid, disease, diseaseDetails, caseFirstName, caseLastName, regionUuid, districtUuid, communityUuid,
6969
lastContactDate, contactCategory, contactProximity, contactClassification, contactStatus, followUpStatus, followUpUntil, symptomJournalStatus,
7070
contactOfficerUuid, reportingUserUuid, reportDateTime, caseClassification,
71-
caseReportingUserUid, caseRegionUuid, caseDistrictUud, caseCommunityUuid, caseHealthFacilityUuid, casePointOfEntryUuid, changeDate, visitCount);
71+
caseReportingUserUid, caseRegionUuid, caseDistrictUud, caseCommunityUuid, caseHealthFacilityUuid, casePointOfEntryUuid, changeDate, externalID, visitCount);
7272
//@formatter:on
7373

7474
this.sex = sex;

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements Serializ
5050
public static final String CONTACT_OFFICER_UUID = "contactOfficerUuid";
5151
public static final String CONTACT_CATEGORY = "contactCategory";
5252
public static final String CASE_CLASSIFICATION = "caseClassification";
53+
public static final String EXTERNAL_ID = "externalID";
5354

5455
private String uuid;
5556
@PersonalData
@@ -71,6 +72,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements Serializ
7172
private ContactCategory contactCategory;
7273
private CaseClassification caseClassification;
7374
private int visitCount;
75+
private String externalID;
7476

7577
private ContactJurisdictionDto jurisdiction;
7678
private CaseJurisdictionDto caseJurisdiction;
@@ -84,6 +86,7 @@ public ContactIndexDto(String uuid, String personFirstName, String personLastNam
8486
CaseClassification caseClassification,
8587
String caseReportingUserUid, String caseRegionUuid, String caseDistrictUud, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid,
8688
Date changeDate, // XXX: unused, only here for TypedQuery mapping
89+
String externalID,
8790
int visitCount) {
8891
//@formatter:on
8992

@@ -116,6 +119,7 @@ public ContactIndexDto(String uuid, String personFirstName, String personLastNam
116119
this.reportDateTime = reportDateTime;
117120
this.caseClassification = caseClassification;
118121
this.visitCount = visitCount;
122+
this.externalID = externalID;
119123

120124
this.jurisdiction = new ContactJurisdictionDto(reportingUserUuid, regionUuid, districtUuid, communityUuid, caseJurisdiction);
121125
}
@@ -268,6 +272,14 @@ public void setVisitCount(int visitCount) {
268272
this.visitCount = visitCount;
269273
}
270274

275+
public String getExternalID() {
276+
return externalID;
277+
}
278+
279+
public void setExternalID(String externalID) {
280+
this.externalID = externalID;
281+
}
282+
271283
public ContactReferenceDto toReference() {
272284
return new ContactReferenceDto(uuid);
273285
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ caseCasesList=Fall-Liste
227227
caseInfrastructureDataChanged=Infrastrukturdaten wurden geändert
228228
caseCloneCaseWithNewDisease=Neuen Fall erstellen für
229229
caseContacts=Kontakte
230-
caseDocuments=Falldokumente
230+
caseDocuments=Dokumente
231231
caseEditData=Daten bearbeiten
232232
caseEvents=Ereignisse
233233
caseEventsResetDateFilter=Datumsfilter zurücksetzen
@@ -858,9 +858,9 @@ EpiData.snakes=Schlangen
858858
DocumentTemplate=Dokumentvorlage
859859
DocumentTemplate.documentTemplateGuide=Dokumentvorlagen-Anleitung
860860
DocumentTemplate.plural=Dokumentvorlagen
861-
DocumentTemplate.QuarantineOrder=Bescheid
862-
DocumentTemplate.QuarantineOrder.create=Bescheid erstellen
863-
DocumentTemplate.QuarantineOrder.templates=Bescheid Vorlagen
861+
DocumentTemplate.QuarantineOrder=Isolations-/Quarantänebescheid
862+
DocumentTemplate.QuarantineOrder.create=Isolations-/Quarantänebescheid erstellen
863+
DocumentTemplate.QuarantineOrder.templates=Isolations-/Quarantänebescheid-Vorlagen
864864
DocumentTemplate.uploadTemplate=Vorlage hochladen
865865
DocumentTemplate.exampleTemplateLibreOffice=Beispielvorlage LibreOffice
866866
DocumentTemplate.exampleTemplateWord=Beispielvorlage Microsoft Word

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -858,9 +858,9 @@ EpiData.snakes=Schlangen
858858
DocumentTemplate=Dokumentvorlage
859859
DocumentTemplate.documentTemplateGuide=Dokumentvorlagen-Anleitung
860860
DocumentTemplate.plural=Dokumentvorlagen
861-
DocumentTemplate.QuarantineOrder=Bescheid
862-
DocumentTemplate.QuarantineOrder.create=Bescheid erstellen
863-
DocumentTemplate.QuarantineOrder.templates=Bescheid Vorlagen
861+
DocumentTemplate.QuarantineOrder=Isolations-/Quarantänebescheid
862+
DocumentTemplate.QuarantineOrder.create=Isolations-/Quarantänebescheid erstellen
863+
DocumentTemplate.QuarantineOrder.templates=Isolations-/Quarantänebescheid-Vorlagen
864864
DocumentTemplate.uploadTemplate=Vorlage hochladen
865865
DocumentTemplate.exampleTemplateLibreOffice=Beispielvorlage LibreOffice
866866
DocumentTemplate.exampleTemplateWord=Beispielvorlage Microsoft Word

0 commit comments

Comments
 (0)