From 46ba803cf45a677ee8a194d59cf0e9a1435bf313 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 12 Aug 2019 19:13:00 +0200
Subject: [PATCH] Fixed #474 - quick date range "until today"

---
 src/main/resources/languages/_de.properties    | 2 +-
 src/main/resources/languages/_en.properties    | 2 +-
 src/main/resources/static/js/charts.js         | 2 +-
 src/main/resources/templates/charts/charts.ftl | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 2db502a6a..a353e03db 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -368,7 +368,7 @@ chart.quick.all=Alle
 chart.quick.last.week.days=Letzte 7 Tage
 chart.quick.last.month.days=Letzte 30 Tage
 chart.quick.last.year.days=Letzte 365 Tage
-chart.quick.last.three.months=Letzte 3 Monate
+chart.quick.until.today=Alle bis heute
 
 chart.script.default=/* This list will be dynamically filled with all the transactions between\n \
 * the start and and date you select on the "Show Chart" page\n \
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 784b062fd..8e43cda68 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -367,7 +367,7 @@ chart.quick.all=All
 chart.quick.last.week.days=Last 7 days
 chart.quick.last.month.days=Last 30 days
 chart.quick.last.year.days=Last 365 days
-chart.quick.last.three.months=Last 3 months
+chart.quick.until.today=Until today
 
 chart.script.default=/* This list will be dynamically filled with all the transactions between\n \
 * the start and and date you select on the "Show Chart" page\n \
diff --git a/src/main/resources/static/js/charts.js b/src/main/resources/static/js/charts.js
index 1b6d7154a..bed47eb4a 100644
--- a/src/main/resources/static/js/charts.js
+++ b/src/main/resources/static/js/charts.js
@@ -189,7 +189,7 @@ function handleQuickDate(element, pickerStartDate, pickerEndDate)
             endDate = moment();
             break;
         case '7':
-            startDate = moment().subtract(3, 'months');
+            startDate = moment("2000-01-01");
             endDate = moment();
             break;
     }
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index a23798e51..768908bec 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -93,7 +93,7 @@
                                                             <td class="quick-date" data-quick="4">${locale.getString("chart.quick.last.week.days")}</td>
                                                             <td class="quick-date" data-quick="5">${locale.getString("chart.quick.last.month.days")}</td>
                                                             <td class="quick-date" data-quick="6">${locale.getString("chart.quick.last.year.days")}</td>
-                                                            <td class="quick-date" data-quick="7">${locale.getString("chart.quick.last.three.months")}</td>
+                                                            <td class="quick-date" data-quick="7">${locale.getString("chart.quick.until.today")}</td>
                                                         </tr>
                                                     </table>
                                                 </div>
-- 
GitLab