Merge pull request #2200 from laws-africa/fix-tables

bring back setting rowspans to a max -- FOP complains about empty rows

Author: goose-life

indigo_api/exporters.py

@@ -395,11 +395,18 @@ def resize_tables(self, doc):
         """ Ensure that tables have the correct number of columns and rows, otherwise
         PDF generation fails.
         """
-        # there should never be a completely empty row -- check for this first
         for table in doc.root.xpath('//a:table', namespaces={'a': doc.namespace}):
+            # there should never be a completely empty row (FOP constraint)
+            for empty_row in table.xpath('a:tr[not(a:td|a:th)]', namespaces={'a': doc.namespace}):
+                table.remove(empty_row)
+            # a cell can't span more rows than actually come after it (FOP constraint)
             for row in table.xpath('a:tr', namespaces={'a': doc.namespace}):
-                if not row.xpath('a:td|a:th', namespaces={'a': doc.namespace}):
-                    table.remove(row)
+                actual = len(list(row.itersiblings(f'{{{doc.namespace}}}tr')))
+                for cell in row.xpath('a:td[@rowspan] | a:th[@rowspan]', namespaces={'a': doc.namespace}):
+                    rowspan = int(cell.get('rowspan', 1))
+                    if rowspan > 1:
+                        # rowspan is the smaller of the current rowspan, and the actual number of rows (plus this one)
+                        cell.set('rowspan', str(min(rowspan, actual + 1)))
 
             matrix = self.map_table(table, doc)
 

indigo_api/tests/pdf_fixtures/tables/bad_spans_out.xml

@@ -8,7 +8,7 @@
         <content>
           <table eId="att_1__table_2" class="border">
             <colgroup><col width="14.285714285714286%"/><col width="14.285714285714286%"/><col width="14.285714285714286%"/><col width="14.285714285714286%"/><col width="14.285714285714286%"/><col width="14.285714285714286%"/><col width="14.285714285714286%"/></colgroup><tr>
-              <td rowspan="12">
+              <td rowspan="5">
                 <p eId="att_1__table_2__p_1">Nature of ownership<br/>or control the<br/>beneficial owner has<br/>in the company ,<br/>whether individually<br/>or jointly*</p>
               </td>
               <td rowspan="2" colspan="3">
@@ -31,11 +31,11 @@
               </td>
             </tr>
             <tr>
-              <td rowspan="2" colspan="3" style="width:54.078%">
+              <td rowspan="1" colspan="3" style="width:54.078%">
                 <p eId="att_1__table_2__p_6">.A person holds the highest percentage of the issued<br/>shares but does not meet the above<br/>four criteria . <br/>- Directly.........%of shares<br/>-Indirectly.........%of shares</p>
               </td>
             <td><p/></td><td><p/></td><td><p/></td></tr>
-          <tr><td><p/></td><td><p/></td><td><p/></td></tr><tr><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td></tr><tr><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td></tr><tr><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td></tr><tr><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td></tr><tr><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td></tr><tr><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td><td><p/></td></tr></table>
+          </table>
           <table eId="att_2__table_1" class="border">
             <colgroup><col width="55.6701030927835%"/><col width="4.123711340206185%"/><col width="3.092783505154639%"/><col width="6.185567010309278%"/><col width="6.185567010309278%"/><col width="6.185567010309278%"/><col width="6.185567010309278%"/><col width="6.185567010309278%"/><col width="6.185567010309278%"/></colgroup><tr>
               <td colspan="4">