From f9e704d00a2d21b1a94332e088f78c22da03d37c Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Wed, 31 Oct 2018 13:35:35 +0000 Subject: [PATCH] Improved the script that shows the Totals only checkbox. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/reports.tpl | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 1a52dda6..bc3b468e 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.03.4336 | Copyright © Anuko | +  Anuko Time Tracker 1.18.03.4337 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl index 418c172a..95b4a436 100644 --- a/WEB-INF/templates/reports.tpl +++ b/WEB-INF/templates/reports.tpl @@ -134,20 +134,28 @@ function selectAssignedUsers(project_id) { } // handleCheckboxes - unmarks and hides the "Totals only" checkbox when -// "no grouping" is selected in the associated dropdown. +// "no grouping" is selected in the associated group by dropdowns. function handleCheckboxes() { var totalsOnlyCheckbox = document.getElementById("chtotalsonly"); var totalsOnlyLabel = document.getElementById("totals_only_label"); - if ("no_grouping" == document.getElementById("group_by1").value - && "no_grouping" == document.getElementById("group_by2").value - && "no_grouping" == document.getElementById("group_by3").value) { + var groupBy1 = document.getElementById("group_by1"); + var groupBy2 = document.getElementById("group_by2"); + var groupBy3 = document.getElementById("group_by3"); + var grouping = false; + if ((groupBy1 != null && "no_grouping" != groupBy1.value) || + (groupBy2 != null && "no_grouping" != groupBy2.value) || + (groupBy3 != null && "no_grouping" != groupBy3.value)) { + grouping = true; + } + if (grouping) { + // Show the "Totals only" checkbox. + totalsOnlyCheckbox.style.visibility = "visible"; + totalsOnlyLabel.style.visibility = "visible"; + } else { // Unmark and hide the "Totals only" checkbox. totalsOnlyCheckbox.checked = false; totalsOnlyCheckbox.style.visibility = "hidden"; totalsOnlyLabel.style.visibility = "hidden"; - } else { - totalsOnlyCheckbox.style.visibility = "visible"; - totalsOnlyLabel.style.visibility = "visible"; } } -- 2.20.1