From 6f2be161d48941eb4f281aad7a1cc3aa6a381b24 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 25 Jul 2021 10:45:47 +0200
Subject: [PATCH] #585 - show manage charts button only if custom is selected
---
src/main/resources/languages/base_de.properties | 2 +-
src/main/resources/languages/base_en.properties | 2 +-
src/main/resources/static/js/charts.js | 7 +++++++
src/main/resources/templates/charts/charts.ftl | 5 +++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index f06777022..cd214f8c5 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -422,7 +422,7 @@ home.menu.templates=Vorlagen helfen dir dabei neue Buchung schnell und effizient
home.menu.templates.action.manage=Vorlagenverwaltung
home.menu.charts=Visualisiere deine Daten in verschiedenen Diagrammen. Nutze die mitgelieferten Diagrammtypen oder definiere deine eigenen Diagramme.
-home.menu.charts.action.manage=Diagrammverwaltung
+home.menu.charts.action.manage=Eigene Diagramme verwalten
home.menu.charts.action.show=Diagramme ansehen
home.menu.reports=Erstelle konfigurierbare Monatsberichte als PDF zum Ausdrucken und Archivieren. Du kannst den Inhalt der Berichte filtern und zum Beispiel nach Einnahmen und Ausgaben getrennt auflisten lassen.
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index a08650762..5cdb728fb 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -423,7 +423,7 @@ home.menu.templates=Templates help you to create new transactions quickly and ef
home.menu.templates.action.manage=Manage templates
home.menu.charts=Visualize your data by using charts. You can choose an included default chart or define your own.
-home.menu.charts.action.manage=Manage charts
+home.menu.charts.action.manage=Manage custom charts
home.menu.charts.action.show=Show charts
home.menu.reports=Create configurable month reports in PDF format for printing and archiving. You can filter the content of the reports and, for example, list them separately to incomes and expenditures.
diff --git a/src/main/resources/static/js/charts.js b/src/main/resources/static/js/charts.js
index 1da6d0fd9..760b548b4 100644
--- a/src/main/resources/static/js/charts.js
+++ b/src/main/resources/static/js/charts.js
@@ -272,6 +272,8 @@ function filterChartPreviews()
}
unsetActiveChartPreview();
+
+ toggleCustomChartButton(displayTypeName === 'CUSTOM');
}
function unsetActiveChartPreview()
@@ -293,3 +295,8 @@ function checkShowChartButton()
let selectedChartID = document.getElementsByName('chartID')[0].value;
buttonShowChart.disabled = selectedChartID === '';
}
+
+function toggleCustomChartButton(show)
+{
+ document.getElementById('buttonCustomCharts').classList.toggle('hidden', !show);
+}
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index 1e9c1a25e..d9d0951eb 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -26,8 +26,6 @@
<@header.content>
<br>
-<#-- <div class="center-align"><@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/></div>-->
-<#-- <br>-->
<form name="NewChartSettings" action="<@s.url '/charts'/>" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
@@ -59,6 +57,9 @@
<#list charts as chart>
<@chartPreview chart/>
</#list>
+ <div class="col s12 center-align hidden" id="buttonCustomCharts">
+ <@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/>
+ </div>
</div>
</div>
<input type="hidden" name="chartID" value="">
--
GitLab