Commit 9fdde4e3 authored by Thibaut Deheunynck's avatar Thibaut Deheunynck

thibaut

Add a new style in the ods render when we have an editable date field in the listbox.
Now you have two styles, the default style (ie: day/month/year) and the new style named  date_with_time. This style displays the date  In the following way : day/month/year hours:minutes:seconds.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23110 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1c295844
...@@ -113,19 +113,42 @@ ...@@ -113,19 +113,42 @@
</tal:block>\n </tal:block>\n
<tal:block tal:condition="not: is_float">\n <tal:block tal:condition="not: is_float">\n
<tal:block tal:condition="python: isinstance(value, DateTime)">\n <tal:block tal:condition="python: isinstance(value, DateTime)">\n
<table:table-cell tal:define="field python: editable_fields.get(column_id, None);"\n <tal:block tal:define="field python: editable_fields.get(column_id, None);">\n
tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n <tal:block tal:condition="python: field is None">\n
table:style-name string:${style_prefix}date"\n <table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
table:style-name="date"\n table:style-name string:${style_prefix}date;"\n
office:value-type="date">\n table:style-name="date"\n
\n office:value-type="date">\n
<text:p tal:condition="python: field is None"\n <text:p tal:content="python: value"/>\n
tal:content="python: value"/>\n </table:table-cell>\n
<text:p tal:condition="python: field is not None"\n </tal:block>\n
tal:content="python: field.render_pdf(value)">\n <tal:block tal:condition="python: field is not None">\n
</text:p>\n <tal:block tal:condition="python:field.meta_type==\'DateTimeField\' and field.get_value(\'date_only\')"> \n
</table:table-cell>\n <table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
</tal:block>\n table:style-name string:${style_prefix}date;"\n
table:style-name="date"\n
office:value-type="date">\n
<text:p tal:content="python: field.render_pdf(value)"/>\n
</table:table-cell>\n
</tal:block>\n
<tal:block tal:condition="python:field.meta_type==\'DateTimeField\' and field.get_value(\'date_only\')==0">\n
<table:table-cell tal:attributes="office:date-value python: value.strftime(\'%Y-%m-%dT%H:%M:%S\');\n
table:style-name string:${style_prefix}date_with_time;"\n
table:style-name="date_with_time"\n
office:value-type="date">\n
<text:p tal:content="python: field.render_pdf(value)"/>\n
</table:table-cell>\n
</tal:block>\n
<tal:block tal:condition="python:field.meta_type!=\'DateTimeField\'">\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 DateTimeField</text:p>\n
</table:table-cell>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block> \n
<tal:block tal:condition="python:not isinstance(value, DateTime)">\n <tal:block tal:condition="python:not isinstance(value, DateTime)">\n
<table:table-cell tal:define="field python: editable_fields.get(column_id, None)"\n <table:table-cell tal:define="field python: editable_fields.get(column_id, None)"\n
tal:attributes="table:style-name string:${style_prefix}text"\n tal:attributes="table:style-name string:${style_prefix}text"\n
......
...@@ -130,6 +130,22 @@ ...@@ -130,6 +130,22 @@
<style:table-cell-properties style:vertical-align=\'middle\' style:repeat-content=\'false\' style:text-align-source=\'fix\' fo:border=\'none\'/>\n <style:table-cell-properties style:vertical-align=\'middle\' style:repeat-content=\'false\' style:text-align-source=\'fix\' fo:border=\'none\'/>\n
<style:paragraph-properties fo:text-align=\'center\' fo:margin-left=\'0cm\'/>\n <style:paragraph-properties fo:text-align=\'center\' fo:margin-left=\'0cm\'/>\n
</style:style>\n </style:style>\n
<number:date-style style:name="date_style" number:automatic-order="true">\n
<number:day number:style="long"/>\n
<number:text>/</number:text>\n
<number:month number:style="long"/>\n
<number:text>/</number:text>\n
<number:year number:style="long"/>\n
<number:text> </number:text>\n
<number:hours number:style="long"/>\n
<number:text>:</number:text>\n
<number:minutes number:style="long"/>\n
<number:text>:</number:text>\n
<number:seconds number:style="long"/>\n
</number:date-style>\n
<style:style style:name="date_with_time" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="date_style">\n
<style:table-cell-properties style:vertical-align=\'middle\' style:repeat-content=\'false\' style:text-align-source=\'fix\' fo:border-right=\'0.002cm solid #000000\' />\n
</style:style>\n
</office:automatic-styles>\n </office:automatic-styles>\n
</tal:block>\n </tal:block>\n
......
141 146
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment