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

[nobody at svn.erp5.org]

Author: luke
Date: Tue Jan 27 18:24:27 2009
New Revision: 25319

URL: http://svn.erp5.org?rev=25319&view=rev
Log:
- added possibility to use IntegerField in ODS representation, defaulting precision to 0

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

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml?rev=25319&r1=25318&r2=25319&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml [utf8] Tue Jan 27 18:24:27 2009
@@ -109,30 +109,32 @@
             <tal:block tal:condition="python: isinstance(value, float)">\n
               <tal:block tal:define="field python: editable_fields.get(column_id, None)">\n
                 <tal:block tal:condition="python: field is not None">\n
-                  <tal:block tal:condition="python:field.meta_type==\'FloatField\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'FloatField\')">\n
-                    <tal:block tal:condition="python:field.get_value(\'precision\')>0">\n
-                      <table:table-cell tal:attributes="office:value value;\n
-                                        table:style-name python: \'decimal_%s_%s\' % (style_prefix , field.get_value(\'precision\'))"\n
-                                        office:value-type="float"\n
-                                        table:style-name="decimal">\n
-                        <text:p tal:content="python: field.render_pdf(value)" />\n
+                  <tal:block tal:condition="python:field.meta_type in [\'FloatField\',\'IntegerField\'] or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type in [\'FloatField\',\'IntegerField\'])">\n
+                    <tal:block tal:define="precision python: (field.meta_type == \'FloatField\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'FloatField\')) and field.get_value(\'precision\') or 0">\n
+                      <tal:block tal:condition="python:precision>0">\n
+                        <table:table-cell tal:attributes="office:value value;\n
+                                          table:style-name python: \'decimal_%s_%s\' % (style_prefix , precision)"\n
+                                          office:value-type="float"\n
+                                          table:style-name="decimal">\n
+                          <text:p tal:content="python: field.render_pdf(value)" />\n
+                        </table:table-cell>\n
+                      </tal:block>\n
+                      <tal:block tal:condition="not: python: precision>0">\n
+                        <table:table-cell tal:attributes="office:value value;\n
+                                          table:style-name string:${style_prefix}figure"\n
+                                          office:value-type="float"\n
+                                          table:style-name="figure">\n
+                          <text:p tal:content="python: field.render_pdf(value)" />\n
+                        </table:table-cell>\n
+                      </tal:block> \n
+                    </tal:block>\n
+                    <tal:block tal:condition="python:field.meta_type not in [\'FloatField\',\'IntegerField\'] and field.meta_type!=\'ProxyField\'">\n
+                      <table:table-cell tal:attributes="table:style-name string:${style_prefix}string;"\n
+                                        table:style-name="string"\n
+                                        office:value-type="string">\n
+                        <text:p>Error: field is not a FloatField nor an IntegerField</text:p>\n
                       </table:table-cell>\n
                     </tal:block>\n
-                    <tal:block tal:condition="not: python: field.get_value(\'precision\')>0">\n
-                      <table:table-cell tal:attributes="office:value value;\n
-                                        table:style-name string:${style_prefix}figure"\n
-                                        office:value-type="float"\n
-                                        table:style-name="figure">\n
-                        <text:p tal:content="python: field.render_pdf(value)" />\n
-                      </table:table-cell>\n
-                    </tal:block> \n
-                  </tal:block>\n
-                  <tal:block tal:condition="python:field.meta_type!=\'FloatField\' and field.meta_type!=\'ProxyField\'">\n
-                    <table:table-cell tal:attributes="table:style-name string:${style_prefix}string;"\n
-                                      table:style-name="string"\n
-                                      office:value-type="string">\n
-                      <text:p>Error: field is not a FloatField</text:p>\n
-                    </table:table-cell>\n
                   </tal:block>\n
                 </tal:block>\n
                 <tal:block tal:condition="python: field is None">\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=25319&r1=25318&r2=25319&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Tue Jan 27 18:24:27 2009
@@ -1,1 +1,1 @@
-176
+190