Commit 28af5029 authored by Tatuya Kamada's avatar Tatuya Kamada

* Fix

  - copy last-table-row-style when stat method or stat columns does not set
  - clean table-columns-value before listbox values setting
* Append
  the DefaultValue is the marker class indicate to use a ODF Template value



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26314 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 24d1eeb7
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.CMFCore.utils import _checkPermission, getToolByName from Products.CMFCore.utils import _checkPermission, getToolByName
from Products.PythonScripts.Utility import allow_class
from Products.ERP5Type import PropertySheet, Permissions from Products.ERP5Type import PropertySheet, Permissions
from Products.ERP5Form.ListBox import ListBox from Products.ERP5Form.ListBox import ListBox
from Products.ERP5Form.FormBox import FormBox from Products.ERP5Form.FormBox import FormBox
...@@ -102,9 +103,9 @@ class FormPrintout(Implicit, Persistent, RoleManager, Item): ...@@ -102,9 +103,9 @@ class FormPrintout(Implicit, Persistent, RoleManager, Item):
Fields <-> Paragraphs: supported Fields <-> Paragraphs: supported
ListBox <-> Table: supported ListBox <-> Table: supported
Report Section <-> Tables: experimentally supported Report Section <-> Tables: experimentally supported
FormBox <-> Frame: not supported yet FormBox <-> Frame: experimentally supported
Photo <-> Image: not supported yet Photo <-> Image: not supported yet
Style group <-> styles.xml: not supported yet Style group <-> styles.xml: supported
Meta group <-> meta.xml: not supported yet Meta group <-> meta.xml: not supported yet
""" """
...@@ -397,6 +398,7 @@ class ODFStrategy(Implicit): ...@@ -397,6 +398,7 @@ class ODFStrategy(Implicit):
image_list = element_tree.xpath(image_xpath, namespaces=NAME_SPACE_DICT) image_list = element_tree.xpath(image_xpath, namespaces=NAME_SPACE_DICT)
if len(image_list) > 0: if len(image_list) > 0:
image_list[0].set("{%s}href" % NAME_SPACE_DICT['xlink'], image_field.absolute_url()) image_list[0].set("{%s}href" % NAME_SPACE_DICT['xlink'], image_field.absolute_url())
return element_tree return element_tree
def _append_table_by_listbox(self, def _append_table_by_listbox(self,
...@@ -442,6 +444,7 @@ class ODFStrategy(Implicit): ...@@ -442,6 +444,7 @@ class ODFStrategy(Implicit):
# if ODF table has header rows, does not update the header rows # if ODF table has header rows, does not update the header rows
# if does not have header rows, insert the listbox title line # if does not have header rows, insert the listbox title line
is_top = True is_top = True
last_index = len(listboxline_list) - 1
for (index, listboxline) in enumerate(listboxline_list): for (index, listboxline) in enumerate(listboxline_list):
listbox_column_list = listboxline.getColumnItemList() listbox_column_list = listboxline.getColumnItemList()
if listboxline.isTitleLine() and not has_header_rows: if listboxline.isTitleLine() and not has_header_rows:
...@@ -454,14 +457,14 @@ class ODFStrategy(Implicit): ...@@ -454,14 +457,14 @@ class ODFStrategy(Implicit):
row = self._update_column_value(row, listbox_column_list) row = self._update_column_value(row, listbox_column_list)
newtable.append(row) newtable.append(row)
is_top = False is_top = False
elif listboxline.isStatLine() or index is last_index:
row = deepcopy(row_bottom)
row = self._update_column_stat_value(row, listbox_column_list, row_middle)
newtable.append(row)
elif index > 0 and listboxline.isDataLine(): elif index > 0 and listboxline.isDataLine():
row = deepcopy(row_middle) row = deepcopy(row_middle)
row = self._update_column_value(row, listbox_column_list) row = self._update_column_value(row, listbox_column_list)
newtable.append(row) newtable.append(row)
elif listboxline.isStatLine():
row = deepcopy(row_bottom)
row = self._update_column_stat_value(row, listbox_column_list, row_middle)
newtable.append(row)
# direct listbox mapping # direct listbox mapping
if render_prefix is None: if render_prefix is None:
...@@ -507,6 +510,7 @@ class ODFStrategy(Implicit): ...@@ -507,6 +510,7 @@ class ODFStrategy(Implicit):
return row return row
def _update_column_stat_value(self, row=None, listbox_column_list=[], row_middle=None): def _update_column_stat_value(self, row=None, listbox_column_list=[], row_middle=None):
"""stat line is capable of column span setting"""
if row_middle is None: if row_middle is None:
return row return row
odf_cell_list = row.findall("{%s}table-cell" % NAME_SPACE_DICT['table']) odf_cell_list = row.findall("{%s}table-cell" % NAME_SPACE_DICT['table'])
...@@ -525,15 +529,13 @@ class ODFStrategy(Implicit): ...@@ -525,15 +529,13 @@ class ODFStrategy(Implicit):
return row return row
def _set_column_value(self, column, value): def _set_column_value(self, column, value):
# if the value is a DefaultValue, uses the ODF template value
if isinstance(value, DefaultValue) or value == DefaultValue:
return
self._clear_column_value(column)
if value is None: if value is None:
# to eliminate a default value, remove "office:*" attributes.
# if remaining these attribetes, the column shows its default value,
# such as '0.0', '$0'
attrib = column.attrib
for key in attrib.keys():
if key.startswith("{%s}" % NAME_SPACE_DICT['office']):
del attrib[key]
value = '' value = ''
self._remove_column_value(column)
column_value = unicode(str(value),'utf-8') column_value = unicode(str(value),'utf-8')
column.text = column_value column.text = column_value
column_children = column.getchildren() column_children = column.getchildren()
...@@ -543,12 +545,35 @@ class ODFStrategy(Implicit): ...@@ -543,12 +545,35 @@ class ODFStrategy(Implicit):
first_child.text = column_value first_child.text = column_value
for child in column_children: for child in column_children:
column.remove(child) column.remove(child)
if first_child is not None:
column.append(first_child) column.append(first_child)
if column_value != '': if column_value != '':
value_attribute = self._get_column_value_attribute(column) value_attribute = self._get_column_value_attribute(column)
if value_attribute is not None: if value_attribute is not None:
column.set(value_attribute, column_value) column.set(value_attribute, column_value)
def _remove_column_value(self, column):
# to eliminate a default value, remove "office:*" attributes.
# if remaining these attribetes, the column shows its default value,
# such as '0.0', '$0'
attrib = column.attrib
for key in attrib.keys():
if key.startswith("{%s}" % NAME_SPACE_DICT['office']):
del attrib[key]
column_children = column.getchildren()
for child in column_children:
column.remove(child)
def _clear_column_value(self, column):
attrib = column.attrib
for key in attrib.keys():
value_attribute = self._get_column_value_attribute(column)
if value_attribute is not None:
column.set(value_attribute, '')
column_children = column.getchildren()
for child in column_children:
child.text = ''
def _get_column_value_attribute(self, column): def _get_column_value_attribute(self, column):
attrib = column.attrib attrib = column.attrib
for key in attrib.keys(): for key in attrib.keys():
...@@ -585,3 +610,19 @@ class ODFStrategy(Implicit): ...@@ -585,3 +610,19 @@ class ODFStrategy(Implicit):
class ODTStrategy(ODFStrategy): class ODTStrategy(ODFStrategy):
"""ODTStrategy create a ODT Document from a form and a ODT template""" """ODTStrategy create a ODT Document from a form and a ODT template"""
pass pass
class DefaultValue:
"""The DefaultValue is the marker object which indicate that using template value
Python Script Example: 'number' column uses ODF table cell value
from Products.PythonScripts.standard import Object
from Products.ERP5OOo.FormPrintout import DefaultValue
return [ Object(number=DefaultValue(),
total_price=context.getTotalPrice())]
"""
pass
InitializeClass(DefaultValue)
allow_class(DefaultValue)
...@@ -42,6 +42,8 @@ document_classes = updateGlobals( this_module, globals(), permissions_module = P ...@@ -42,6 +42,8 @@ document_classes = updateGlobals( this_module, globals(), permissions_module = P
from AccessControl import ModuleSecurityInfo from AccessControl import ModuleSecurityInfo
ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('OOoParser',) ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('OOoParser',)
ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('newOOoParser',) ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('newOOoParser',)
# Allow access to DefaultValue from scripts
ModuleSecurityInfo('Products.ERP5OOo.FormPrintout').declarePublic('DefalutValue',)
# Define object classes and tools # Define object classes and tools
from OOoTemplate import OOoTemplate from OOoTemplate import OOoTemplate
......
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