diff --git a/CHANGELOG.txt b/CHANGELOG.txt index af8f3d431848a0d78321f51c775dd9bc1f185a88..999e1f802dc442d14f5bf7f52064427ab48da061 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,9 +5,15 @@ SMARTTIME ========= >>> start-date: 09.01.15 ->>> status-date: 31.05.17 +>>> status-date: 05.06.17 ____________________________________________________ +v.5.1-2 - (32) +=============== + +-bugfixes in charts +>>> end-work: 05.06.17 + v.5.1-1 - (31) =============== diff --git a/README.md b/README.md index b308f7f1139b024e55787c3133516ab4bf5f4489..625ff90cd8c5edb7bbd9b0990cd8abd754944447 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SmartTime - startdate: 09.01.15 -- current version: 5.1.1 (31) - 31.05.17 +- current version: 5.1.2 (32) - 05.06.17 ### Description diff --git a/build/SmartTime.exe b/build/SmartTime.exe index 8b9a7756dcc27b8e790c1ab9b9caeb000f881260..6580f8234dc68b19dc7f618bc07fdfa1b328cca8 100644 Binary files a/build/SmartTime.exe and b/build/SmartTime.exe differ diff --git a/build/SmartTime.jar b/build/SmartTime.jar index 3dba4739ed35b400631727da1d589611bbdfd646..2bb50f39dbb0643698f4d0476c51679530bbfdef 100644 Binary files a/build/SmartTime.jar and b/build/SmartTime.jar differ diff --git a/src/charts/ChartGUIController.java b/src/charts/ChartGUIController.java index d385b4fc1f8227bae43b340526522bfc757b7b60..b69a73f6ea8083eebcceefe08e3cba6a24a7221d 100644 --- a/src/charts/ChartGUIController.java +++ b/src/charts/ChartGUIController.java @@ -220,11 +220,11 @@ public class ChartGUIController else { try - { + { months = getMonths(sql.getLogObjects()); monthBox.getItems().clear(); monthBox.getItems().add("Alle Monate"); - monthBox.getItems().addAll(months); + monthBox.getItems().addAll(months); monthBox.getSelectionModel().select(0); showPieChart(generator.getChart0010(Integer.parseInt(selectedYear), "Alle Projekte - " + selectedYear)); @@ -493,11 +493,12 @@ public class ChartGUIController months.add(current.getMonth()); } - ArrayList<String> monthNames = new ArrayList<String>(); + ArrayList<String> monthNames = new ArrayList<String>(); + ArrayList<Integer> monthsNumbers = new ArrayList<>(months); - for(int k = 0; k < new ArrayList<Integer>(months).size(); k++) - { - monthNames.add(Utils.getMonthName(k)); + for(int k = 0; k < monthsNumbers.size(); k++) + { + monthNames.add(Utils.getMonthName(monthsNumbers.get(k)-1)); } return monthNames; diff --git a/src/userInterface/_de.properties b/src/userInterface/_de.properties index c9e13b21cab3851ce82af581614b37bb1c69f603..e081845078ba700c2aaab359f3d823d9d3a85220 100644 --- a/src/userInterface/_de.properties +++ b/src/userInterface/_de.properties @@ -1,7 +1,7 @@ app.name=SmartTime -version.code=31 -version.name=5.1.1 -version.date=31.05.17 +version.code=32 +version.name=5.1.2 +version.date=05.06.17 folder=Deadlocker/SmartTime credits=Icon made by Vectors Market from www.flaticon.com (licensed by CC 3.0 BY) \ No newline at end of file