Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into development

Author: MateStrysewske

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

@@ -50,11 +50,11 @@ protected Stream<String> getPersonColumns() {
 			Stream.of(
 				CaseIndexDetailedDto.SEX,
 				CaseIndexDetailedDto.AGE_AND_BIRTH_DATE,
+				CaseIndexDetailedDto.POSTAL_CODE,
 				CaseIndexDetailedDto.CITY,
 				CaseIndexDetailedDto.STREET,
 				CaseIndexDetailedDto.HOUSE_NUMBER,
 				CaseIndexDetailedDto.ADDITIONAL_INFORMATION,
-				CaseIndexDetailedDto.POSTAL_CODE,
 				CaseIndexDetailedDto.PHONE));
 	}
 
@@ -66,11 +66,11 @@ protected void initColumns() {
 
 		getColumn(CaseIndexDetailedDto.SEX).setWidth(80);
 		getColumn(CaseIndexDetailedDto.AGE_AND_BIRTH_DATE).setWidth(100);
+		getColumn(CaseIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(CaseIndexDetailedDto.CITY).setWidth(150);
 		getColumn(CaseIndexDetailedDto.STREET).setWidth(150);
 		getColumn(CaseIndexDetailedDto.HOUSE_NUMBER).setWidth(50);
 		getColumn(CaseIndexDetailedDto.ADDITIONAL_INFORMATION).setWidth(200);
-		getColumn(CaseIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(CaseIndexDetailedDto.PHONE).setWidth(100);
 		getColumn(CaseIndexDetailedDto.EVENT_COUNT).setWidth(80).setSortable(false);
 		getColumn(CaseIndexDetailedDto.LATEST_EVENT_ID).setWidth(80).setSortable(false);

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactGridDetailed.java

@@ -45,11 +45,11 @@ protected Stream<String> getPersonColumns() {
 				ContactIndexDetailedDto.SEX,
 				ContactIndexDetailedDto.APPROXIMATE_AGE,
 				ContactIndexDetailedDto.DISTRICT_NAME,
+				ContactIndexDetailedDto.POSTAL_CODE,
 				ContactIndexDetailedDto.CITY,
 				ContactIndexDetailedDto.STREET,
 				ContactIndexDetailedDto.HOUSE_NUMBER,
 				ContactIndexDetailedDto.ADDITIONAL_INFORMATION,
-				ContactIndexDetailedDto.POSTAL_CODE,
 				ContactIndexDetailedDto.PHONE));
 	}
 
@@ -67,11 +67,11 @@ protected void initColumns() {
 		getColumn(ContactIndexDetailedDto.SEX).setWidth(80);
 		getColumn(ContactIndexDetailedDto.APPROXIMATE_AGE).setWidth(50);
 		getColumn(ContactIndexDetailedDto.DISTRICT_NAME).setWidth(150);
+		getColumn(ContactIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(ContactIndexDetailedDto.CITY).setWidth(150);
 		getColumn(ContactIndexDetailedDto.STREET).setWidth(150);
 		getColumn(ContactIndexDetailedDto.HOUSE_NUMBER).setWidth(50);
 		getColumn(ContactIndexDetailedDto.ADDITIONAL_INFORMATION).setWidth(200);
-		getColumn(ContactIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(ContactIndexDetailedDto.PHONE).setWidth(100);
 		((Column<ContactIndexDetailedDto, CaseReferenceDto>) getColumn(ContactIndexDetailedDto.CAZE)).setWidth(150)
 			.setRenderer(entry -> entry != null ? entry.getUuid() : null, new UuidRenderer());