[Erp5-report] r25034 - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: romain
Date: Wed Jan  7 18:34:42 2009
New Revision: 25034

URL: http://svn.erp5.org?rev=25034&view=rev
Log:
Add macros for deferred rendering in report_view

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

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml?rev=25034&r1=25033&r2=25034&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml [utf8] Wed Jan  7 18:34:42 2009
@@ -50,10 +50,11 @@
   <office:body>\n
     <office:spreadsheet>\n
 \n
-      <tal:block tal:define="report_item_list python:report_method();\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
                              dummy python: request.set(\'here\', here);\n
                              global sheet_per_reportsection python: int(request.get(\'sheet_per_report_section\', 0));\n
-                             global column_len python:5">\n
+                             global column_len python: 5">\n
                              <!-- TODO: calculate column_len based on the first listbox (or selection_column if exists)-->\n
 \n
       <tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
@@ -66,15 +67,26 @@
 \n
           <tal:block metal:use-macro="here/form_view/macros/form_layout"/>\n
 \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:condition="not: rendered_report_item_list">\n
+\n
             <tal:block tal:repeat="report_item report_item_list">\n
               <tal:block metal:define-macro="make_report_item_table"\n
                          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:block tal:condition="report_item/getTitle">\n
                   <table:table-row table:style-name=\'ro2\'>\n
-                    <tal:block tal:condition="report_item/getTitle" tal:define="level report_item/getLevel">\n
+                    <tal:block tal:condition="report_item/getTitle" tal:define="level report_item/getLevel;\n
+                                                                                column_len column_len | python: 5">\n
                         <table:table-cell table:style-name="report-title"\n
-                                          tal:attributes="table:number-columns-spanned python:column_len;\n
+                                          tal:attributes="table:number-columns-spanned python: column_len;\n
                                                           table:style-name python:test(level&gt;1, \'report-title%s\' % level, \'report-title\');" \n
                                           office:value-type=\'string\'\n
                                           table:number-rows-spanned=\'1\'>\n
@@ -93,8 +105,11 @@
                       </tal:block>\n
                     </tal:block>\n
                   </tal:block>\n
-                  <tal:block tal:define="dummy python:report_item.popReport(portal_object)"/>\n
+                  <tal:block tal:define="portal_object here/portal_url/getPortalObject;\n
+                                         dummy python:report_item.popReport(portal_object)"/>\n
                 </tal:block>\n
+                </tal:block>\n
+              </tal:block>\n
               </tal:block>\n
             </table:table>\n
           </tal:block>\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/change_log?rev=25034&r1=25033&r2=25034&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/change_log [utf8] Wed Jan  7 18:34:42 2009
@@ -1,3 +1,6 @@
+2009-01-07 Romain
+* Add macros for deferred rendering in report_view
+
 2008-11-18 yusei
 * Convert cell data to string explicitly.
 

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=25034&r1=25033&r2=25034&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Wed Jan  7 18:34:42 2009
@@ -1,1 +1,1 @@
-162
+173