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

Commit bc53943

Browse files
MateStrysewskeMateStrysewske
committed
1 parent 92d2343 commit bc53943

3 files changed

Lines changed: 59 additions & 37 deletions

File tree

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

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package de.symeda.sormas.api.caze;
22

3-
import java.util.Date;
4-
53
import de.symeda.sormas.api.Disease;
64
import de.symeda.sormas.api.contact.FollowUpStatus;
75
import de.symeda.sormas.api.person.ApproximateAgeType;
@@ -13,14 +11,18 @@
1311
import de.symeda.sormas.api.utils.pseudonymization.Pseudonymizer;
1412
import de.symeda.sormas.api.utils.pseudonymization.valuepseudonymizers.PostalCodePseudonymizer;
1513

14+
import java.util.Date;
15+
1616
public class CaseIndexDetailedDto extends CaseIndexDto {
1717

1818
private static final long serialVersionUID = -3722694511897383913L;
1919

2020
public static final String SEX = "sex";
2121
public static final String CITY = "city";
22-
public static final String ADDRESS = "address";
22+
public static final String STREET = "street";
23+
public static final String HOUSE_NUMBER = "houseNumber";
2324
public static final String POSTAL_CODE = "postalCode";
25+
public static final String ADDITIONAL_INFORMATION = "additionalInformation";
2426
public static final String PHONE = "phone";
2527
public static final String REPORTING_USER = "reportingUser";
2628

@@ -29,7 +31,13 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
2931
private String city;
3032
@PersonalData
3133
@SensitiveData
32-
private String address;
34+
private String street;
35+
@PersonalData
36+
@SensitiveData
37+
private String houseNumber;
38+
@PersonalData
39+
@SensitiveData
40+
private String additionalInformation;
3341
@PersonalData
3442
@SensitiveData
3543
@Pseudonymizer(PostalCodePseudonymizer.class)
@@ -48,7 +56,7 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
4856
String pointOfEntryUuid, String pointOfEntryName, String pointOfEntryDetails, String surveillanceOfficerUuid, CaseOutcome outcome,
4957
Integer age, ApproximateAgeType ageType, Integer birthdateDD, Integer birthdateMM, Integer birthdateYYYY, Sex sex,
5058
Date quarantineTo, Float completeness, FollowUpStatus followUpStatus, Date followUpUntil,
51-
String city, String address, String postalCode, String phone,
59+
String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
5260
String reportingUserFirstName, String reportingUserLastName, int visitCount) {
5361

5462
super(id, uuid, epidNumber, externalID, personFirstName, personLastName, disease, diseaseDetails, caseClassification, investigationStatus,
@@ -59,7 +67,9 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
5967
//@formatter:on
6068

6169
this.city = city;
62-
this.address = address;
70+
this.street = street;
71+
this.houseNumber = houseNumber;
72+
this.additionalInformation = additionalInformation;
6373
this.postalCode = postalCode;
6474
this.phone = phone;
6575
this.reportingUser = new UserReferenceDto(reportingUserUuid, reportingUserFirstName, reportingUserLastName, null);
@@ -69,8 +79,16 @@ public String getCity() {
6979
return city;
7080
}
7181

72-
public String getAddress() {
73-
return address;
82+
public String getStreet() {
83+
return street;
84+
}
85+
86+
public String getHouseNumber() {
87+
return houseNumber;
88+
}
89+
90+
public String getAdditionalInformation() {
91+
return additionalInformation;
7492
}
7593

7694
public String getPostalCode() {

‎sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseListCriteriaBuilder.java‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
package de.symeda.sormas.backend.caze;
22

3-
import java.util.ArrayList;
4-
import java.util.Arrays;
5-
import java.util.Collections;
6-
import java.util.List;
7-
import java.util.function.BiFunction;
8-
import java.util.stream.Collectors;
9-
import java.util.stream.Stream;
10-
11-
import javax.ejb.EJB;
12-
import javax.ejb.LocalBean;
13-
import javax.ejb.Stateless;
14-
import javax.persistence.EntityManager;
15-
import javax.persistence.PersistenceContext;
16-
import javax.persistence.criteria.CriteriaBuilder;
17-
import javax.persistence.criteria.CriteriaQuery;
18-
import javax.persistence.criteria.Expression;
19-
import javax.persistence.criteria.Order;
20-
import javax.persistence.criteria.Predicate;
21-
import javax.persistence.criteria.Root;
22-
import javax.persistence.criteria.Selection;
23-
import javax.persistence.criteria.Subquery;
24-
253
import de.symeda.sormas.api.caze.CaseCriteria;
264
import de.symeda.sormas.api.caze.CaseIndexDetailedDto;
275
import de.symeda.sormas.api.caze.CaseIndexDto;
@@ -38,6 +16,27 @@
3816
import de.symeda.sormas.backend.user.User;
3917
import de.symeda.sormas.backend.util.ModelConstants;
4018

19+
import javax.ejb.EJB;
20+
import javax.ejb.LocalBean;
21+
import javax.ejb.Stateless;
22+
import javax.persistence.EntityManager;
23+
import javax.persistence.PersistenceContext;
24+
import javax.persistence.criteria.CriteriaBuilder;
25+
import javax.persistence.criteria.CriteriaQuery;
26+
import javax.persistence.criteria.Expression;
27+
import javax.persistence.criteria.Order;
28+
import javax.persistence.criteria.Predicate;
29+
import javax.persistence.criteria.Root;
30+
import javax.persistence.criteria.Selection;
31+
import javax.persistence.criteria.Subquery;
32+
import java.util.ArrayList;
33+
import java.util.Arrays;
34+
import java.util.Collections;
35+
import java.util.List;
36+
import java.util.function.BiFunction;
37+
import java.util.stream.Collectors;
38+
import java.util.stream.Stream;
39+
4140
@Stateless
4241
@LocalBean
4342
public class CaseListCriteriaBuilder {
@@ -219,7 +218,9 @@ private List<Expression<?>> getIndexDetailOrders(SortProperty sortProperty, Root
219218

220219
switch (sortProperty.propertyName) {
221220
case CaseIndexDetailedDto.CITY:
222-
case CaseIndexDetailedDto.ADDRESS:
221+
case CaseIndexDetailedDto.STREET:
222+
case CaseIndexDetailedDto.HOUSE_NUMBER:
223+
case CaseIndexDetailedDto.ADDITIONAL_INFORMATION:
223224
case CaseIndexDetailedDto.POSTAL_CODE:
224225
return Collections.singletonList(joins.getAddress().get(sortProperty.propertyName));
225226
case CaseIndexDetailedDto.PHONE:

‎sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseGridDetailed.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package de.symeda.sormas.ui.caze;
22

3-
import java.util.List;
4-
import java.util.stream.Stream;
5-
63
import com.vaadin.ui.renderers.TextRenderer;
7-
84
import de.symeda.sormas.api.FacadeProvider;
95
import de.symeda.sormas.api.caze.AgeAndBirthDateDto;
106
import de.symeda.sormas.api.caze.CaseCriteria;
@@ -13,6 +9,9 @@
139
import de.symeda.sormas.api.person.PersonHelper;
1410
import de.symeda.sormas.api.utils.SortProperty;
1511

12+
import java.util.List;
13+
import java.util.stream.Stream;
14+
1615
public class CaseGridDetailed extends AbstractCaseGrid<CaseIndexDetailedDto> {
1716

1817
private static final long serialVersionUID = 3734206041728541742L;
@@ -39,7 +38,9 @@ protected Stream<String> getPersonColumns() {
3938
CaseIndexDetailedDto.AGE_AND_BIRTH_DATE,
4039
CaseIndexDetailedDto.SEX,
4140
CaseIndexDetailedDto.CITY,
42-
CaseIndexDetailedDto.ADDRESS,
41+
CaseIndexDetailedDto.STREET,
42+
CaseIndexDetailedDto.HOUSE_NUMBER,
43+
CaseIndexDetailedDto.ADDITIONAL_INFORMATION,
4344
CaseIndexDetailedDto.POSTAL_CODE,
4445
CaseIndexDetailedDto.PHONE));
4546
}
@@ -53,7 +54,9 @@ protected void initColumns() {
5354
getColumn(CaseIndexDetailedDto.SEX).setWidth(80);
5455
getColumn(CaseIndexDetailedDto.AGE_AND_BIRTH_DATE).setWidth(100);
5556
getColumn(CaseIndexDetailedDto.CITY).setWidth(150);
56-
getColumn(CaseIndexDetailedDto.ADDRESS).setWidth(200);
57+
getColumn(CaseIndexDetailedDto.STREET).setWidth(150);
58+
getColumn(CaseIndexDetailedDto.HOUSE_NUMBER).setWidth(50);
59+
getColumn(CaseIndexDetailedDto.ADDITIONAL_INFORMATION).setWidth(200);
5760
getColumn(CaseIndexDetailedDto.POSTAL_CODE).setWidth(100);
5861
getColumn(CaseIndexDetailedDto.PHONE).setWidth(100);
5962

0 commit comments

Comments
 (0)