[Erp5-report] r17341 - in /erp5/trunk/bt5/erp5_pdf_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Nov  1 11:32:10 2007
New Revision: 17341

URL: http://svn.erp5.org?rev=17341&view=rev
Log:
define macros for deferred rendering, update changelog, increase version

Modified:
    erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
    erp5/trunk/bt5/erp5_pdf_style/bt/change_log
    erp5/trunk/bt5/erp5_pdf_style/bt/revision
    erp5/trunk/bt5/erp5_pdf_style/bt/version

Modified: erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml?rev=17341&r1=17340&r2=17341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml (original)
+++ erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml Thu Nov  1 11:32:10 2007
@@ -62,8 +62,12 @@
   <title>List Print</title>\n
   <author>ERP5</author>\n
   <subject>Print Example</subject>\n
-  <content tal:define="report_item_list python:report_method();\n
-                       dummy python: request.set(\'here\',here); ">\n
+  <!-- This template can be used to aggregate together some already rendered report sections.\n
+        In this case, "rendered_report_item_list" must be in the page template context. -->\n
+  <tal:block tal:define="rendered_report_item_list rendered_report_item_list | python:[];\n
+                         report_item_list python: rendered_report_item_list or report_method();">\n
+\n
+  <content tal:define="dummy python: request.set(\'here\',here); ">\n
 \n
    <action name="nextPageTemplate">\n
       <parameter>FirstPage</parameter>\n
@@ -139,11 +143,22 @@
 \n
    <spacer height="100"/>\n
 \n
-\n
-<tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
+   <!-- if we are called with a rendered_report_item_list, just insert the rendered text here. -->\n
+   <tal:block tal:condition="rendered_report_item_list">\n
+      <tal:block tal:repeat="report_item report_item_list">\n
+        <tal:block tal:replace="structure report_item"/>\n
+      </tal:block>\n
+   </tal:block>\n
+\n
+<tal:block tal:define="portal_object here/portal_url/getPortalObject"\n
+           tal:condition="not: rendered_report_item_list">\n
 <tal:block tal:repeat="report_item report_item_list">\n
   <tal:block tal:define="here python:report_item.getObject(portal_object);\n
                          dummy python:report_item.pushReport(portal_object)">\n
+  <tal:block metal:define-macro="render_report_section"\n
+             tal:define="comment string:this is required for the macro;\n
+                         landscape python: int(request.get(\'landscape\', 0) or 0);\n
+                         global frame_width python:landscape and 25.8 or 19">\n
   <tal:block tal:condition="report_item/getTitle | report_item/getTranslatedTitle">\n
     <tal:block tal:condition="report_item/getTitle">\n
       <para style="Heading1" tal:content="report_item/getTitle"\n
@@ -157,12 +172,13 @@
       <tal:block tal:condition="python:form.pt == \'form_view\'">\n
         <tal:block metal:use-macro="form/form_view/macros/form_layout"/></tal:block>\n
       <tal:block tal:condition="python:form.pt == \'form_list\'">\n
-        <tal:block metal:use-macro="form/form_list/macros/form_layout"/></tal:block></tal:block></tal:block></tal:block>\n
+        <tal:block metal:use-macro="form/form_list/macros/form_layout"/></tal:block></tal:block></tal:block></tal:block></tal:block>\n
   <tal:block tal:define="dummy python:report_item.popReport(portal_object)"/>\n
 </tal:block>\n
 </tal:block>\n
 \n
   </content>\n
+ </tal:block>\n
 </document>\n
 
 

Modified: erp5/trunk/bt5/erp5_pdf_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/bt/change_log?rev=17341&r1=17340&r2=17341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_pdf_style/bt/change_log Thu Nov  1 11:32:10 2007
@@ -1,3 +1,7 @@
+2007-10-30 jerome
+* Support for list fields in report_view
+* define macros for deferred rendering
+
 2007-08-17 jerome
 * Add support for cases where matrixbox or listbox is a proxyfield
 

Modified: erp5/trunk/bt5/erp5_pdf_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/bt/revision?rev=17341&r1=17340&r2=17341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_pdf_style/bt/revision Thu Nov  1 11:32:10 2007
@@ -1,1 +1,1 @@
-53
+55

Modified: erp5/trunk/bt5/erp5_pdf_style/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/bt/version?rev=17341&r1=17340&r2=17341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/bt/version (original)
+++ erp5/trunk/bt5/erp5_pdf_style/bt/version Thu Nov  1 11:32:10 2007
@@ -1,1 +1,1 @@
-0.8
+0.9