Merge lp:~igudym/openobject-server/table-styles-server into lp:openobject-server/5.0

[Ivan Gudym]

This branch is connected with lp:~igudym/openobject-addons/table-styles-addons

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

This is interesting, but please resubmit your changes for trunk, as we cannot merge any improvement on 5.0.

Thanks!

Unmerged revisions

2038. By Ivan Gudym on 2010-04-17

Fix table styles, Fixed colspan attrib, Blocktable background fix

=== modified file 'bin/report/preprocess.py'
--- bin/report/preprocess.py	2009-06-30 13:36:26 +0000
+++ bin/report/preprocess.py	2010-04-17 19:32:22 +0000
@@ -50,6 +50,8 @@
                     while n.tag not in match:
                         n = n.getparent()
                     n.set('rml_loop', txt.group(2))
+                    if n.tag == 'tr':
+                        self.fix_table_style(n)
                     return '[['+txt.group(1)+"''"+txt.group(4)+']]'
                 t = _regex1.sub(_sub1, node.text)
                 if t == " ":
@@ -59,6 +61,27 @@
             self.preprocess_rml(node,type)
         return root_node
 
+    def fix_table_style(self, row):
+        table = row.getparent()
+        loop = table.index(row)
+        num_rows = len(table)
+        root = table.getroottree()
+        tableStyle = root.find(".//blockTableStyle[@id='%s']" % table.get("style"))
+        for s in tableStyle:
+            if s.tag in ["lineStyle", "blockSpan", "blockBackground"]:
+                b_col, b_row = self.parse_startstop(s.get('start'))
+                e_col, e_row = self.parse_startstop(s.get('stop'))
+                if b_row > loop:
+                    b_row = b_row - num_rows
+                if e_row >= loop:
+                    e_row = e_row - num_rows
+                s.set("start", "%d,%d" % (b_col, b_row))
+                s.set("stop", "%d,%d" % (e_col, e_row))
+
+    def parse_startstop(self, line):
+        p = line.split(",")
+        return int(p[0]), int(p[1])
+
 if __name__=='__main__':
     node = etree.XML('''<story>
     <para>This is a test[[ setTag('para','xpre') ]]</para>