From 07ca4a3c6d80433ad8492236f65fb0ef5a5d8a28 Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@gmail.com>
Date: Tue, 11 Mar 2014 21:23:53 +0100
Subject: [PATCH] MT#5879 Show page number on pages

---
 share/templates/customer/calls_svg.tt      | 12 +++++-----
 share/templates/customer/calls_template.tt | 26 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/share/templates/customer/calls_svg.tt b/share/templates/customer/calls_svg.tt
index 1173442aae..f9c444edf2 100644
--- a/share/templates/customer/calls_svg.tt
+++ b/share/templates/customer/calls_svg.tt
@@ -43,7 +43,7 @@ g, text, tspan {
 <!--pageSet-->
 <!--{[%END-%]}-->
 
-<!--{[%MACRO titlepage(callsdata) BLOCK-%]}-->
+<!--{[%MACRO titlepage(callsdata, page) BLOCK-%]}-->
 <!--page-->
     <g y="0" x="0" width="215" height="297" id="titlepage">
     
@@ -123,7 +123,7 @@ g, text, tspan {
 <!--/page-->
 <!--{[%END-%]}-->
 
-<!--{[%MACRO midpage(callsdata) BLOCK-%]}-->
+<!--{[%MACRO midpage(callsdata, page) BLOCK-%]}-->
 <!--page-->
     <g id="midpage">
         <title>MidPage</title>
@@ -171,7 +171,7 @@ g, text, tspan {
 <!--{[%END-%]}-->
 
 
-<!--{[%MACRO lastpage(callsdata) BLOCK-%]}-->
+<!--{[%MACRO lastpage(callsdata, page) BLOCK-%]}-->
 <!--page-->
     <g id="lastpage">
         <title>LastPage</title>
@@ -218,7 +218,7 @@ g, text, tspan {
 <!--/page-->
 <!--{[%END-%]}-->
 
-<!--{[%MACRO bgpage BLOCK-%]}-->
+<!--{[%MACRO bgpage( page ) BLOCK-%]}-->
 <!--page-->
     <g id="bgpage">
         <title>Background</title>
@@ -237,11 +237,11 @@ g, text, tspan {
 
 <!--{[%MACRO document_footer BLOCK-%]}-->
 <!--/pageSet-->
-</svg>
+</svg> 
 <!--{[%END-%]}-->
 
 
 <!--{[%# show_pages(zonecalls_rs,'title')-%]}-->
-<!--{[%# show_pages('mid')-%]}-->
+<!--{[%# show_pages('mid',3)-%]}-->
 <!--{[%# show_pages('last')-%]}-->
 <!--{[% show_pages( zonecalls_rs,'all' )-%]}-->
diff --git a/share/templates/customer/calls_template.tt b/share/templates/customer/calls_template.tt
index f053b2d45d..7db7bba5b7 100644
--- a/share/templates/customer/calls_template.tt
+++ b/share/templates/customer/calls_template.tt
@@ -76,7 +76,6 @@
 [%END -%]
 
 [%MACRO get_page_rows_number(pagetype, tt_type, row_vertical_interval) BLOCK-%]
-    in before get_page_rows_number
     [%#doesn't work %]
     [% page_rows_re = page_rows_re(tt_type) %]
 
@@ -88,9 +87,9 @@
     [% page = get_page(pagetype) %]
     [% matches = page.match( page_rows_re ) -%]
 
-    [%#page=Dumper.dump(page)%]===
-    [%#page_rows_re=Dumper.dump(page_rows_re)%]===
-    [%#matches=Dumper.dump(matches)%]===
+    [%#page=Dumper.dump(page)%]
+    [%#page_rows_re=Dumper.dump(page_rows_re)%]
+    [%#matches=Dumper.dump(matches)%]
 
     [% rows = matches.0 || matches.1 %]
     [%#IF !rows%]
@@ -105,36 +104,37 @@
 [%MACRO show_pages(zonecalls_rs, pagetype, pagenum_in) BLOCK-%]
     [% allrowsnumber = zonecalls_rs.size() %]
     [% titlerows =  get_page_rows_number('titlepage','svg') %]
-    titlerows=[%titlerows%]===
     [%IF titlerows== 0 ; titlerows = 10; END%]
     [% midrows = get_page_rows_number('midpage','svg') %]
     [%IF midrows == 0 ; midrows = 30 ; END%]
-    [% midrows = 2%]
     [% allmidpages = ( (allrowsnumber - titlerows) / midrows )|format('%d') %]
     [% allmidrows = allmidpages * midrows %]
     [% lastrows = allrowsnumber - allmidrows - titlerows %]
 
     [%IF ( pagetype == 'title' || pagetype=='all') %]
+        [% pagenum = 1%]
         [% document_header()%]
-        [% titlepage( zonecalls_rs.slice(0, ( titlerows - 1 ) )) -%]
-        [% bgpage() -%]
+        [% titlepage( zonecalls_rs.slice(0, ( titlerows - 1 ) ), pagenum) -%]
+        [% bgpage(pagenum) -%]
         [% document_footer()%]
     [%END-%]
     [%IF ( pagetype == 'mid' || pagetype=='all' ) && allmidrows %]
         [% pages = pagenum_in ? [ pagenum_in ] : [ 1 .. allmidpages ] %]
         [%FOREACH pagenum IN pages %]
             [% pagerowsstart = titlerows + midrows * ( pagenum - 1 )%]
-            [% pagerowsend = titlerows + midrows * pagenum%]
+            [% pagerowsend = titlerows + midrows * pagenum - 1 %]
             [% document_header()%]
-            [% midpage( zonecalls_rs.slice( pagerowsstart,  pagerowsend )) -%]
-            [% bgpage() -%]
+            [% midpage( zonecalls_rs.slice( pagerowsstart,  pagerowsend ), pagenum + 1 ) -%]
+            [% bgpage(pagenum + 1s) -%]
             [% document_footer()%]
         [%END-%]
     [%END-%]
     [%IF ( pagetype == 'last' || pagetype=='all' )%]
+        [% pagenum = 2 + allmidpages%]
+        [%#2 because midpages started from 1, but we need add 1 for titlepage %]
         [% document_header()%]
-        [% lastpage( zonecalls_rs.slice(lastrows) ) -%]
-        [% bgpage() -%]
+        [% lastpage( zonecalls_rs.slice( allrowsnumber - lastrows, allrowsnumber ), pagenum ) -%]
+        [% bgpage(pagenum) -%]
         [% document_footer()%]
     [%END-%]
 [%END-%]