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

Commit 7d34822

Browse files
author
FredrikSchäferVitagroup
committed
Merge remote-tracking branch 'origin/development' into feature-3488-LabMessage_UI
# Conflicts: # sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageService.java
2 parents aa32b36 + b025187 commit 7d34822

279 files changed

Lines changed: 2597 additions & 997 deletions

File tree

Some content is hidden

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

‎sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignJurisdictionLevel.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package de.symeda.sormas.api.campaign;
2+
3+
import de.symeda.sormas.api.i18n.I18nProperties;
4+
import de.symeda.sormas.api.user.JurisdictionLevel;
5+
6+
public enum CampaignJurisdictionLevel {
7+
8+
AREA,
9+
REGION,
10+
DISTRICT,
11+
COMMUNITY;
12+
13+
public static CampaignJurisdictionLevel getByJurisdictionLevel(JurisdictionLevel jurisdictionLevel) {
14+
switch (jurisdictionLevel) {
15+
16+
case NATION:
17+
case NONE:
18+
return AREA;
19+
case REGION:
20+
return REGION;
21+
case DISTRICT:
22+
return DISTRICT;
23+
case COMMUNITY:
24+
return COMMUNITY;
25+
default:
26+
throw new UnsupportedOperationException();
27+
}
28+
}
29+
30+
public String toString() {
31+
return I18nProperties.getEnumCaption(this);
32+
}
33+
}

‎sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDiagramCriteria.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.Serializable;
44

55
import de.symeda.sormas.api.BaseCriteria;
6+
import de.symeda.sormas.api.campaign.CampaignJurisdictionLevel;
67
import de.symeda.sormas.api.campaign.CampaignReferenceDto;
78
import de.symeda.sormas.api.region.AreaReferenceDto;
89
import de.symeda.sormas.api.region.DistrictReferenceDto;
@@ -14,12 +15,19 @@ public class CampaignDiagramCriteria extends BaseCriteria implements Serializabl
1415
private AreaReferenceDto area;
1516
private RegionReferenceDto region;
1617
private DistrictReferenceDto district;
18+
private CampaignJurisdictionLevel campaignJurisdictionLevelGroupBy;
1719

18-
public CampaignDiagramCriteria(CampaignReferenceDto campaign, AreaReferenceDto area, RegionReferenceDto region, DistrictReferenceDto district) {
20+
public CampaignDiagramCriteria(
21+
CampaignReferenceDto campaign,
22+
AreaReferenceDto area,
23+
RegionReferenceDto region,
24+
DistrictReferenceDto district,
25+
CampaignJurisdictionLevel campaignJurisdictionLevelGroupBy) {
1926
this.campaign = campaign;
2027
this.area = area;
2128
this.region = region;
2229
this.district = district;
30+
this.campaignJurisdictionLevelGroupBy = campaignJurisdictionLevelGroupBy;
2331
}
2432

2533
public CampaignReferenceDto getCampaign() {
@@ -53,4 +61,12 @@ public DistrictReferenceDto getDistrict() {
5361
public void setDistrict(DistrictReferenceDto district) {
5462
this.district = district;
5563
}
64+
65+
public CampaignJurisdictionLevel getCampaignJurisdictionLevelGroupBy() {
66+
return campaignJurisdictionLevelGroupBy;
67+
}
68+
69+
public void setCampaignJurisdictionLevelGroupBy(CampaignJurisdictionLevel campaignJurisdictionLevelGroupBy) {
70+
this.campaignJurisdictionLevelGroupBy = campaignJurisdictionLevelGroupBy;
71+
}
5672
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ public class CaseDataDto extends PseudonymizableDto {
172172
public static final String PROHIBITION_TO_WORK_FROM = "prohibitionToWorkFrom";
173173
public static final String PROHIBITION_TO_WORK_UNTIL = "prohibitionToWorkUntil";
174174

175+
public static final String REPORTING_DISTRICT = "reportingDistrict";
176+
175177
// Fields are declared in the order they should appear in the import template
176178

177179
@Outbreaks
@@ -421,6 +423,7 @@ public class CaseDataDto extends PseudonymizableDto {
421423
COUNTRY_CODE_GERMANY,
422424
COUNTRY_CODE_SWITZERLAND })
423425
private Date quarantineOfficialOrderSentDate;
426+
@HideForCountriesExcept
424427
private ReportingType reportingType;
425428
private YesNoUnknown postpartum;
426429
private Trimester trimester;
@@ -462,6 +465,9 @@ public class CaseDataDto extends PseudonymizableDto {
462465
@HideForCountriesExcept
463466
private Date prohibitionToWorkUntil;
464467

468+
@HideForCountriesExcept
469+
private DistrictReferenceDto reportingDistrict;
470+
465471
public static CaseDataDto build(PersonReferenceDto person, Disease disease) {
466472
return build(person, disease, null);
467473
}
@@ -1360,6 +1366,14 @@ public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
13601366
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
13611367
}
13621368

1369+
public DistrictReferenceDto getReportingDistrict() {
1370+
return reportingDistrict;
1371+
}
1372+
1373+
public void setReportingDistrict(DistrictReferenceDto reportingDistrict) {
1374+
this.reportingDistrict = reportingDistrict;
1375+
}
1376+
13631377
public boolean isOwnershipHandedOver() {
13641378
return ownershipHandedOver;
13651379
}

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ public class CaseExportDto implements Serializable {
256256
private String birthCountry;
257257
private String citizenship;
258258

259+
private String reportingDistrict;
260+
259261
//@formatter:off
260262
public CaseExportDto(long id, long personId, long personAddressId, long epiDataId, long symptomsId,
261263
long hospitalizationId, long districtId, long healthConditionsId, String uuid, String epidNumber,
@@ -283,7 +285,8 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
283285
Vaccination vaccination, String vaccinationDoses, Date vaccinationDate,
284286
VaccinationInfoSource vaccinationInfoSource, YesNoUnknown postpartum, Trimester trimester,
285287
long eventCount, String externalID,
286-
String birthName, String birthCountryIsoCode, String birthCountryName, String citizenshipIsoCode, String citizenshipCountryName) {
288+
String birthName, String birthCountryIsoCode, String birthCountryName, String citizenshipIsoCode, String citizenshipCountryName,
289+
String reportingDistrict) {
287290
//@formatter:on
288291

289292
this.id = id;
@@ -366,6 +369,7 @@ public CaseExportDto(long id, long personId, long personAddressId, long epiDataI
366369
this.birthName = birthName;
367370
this.birthCountry = I18nProperties.getCountryName(birthCountryIsoCode, birthCountryName);
368371
this.citizenship = I18nProperties.getCountryName(citizenshipIsoCode, citizenshipCountryName);
372+
this.reportingDistrict = reportingDistrict;
369373

370374
jurisdiction = new CaseJurisdictionDto(reportingUserUuid, regionUuid, districtUuid, communityUuid, healthFacilityUuid, pointOfEntryUuid);
371375
}
@@ -1448,6 +1452,17 @@ public String getCitizenship() {
14481452
return citizenship;
14491453
}
14501454

1455+
@Order(153)
1456+
@ExportTarget(caseExportTypes = {
1457+
CaseExportType.CASE_SURVEILLANCE,
1458+
CaseExportType.CASE_MANAGEMENT })
1459+
@ExportProperty(CaseDataDto.REPORTING_DISTRICT)
1460+
@ExportGroup(ExportGroupType.ADDITIONAL)
1461+
@HideForCountriesExcept
1462+
public String getReportingDistrict() {
1463+
return reportingDistrict;
1464+
}
1465+
14511466
public void setCountry(String country) {
14521467
this.country = country;
14531468
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ public class ContactDto extends PseudonymizableDto {
120120
public static final String PROHIBITION_TO_WORK_FROM = "prohibitionToWorkFrom";
121121
public static final String PROHIBITION_TO_WORK_UNTIL = "prohibitionToWorkUntil";
122122

123+
public static final String REPORTING_DISTRICT = "reportingDistrict";
124+
123125
private CaseReferenceDto caze;
124126
private String caseIdExternalSystem;
125127
@SensitiveData
@@ -263,6 +265,9 @@ public class ContactDto extends PseudonymizableDto {
263265
@HideForCountriesExcept
264266
private Date prohibitionToWorkUntil;
265267

268+
@HideForCountriesExcept
269+
private DistrictReferenceDto reportingDistrict;
270+
266271
public static ContactDto build() {
267272
final ContactDto contact = new ContactDto();
268273
contact.setUuid(DataHelper.createUuid());
@@ -857,6 +862,14 @@ public void setProhibitionToWorkUntil(Date prohibitionToWorkUntil) {
857862
this.prohibitionToWorkUntil = prohibitionToWorkUntil;
858863
}
859864

865+
public DistrictReferenceDto getReportingDistrict() {
866+
return reportingDistrict;
867+
}
868+
869+
public void setReportingDistrict(DistrictReferenceDto reportingDistrict) {
870+
this.reportingDistrict = reportingDistrict;
871+
}
872+
860873
public YesNoUnknown getReturningTraveler() {
861874
return returningTraveler;
862875
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ public class ContactExportDto implements Serializable {
154154
private String birthCountry;
155155
private String citizenship;
156156

157+
private String reportingDistrict;
158+
157159
//@formatter:off
158160
public ContactExportDto(long id, long personId, String uuid, String sourceCaseUuid, CaseClassification caseClassification, Disease disease, String diseaseDetails,
159161
ContactClassification contactClassification, Date lastContactDate, String firstName, String lastName,
@@ -172,6 +174,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
172174
String region, String district, String community,
173175
long epiDataId, YesNoUnknown contactWithSourceCaseKnown, YesNoUnknown returningTraveler, String externalID,
174176
String birthName, String birthCountryIsoCode, String birthCountryName, String citizenshipIsoCode, String citizenshipCountryName,
177+
String reportingDistrict,
175178
String reportingUserUuid, String regionUuid, String districtUuid, String communityUuid,
176179
String caseReportingUserUuid, String caseRegionUuid, String caseDistrictUuid, String caseCommunityUuid, String caseHealthFacilityUuid, String casePointOfEntryUuid
177180
) {
@@ -239,6 +242,7 @@ public ContactExportDto(long id, long personId, String uuid, String sourceCaseUu
239242
this.birthName = birthName;
240243
this.birthCountry = I18nProperties.getCountryName(birthCountryIsoCode, birthCountryName);
241244
this.citizenship = I18nProperties.getCountryName(citizenshipIsoCode, citizenshipCountryName);
245+
this.reportingDistrict = reportingDistrict;
242246

243247
CaseJurisdictionDto caseJurisdiction = caseReportingUserUuid != null
244248
? null
@@ -662,6 +666,12 @@ public String getCitizenship() {
662666
return citizenship;
663667
}
664668

669+
@Order(83)
670+
@HideForCountriesExcept
671+
public String getReportingDistrict() {
672+
return reportingDistrict;
673+
}
674+
665675
public void setEventCount(Long eventCount) {
666676
this.eventCount = eventCount;
667677
}

‎sormas-api/src/main/java/de/symeda/sormas/api/event/EventDto.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public class EventDto extends PseudonymizableDto {
5555
public static final String TYPE_OF_PLACE = "typeOfPlace";
5656
public static final String MEANS_OF_TRANSPORT = "meansOfTransport";
5757
public static final String MEANS_OF_TRANSPORT_DETAILS = "meansOfTransportDetails";
58+
public static final String CONNECTION_NUMBER = "connectionNumber";
59+
public static final String SEAT_NUMBER = "seatNumber";
60+
public static final String TRAVEL_DATE = "travelDate";
5861
public static final String SRC_TYPE = "srcType";
5962
public static final String SRC_INSTITUTIONAL_PARTNER_TYPE = "srcInstitutionalPartnerType";
6063
public static final String SRC_INSTITUTIONAL_PARTNER_TYPE_DETAILS = "srcInstitutionalPartnerTypeDetails";
@@ -93,6 +96,12 @@ public class EventDto extends PseudonymizableDto {
9396
private TypeOfPlace typeOfPlace;
9497
private MeansOfTransport meansOfTransport;
9598
private String meansOfTransportDetails;
99+
@SensitiveData
100+
private String connectionNumber;
101+
@SensitiveData
102+
private String seatNumber;
103+
private Date travelDate;
104+
96105
private EventSourceType srcType;
97106
private InstitutionalPartnerType srcInstitutionalPartnerType;
98107
private String srcInstitutionalPartnerTypeDetails;
@@ -260,6 +269,30 @@ public void setMeansOfTransportDetails(String meansOfTransportDetails) {
260269
this.meansOfTransportDetails = meansOfTransportDetails;
261270
}
262271

272+
public String getConnectionNumber() {
273+
return connectionNumber;
274+
}
275+
276+
public void setConnectionNumber(String connectionNumber) {
277+
this.connectionNumber = connectionNumber;
278+
}
279+
280+
public String getSeatNumber() {
281+
return seatNumber;
282+
}
283+
284+
public void setSeatNumber(String seatNumber) {
285+
this.seatNumber = seatNumber;
286+
}
287+
288+
public Date getTravelDate() {
289+
return travelDate;
290+
}
291+
292+
public void setTravelDate(Date travelDate) {
293+
this.travelDate = travelDate;
294+
}
295+
263296
public EventSourceType getSrcType() {
264297
return srcType;
265298
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ public interface Captions {
141141
String bulkSurveillanceOfficer = "bulkSurveillanceOfficer";
142142
String Campaign = "Campaign";
143143
String Campaign_area = "Campaign.area";
144+
String Campaign_community = "Campaign.community";
144145
String Campaign_creatingUser = "Campaign.creatingUser";
145146
String Campaign_description = "Campaign.description";
146147
String Campaign_district = "Campaign.district";
@@ -164,6 +165,7 @@ public interface Captions {
164165
String campaignDashboardOrder = "campaignDashboardOrder";
165166
String campaignDashboardSubTabName = "campaignDashboardSubTabName";
166167
String campaignDashboardTabName = "campaignDashboardTabName";
168+
String campaignDiagramGroupBy = "campaignDiagramGroupBy";
167169
String CampaignFormData_area = "CampaignFormData.area";
168170
String CampaignFormData_campaign = "CampaignFormData.campaign";
169171
String CampaignFormData_campaignFormMeta = "CampaignFormData.campaignFormMeta";
@@ -279,6 +281,7 @@ public interface Captions {
279281
String CaseData_region = "CaseData.region";
280282
String CaseData_regionLevelDate = "CaseData.regionLevelDate";
281283
String CaseData_reportDate = "CaseData.reportDate";
284+
String CaseData_reportingDistrict = "CaseData.reportingDistrict";
282285
String CaseData_reportingType = "CaseData.reportingType";
283286
String CaseData_reportingUser = "CaseData.reportingUser";
284287
String CaseData_reportLat = "CaseData.reportLat";
@@ -506,6 +509,7 @@ public interface Captions {
506509
String Contact_relationDescription = "Contact.relationDescription";
507510
String Contact_relationToCase = "Contact.relationToCase";
508511
String Contact_reportDateTime = "Contact.reportDateTime";
512+
String Contact_reportingDistrict = "Contact.reportingDistrict";
509513
String Contact_reportingUser = "Contact.reportingUser";
510514
String Contact_reportLat = "Contact.reportLat";
511515
String Contact_reportLatLonAccuracy = "Contact.reportLatLonAccuracy";
@@ -766,6 +770,7 @@ public interface Captions {
766770
String epiWeekTo = "epiWeekTo";
767771
String Event = "Event";
768772
String Event_caseCount = "Event.caseCount";
773+
String Event_connectionNumber = "Event.connectionNumber";
769774
String Event_deathCount = "Event.deathCount";
770775
String Event_diseaseDetails = "Event.diseaseDetails";
771776
String Event_diseaseShort = "Event.diseaseShort";
@@ -792,6 +797,7 @@ public interface Captions {
792797
String Event_reportDateTime = "Event.reportDateTime";
793798
String Event_reportingUser = "Event.reportingUser";
794799
String Event_riskLevel = "Event.riskLevel";
800+
String Event_seatNumber = "Event.seatNumber";
795801
String Event_srcEmail = "Event.srcEmail";
796802
String Event_srcFirstName = "Event.srcFirstName";
797803
String Event_srcInstitutionalPartnerType = "Event.srcInstitutionalPartnerType";
@@ -804,6 +810,7 @@ public interface Captions {
804810
String Event_srcType = "Event.srcType";
805811
String Event_startDate = "Event.startDate";
806812
String Event_surveillanceOfficer = "Event.surveillanceOfficer";
813+
String Event_travelDate = "Event.travelDate";
807814
String Event_typeOfPlace = "Event.typeOfPlace";
808815
String Event_typeOfPlaceText = "Event.typeOfPlaceText";
809816
String Event_uuid = "Event.uuid";

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ public interface Strings {
191191
String errorSetFeverRequired = "errorSetFeverRequired";
192192
String errorSormasToSormasCertNotGenerated = "errorSormasToSormasCertNotGenerated";
193193
String errorSormasToSormasConnection = "errorSormasToSormasConnection";
194+
String errorSormasToSormasCountry = "errorSormasToSormasCountry";
194195
String errorSormasToSormasDecrypt = "errorSormasToSormasDecrypt";
195196
String errorSormasToSormasEncrypt = "errorSormasToSormasEncrypt";
196197
String errorSormasToSormasInfrastructure = "errorSormasToSormasInfrastructure";
@@ -824,6 +825,7 @@ public interface Strings {
824825
String promptActionEpiWeekFrom = "promptActionEpiWeekFrom";
825826
String promptActionEpiWeekTo = "promptActionEpiWeekTo";
826827
String promptAllAreas = "promptAllAreas";
828+
String promptAllCommunities = "promptAllCommunities";
827829
String promptAllDistricts = "promptAllDistricts";
828830
String promptAllRegions = "promptAllRegions";
829831
String promptArea = "promptArea";

‎sormas-api/src/main/java/de/symeda/sormas/api/region/CountryDto.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package de.symeda.sormas.api.region;
22

3+
import java.util.Date;
4+
35
import javax.validation.constraints.Size;
46

57
import de.symeda.sormas.api.EntityDto;
68
import de.symeda.sormas.api.utils.DataHelper;
79

8-
import java.util.Date;
9-
1010
public class CountryDto extends EntityDto {
1111

1212
private static final long serialVersionUID = 8309822957203823162L;
@@ -25,14 +25,15 @@ public class CountryDto extends EntityDto {
2525
private String unoCode;
2626
private boolean archived;
2727

28-
public CountryDto(Date creationDate,
29-
Date changeDate,
30-
String uuid,
31-
boolean archived,
32-
String defaultName,
33-
String externalId,
34-
String isoCode,
35-
String unoCode) {
28+
public CountryDto(
29+
Date creationDate,
30+
Date changeDate,
31+
String uuid,
32+
boolean archived,
33+
String defaultName,
34+
String externalId,
35+
String isoCode,
36+
String unoCode) {
3637

3738
super(creationDate, changeDate, uuid);
3839
this.archived = archived;

0 commit comments

Comments
 (0)