[GITFLOW]merging 'hotfix-0.13.1' into 'master'

SORMAS-Foundation · Jan 25, 2018 · 2d431a3 · 2d431a3
2 parents 15217ff + bf89660
commit 2d431a3
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 19 deletions.
diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.13.0</version>
+		<version>0.13.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>0.13.0</version>
+		<version>0.13.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>0.13.0</version>
+	<version>0.13.1</version>
 
 	<prerequisites>
 		<maven>3.0</maven>

diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.13.0</version>
+		<version>0.13.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.13.0</version>
+		<version>0.13.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java
@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
 import com.vaadin.ui.ComboBox;
@@ -49,8 +50,8 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
 	private static final String OCCUPATION_HEADER = "occupationHeader";
 	private static final String ADDRESS_HEADER = "addressHeader";
 
-	private Label occupationHeader = new Label(LayoutUtil.h3("Occupation"));
-	private Label addressHeader = new Label(LayoutUtil.h3("Permanent residence of person"));
+	private Label occupationHeader = new Label(LayoutUtil.h3("Occupation"), ContentMode.HTML);
+	private Label addressHeader = new Label(LayoutUtil.h3("Permanent residence of person"), ContentMode.HTML);
 
 	private boolean facilityFieldsInitialized = false;
 	private Disease disease;

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/reports/ReportsView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/reports/ReportsView.java
@@ -62,16 +62,15 @@ public HorizontalLayout createFilterBar() {
 		yearFilter.select(year);
 		yearFilter.setCaption("Year");
 		yearFilter.setItemCaptionMode(ItemCaptionMode.ID_TOSTRING);
+		yearFilter.addValueChangeListener(e -> {
+			updateEpiWeeks((int)e.getProperty().getValue(), (int)epiWeekFilter.getValue());
+			reloadGrid();
+		});
 		filterLayout.addComponent(yearFilter);
 
 		epiWeekFilter = new ComboBox();
 		epiWeekFilter.setWidth(200, Unit.PIXELS);
-		List<EpiWeek> epiWeekList = DateHelper.createEpiWeekList(year);
-		for (EpiWeek epiWeek : epiWeekList) {
-			epiWeekFilter.addItem(epiWeek.getWeek());
-			epiWeekFilter.setItemCaption(epiWeek.getWeek(), epiWeek.getWeek() + " (" + DateHelper.formatShortDate(DateHelper.getEpiWeekStart(epiWeek)) + " - " + DateHelper.formatShortDate(DateHelper.getEpiWeekEnd(epiWeek)) + ")");
-		}
-		epiWeekFilter.select(week);
+		updateEpiWeeks(year, week);
 		epiWeekFilter.setCaption("Epi Week");
 		epiWeekFilter.addValueChangeListener(e -> {
 			reloadGrid();
@@ -99,6 +98,15 @@ public HorizontalLayout createFilterBar() {
 		return filterLayout;
 	}
 
+	private void updateEpiWeeks(int year, int week) {
+		List<EpiWeek> epiWeekList = DateHelper.createEpiWeekList(year);
+		for (EpiWeek epiWeek : epiWeekList) {
+			epiWeekFilter.addItem(epiWeek.getWeek());
+			epiWeekFilter.setItemCaption(epiWeek.getWeek(), epiWeek.getWeek() + " (" + DateHelper.formatShortDate(DateHelper.getEpiWeekStart(epiWeek)) + " - " + DateHelper.formatShortDate(DateHelper.getEpiWeekEnd(epiWeek)) + ")");
+		}
+		epiWeekFilter.select(week);
+	}
+
 	@Override
 	public void enter(ViewChangeEvent event) {
 		reloadGrid();

diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>