X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Ftemplates%2Freports.tpl;h=95b4a43642ed262ccce154f79b7eb957719b7911;hb=f9e704d00a2d21b1a94332e088f78c22da03d37c;hp=9c8221ade6db9595146a6269de1ed3bc20679949;hpb=bcbff1b505f315c05b45e5a2eaa707ed574d1a9a;p=timetracker.git diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl index 9c8221ad..95b4a436 100644 --- a/WEB-INF/templates/reports.tpl +++ b/WEB-INF/templates/reports.tpl @@ -134,18 +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_by").value) { - // Unmark and disable the "Totals only" checkbox. + 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"; } } @@ -302,7 +312,7 @@ function handleCheckboxes() { {$i18n.form.reports.group_by} - {$forms.reportForm.group_by.control} + {$forms.reportForm.group_by1.control} {$forms.reportForm.group_by2.control} {$forms.reportForm.group_by3.control}