[Erp5-report] r25098 - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 14 11:39:56 CET 2009
Author: romain
Date: Wed Jan 14 11:39:55 2009
New Revision: 25098
URL: http://svn.erp5.org?rev=25098&view=rev
Log:
Define render_prefix for each report section.
Fix popReport call.
Improve XML indentation.
Modified:
erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml
erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
erp5/trunk/bt5/erp5_ods_style/bt/revision
Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml?rev=25098&r1=25097&r2=25098&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml [utf8] Wed Jan 14 11:39:55 2009
@@ -57,7 +57,8 @@
<table:table table:style-name=\'ta1\' table:print=\'false\' tal:attributes="table:name here/getTitle" >\n
<tal:block metal:define-macro="form_layout"\n
tal:define="dummy python: request.set(\'here\', here);\n
- listbox form/listbox">\n
+ listbox form/listbox | nothing;">\n
+ <tal:block tal:condition="listbox">\n
<tal:block metal:use-macro="here/listbox_ods_macro/macros/listbox">\n
<tal:block metal:fill-slot="list_header">\n
<tal:block tal:repeat="column_item listboxline/getColumnItemList"> \n
@@ -100,6 +101,7 @@
</tal:block>\n
</tal:block>\n
</tal:block>\n
+ </tal:block>\n
</table:table>\n
</office:spreadsheet>\n
</office:body>\n
Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml?rev=25098&r1=25097&r2=25098&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml [utf8] Wed Jan 14 11:39:55 2009
@@ -172,7 +172,7 @@
<draw:frame draw:z-index="0" draw:style-name="gr1" svg:x="0.2cm" svg:y="0.2cm" svg:width="7.996cm" svg:height="6.999cm"\n
tal:attributes="svg:height python:height;\n
svg:width python:width">\n
- <tal:block tal:replace="structure python: field.render_odf()"/>\n
+ <tal:block tal:replace="structure python: field.render_odf(render_prefix=render_prefix)"/>\n
</draw:frame>\n
</table:table-cell>\n
</table:table-row>\n
Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml?rev=25098&r1=25097&r2=25098&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml [utf8] Wed Jan 14 11:39:55 2009
@@ -51,7 +51,8 @@
<office:spreadsheet>\n
\n
<tal:block metal:define-macro="listbox">\n
- <tal:block tal:define="listboxline_list python: listbox.get_value(\'default\', render_format=\'list\', REQUEST=request);\n
+ <tal:block tal:define="render_prefix render_prefix | nothing;\n
+ listboxline_list python: listbox.get_value(\'default\', render_format=\'list\', REQUEST=request, render_prefix=render_prefix);\n
DateTime nocall: modules/DateTime/DateTime;\n
selection_name python: listbox.get_value(\'selection_name\', REQUEST=request);\n
editable_columns python: listbox.get_value(\'editable_columns\', REQUEST=request);\n
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=25098&r1=25097&r2=25098&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 14 11:39:55 2009
@@ -57,59 +57,61 @@
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
- <tal:block tal:condition="not: sheet_per_reportsection">\n
- <table:table tal:attributes="table:name python:unicode(here.getProperty(\'title\'), \'utf8\')">\n
- <!-- at least one table-column element is required for ODF to validate -->\n
- <table:table-column\n
- table:style-name=\'co2\'\n
- table:default-cell-style-name=\'report-column-title\'/>\n
+ <tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
+ <tal:block tal:condition="not: sheet_per_reportsection">\n
+ <table:table tal:attributes="table:name python:unicode(here.getProperty(\'title\'), \'utf8\')">\n
+ <!-- at least one table-column element is required for ODF to validate -->\n
+ <table:table-column\n
+ table:style-name=\'co2\'\n
+ table:default-cell-style-name=\'report-column-title\'/>\n
\n
- <tal:block metal:use-macro="here/form_view/macros/form_layout"/>\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
+ <!-- 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
+ render_prefix python: \'x%s\' % (repeat[\'report_item\'].index, );\n
+ dummy python:report_item.pushReport(portal_object,\n
+ render_prefix=render_prefix)">\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
+ 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
+ table:style-name python:test(level>1, \'report-title%s\' % level, \'report-title\');" \n
+ office:value-type=\'string\'\n
+ table:number-rows-spanned=\'1\'>\n
+ <text:p tal:content="report_item/getTitle" ></text:p>\n
+ </table:table-cell>\n
+ </tal:block>\n
+ </table:table-row>\n
+ </tal:block>\n
+ <tal:block tal:condition="report_item/getFormId">\n
+ <tal:block tal:define="form python:getattr(here,report_item.getFormId())">\n
+ <tal:block tal:condition="python: form.pt == \'form_view\'">\n
+ <tal:block metal:use-macro="form/form_view/macros/form_layout"/>\n
+ </tal:block>\n
+ <tal:block tal:condition="python:form.pt == \'form_list\'">\n
+ <tal:block metal:use-macro="form/form_list/macros/form_layout"/>\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+ <tal:block tal:define="portal_object here/portal_url/getPortalObject;\n
+ dummy python:report_item.popReport(portal_object, render_prefix=render_prefix)"/>\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
- 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
- table:style-name python:test(level>1, \'report-title%s\' % level, \'report-title\');" \n
- office:value-type=\'string\'\n
- table:number-rows-spanned=\'1\'>\n
- <text:p tal:content="report_item/getTitle" ></text:p>\n
- </table:table-cell>\n
- </tal:block>\n
- </table:table-row>\n
- </tal:block>\n
- <tal:block tal:condition="report_item/getFormId">\n
- <tal:block tal:define="form python:getattr(here,report_item.getFormId())">\n
- <tal:block tal:condition="python: form.pt == \'form_view\'">\n
- <tal:block metal:use-macro="form/form_view/macros/form_layout"/>\n
- </tal:block>\n
- <tal:block tal:condition="python:form.pt == \'form_list\'">\n
- <tal:block metal:use-macro="form/form_list/macros/form_layout"/>\n
- </tal:block>\n
- </tal:block>\n
- </tal:block>\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/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=25098&r1=25097&r2=25098&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Wed Jan 14 11:39:55 2009
@@ -1,1 +1,1 @@
-173
+175
More information about the Erp5-report
mailing list