WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOgenerationXML.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
         int endPageLine = Integer.parseInt(tableau.getAttributeValue("endPageLine"));
         if (oLastColTmp != null) {
             lastColumn = sheet.resolveHint(oLastColTmp.toString() + 1).x + 1;
+        }
+        int firstLine = Integer.parseInt(tableau.getAttributeValue("firstLine"));
+        int endLine = Integer.parseInt(tableau.getAttributeValue("endLine"));
+        Object printRangeObj = sheet.getPrintRanges();
-        Map<String, Map<Integer, String>> mapStyle = searchStyle(sheet, lastColumn, endPageLine);
+        final Map<String, Map<Integer, String>> mapStyle;
         if (tableau.getAttributeValue("table").equalsIgnoreCase("TVA")) {
+            mapStyle = null;
-            fillTaxeDocumentMap(tableau, sheet, mapStyle, false);
+            fillTaxeDocumentMap(tableau, sheet, false);
             return;
+        } else {
+            mapStyle = searchStyle(sheet, firstLine, lastColumn, endLine);
+        }
         int nbPage = fillTable(tableau, row, sheet, mapStyle, true, rowLanguage);
-        int firstLine = Integer.parseInt(tableau.getAttributeValue("firstLine"));
-        int endLine = Integer.parseInt(tableau.getAttributeValue("endLine"));
-        Object printRangeObj = sheet.getPrintRanges();
         System.err.println("Nombre de page == " + nbPage);
         if (nbPage == 1) {
             fillTable(tableau, row, sheet, mapStyle, false, rowLanguage);
         } else {
                 for (int i = 0; i < range.length; i++) {
                     String string = range[i];
                     range[i] = string.subSequence(string.indexOf('.') + 1, string.length()).toString();
+                }
-                int rowEnd = -1;
                 if (range.length > 1) {
-                    rowEnd = sheet.resolveHint(range[1]).y + 1;
+                    int rowEnd = sheet.resolveHint(range[1]).y + 1;
-                    int rowEndNew = rowEnd * (nbPage);
+                    int rowEndNew = rowEnd * nbPage;
                     String sNew = s.replaceAll(String.valueOf(rowEnd), String.valueOf(rowEndNew));
                     sheet.setPrintRanges(sNew);
                     System.err.println(" ******  Replace print ranges; Old:" + rowEnd + "--" + s + " New:" + rowEndNew + "--" + sNew);
+                }
+            }
             mapNbCel.put(e.getAttributeValue("location").trim(), nbCellule);
+        }
         return nbCellule;
+    }
-    private void fillTaxeDocumentMap(Element tableau, Sheet sheet, Map<String, Map<Integer, String>> mapStyle, boolean test) {
+    private void fillTaxeDocumentMap(Element tableau, Sheet sheet, boolean test) {
         int line = Integer.parseInt(tableau.getAttributeValue("firstLine"));
         List<Element> listElts = tableau.getChildren("element");
         for (SQLRowAccessor rowTaxe : taxe.keySet()) {
             MutableCell cell = sheet.getCellAt(location);
             // on divise en 2 cellules si il y a des retours à la ligne
             if (controleMultiline && value != null && value.toString().indexOf('\n') >= 0) {
+                String[] values;
+                if (cell.getRowsSpanned() < 2) {
+                    // TODO : mettre une option pour splitter ou pas
-                String[] values = value.toString().split("\n");
+                    values = value.toString().split("\n");
+                } else {
+                    values = new String[] { value.toString() };
+                }
                 Point p = sheet.resolveHint(location);
                 int y = 0;
                 for (String string : values) {
                     if (string != null && (keepEmptyLines || string.trim().length() != 0)) {
+    }
     /**
      * parcourt l'ensemble de la feuille pour trouver les style définit
      */
-    private Map<String, Map<Integer, String>> searchStyle(Sheet sheet, int colEnd, int rowEnd) {
+    private Map<String, Map<Integer, String>> searchStyle(Sheet sheet, int rowDeb, int colEnd, int rowEnd) {
         if (cacheStyle.get(sheet) != null) {
             return cacheStyle.get(sheet);
+        }
         // on parcourt chaque ligne de la feuille pour recuperer les styles
         int columnCount = (colEnd == -1) ? sheet.getColumnCount() : (colEnd + 1);
         System.err.println("End column search : " + columnCount);
         int rowCount = (rowEnd > 0) ? rowEnd : sheet.getRowCount();
+        int start = (rowDeb - 1 > 0) ? rowDeb - 1 : 0;
         System.err.println("End row search : " + rowCount);
-        for (int i = 0; i < rowCount; i++) {
+        for (int i = start; i < rowCount; i++) {
             int x = 0;
             Map<Integer, String> mapCellStyle = new HashMap<>();
             String style = "";
             for (int j = 0; j < columnCount; j++) {
+            }
             final Sheet sheet = spreadSheet.getSheet(0);
             Object oLastColTmp = tableau.getAttributeValue("lastColumn");
             int lastColumn = -1;
-            int endPageLine = Integer.parseInt(tableau.getAttributeValue("endPageLine"));
             if (oLastColTmp != null) {
                 lastColumn = sheet.resolveHint(oLastColTmp.toString() + 1).x + 1;
+            }
+            int firstLine = Integer.parseInt(tableau.getAttributeValue("firstLine"));
+            int endLine = Integer.parseInt(tableau.getAttributeValue("endLine"));
-            Map<String, Map<Integer, String>> mapStyle = searchStyle(sheet, lastColumn, endPageLine);
+            Map<String, Map<Integer, String>> mapStyle = searchStyle(sheet, firstLine, lastColumn, endLine);
             int nbPage = fillTable(tableau, row, sheet, mapStyle, true, rowLanguage);
             return nbPage > 1;
         } catch (Throwable e) {

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOgenerationXML.java - Rev 180 → 182