From 1af3956a924699257b275b02782e7cc70bd00176 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Thu, 5 Nov 2015 16:05:48 -0500 Subject: [PATCH] CRM-13682 Reports - break up table on page break section --- css/print.css | 2 +- templates/CRM/Report/Form/Layout/Table.tpl | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/css/print.css b/css/print.css index 8a8b2d3248..812c5a8bf0 100644 --- a/css/print.css +++ b/css/print.css @@ -74,7 +74,7 @@ table.form-layout td, table.form-layout th { border-top : 2px groove #DCDCDC; } -#crm-container table.report-layout tr.crm-report-sectionHeader.page-break { +#crm-container table.report-layout.page-break { page-break-before: always; } diff --git a/templates/CRM/Report/Form/Layout/Table.tpl b/templates/CRM/Report/Form/Layout/Table.tpl index 3ca3c17d10..c2971a50ed 100644 --- a/templates/CRM/Report/Form/Layout/Table.tpl +++ b/templates/CRM/Report/Form/Layout/Table.tpl @@ -68,6 +68,7 @@ {assign var=columnCount value=$columnHeaders|@count} {assign var=l value=$smarty.ldelim} {assign var=r value=$smarty.rdelim} + {assign var=pageBroke value=0} {foreach from=$sections item=section key=column name=sections} {counter assign="h"} {$l}isValueChange value=$row.{$column} key="{$column}" assign=isValueChanged{$r} @@ -80,8 +81,17 @@ {$l}else{$r} {$l}assign var=printValue value=$row.{$column}{$r} {$l}/if{$r} + {$l}if $rowid neq 0{$r} + {if $section.pageBreak} + {$l}if $pageBroke >= {$h} or $pageBroke == 0{$r} + + + {$l}/if{$r} + {$l}assign var=pageBroke value={$h}{$r} + {/if} + {$l}/if{$r} +
-
{$section.title}: {$l}$printValue|default:"none"{$r} ({$l}sectionTotal key=$row.{$column} depth={$smarty.foreach.sections.index}{$r}) -- 2.25.1