r3648 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb - Lima-commits

18 Sep 2012

Author: tchemit
Date: 2012-09-18 18:05:43 +0200 (Tue, 18 Sep 2012)
New Revision: 3648

Url: http://chorem.org/repositories/revision/lima/3648

Log:
refs #809: Patch rapports html (apply patch, thanks!)


Modified:
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
===================================================================

--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java	2012-09-18 15:59:06 UTC (rev 3647)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java	2012-09-18 16:05:43 UTC (rev 3648)
@@ -132,9 +132,7 @@
 
         try {
 
-            financialReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
-                    "<html>\n" +
-                    "<body>\n";
+            financialReport = constructHtmlHeader("");
 
             //Split list by financialstatement type
             List<List<FinancialStatementAmounts>> listList =
@@ -182,13 +180,13 @@
                     if (printedType == 0) {
                         String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.grossamount")+boldEnd,
                                 boldBegin+_("lima-business.document.provisiondeprecationamount")+boldEnd, boldBegin+_("lima-business.document.netamount")+boldEnd};
-                        financialReport += constructColumnsHtml(columnHeaderTable, "");
+                        financialReport += constructTableLine(columnHeaderTable);
                     } else if (printedType == 1) {
                         String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd};
-                        financialReport += constructColumnsHtml(columnHeaderTable, "");
+                        financialReport += constructTableLine(columnHeaderTable);
                     } else {
                         String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd};
-                        financialReport += constructColumnsHtml(columnHeaderTable, "");
+                        financialReport += constructTableLine(columnHeaderTable);
                     }
 
                     for (FinancialStatementAmounts financialStatementAmount : subFinancialStatementAmounts) {
@@ -217,10 +215,10 @@
                         if (label == null) {
                             if (printedType == 0) {
                                 String [] emptyColumn = {"","","",""};
-                                financialReport += constructColumnsHtml(emptyColumn, fontColor);
+                                financialReport += constructTableLine(emptyColumn);
                             } else {
                                 String [] emptyColumn = {"", ""};
-                                financialReport += constructColumnsHtml(emptyColumn, fontColor);
+                                financialReport += constructTableLine(emptyColumn);
                             }
                         } else {
                             //cell1
@@ -257,14 +255,11 @@
 
                             if (printedType == 0) {
                                 String [] columns = {tabLabel, grossAmountStr, provisionDeprecationAmountStr, soldeStr};
-                                financialReport += constructColumnsHtml(columns, "");
+                                financialReport += constructTableLine(columns);
                             } else /*if (printedType == 1)*/ {
                                 String [] columns = {tabLabel, soldeStr};
-                                financialReport += constructColumnsHtml(columns, "");
-                            } /*else {
-                                String [] columns = {tabLabel, grossAmountStr, provisionDeprecationAmountStr, soldeStr};
-                                financialReport += constructColumnsHtml(columns, "");
-                            }*/
+                                financialReport += constructTableLine(columns);
+                            }
                         }
                     }
                     i = i + max;
@@ -288,13 +283,10 @@
                                       Date endDate) throws LimaException {
 
         List<Object> list = new ArrayList<Object>();
-        String ledgerReport = "";
-        ledgerReport += "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
-                "<html>\n";
+        String ledgerReport = constructHtmlHeader(_("lima-business.document.ledger"));
 
         if (beginDate != null && endDate != null) {
             try {
-                ledgerReport += "<body>\n";
                 String boldBegin = "<b>";
                 String boldEnd = "</b>";
 
@@ -335,22 +327,23 @@
                         String [] columnsCarryBack = {boldBegin + accountcarry + boldEnd, boldBegin + _("lima-business.document.carryback") + boldEnd,
                                 boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd,
                                 boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd};
-                        ledgerReport += constructColumnsHtml(columnsCarryBack, "");
+                        ledgerReport += constructTableLine(columnsCarryBack);
                     }
 
-                    ledgerReport +=  "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n" +
-                            "<tr>\n";
+                    ledgerReport +=  "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n";
 
-                    String [] columnsNames = {boldBegin + _("lima-business.document.account")+ boldEnd, boldBegin + _("lima-business.document.debit") + boldEnd,
-                            boldBegin + _("lima-business.document.credit") + boldEnd, boldBegin + _("lima-business.document.solde") + boldEnd};
-                    ledgerReport += constructColumnsHtml(columnsNames, "");
+                    String [] columnsNames = {_("lima-business.document.account"), _("lima-business.document.debit"),
+                        _("lima-business.document.credit"), _("lima-business.document.solde")};
+                    ledgerReport += constructTableHeader(columnsNames);
+                    ledgerReport += "<tbody>\n";
 
                     int indexEntry = -1;
+                    boolean even = true;
                     for (Object object : subList) {
                         if (object instanceof ReportsDatas) {
                             if (indexEntry != -1) {
                                 indexEntry = -1;
-                                ledgerReport +=  "</table>" +
+                                ledgerReport +=  "</tbody></table>" +
                                         "</td>" +
                                         "</tr>";
                             }
@@ -364,10 +357,10 @@
                             BigDecimal amountCredit = reportsDatas.getAmountCredit();
                             BigDecimal amountDebit = reportsDatas.getAmountDebit();
 
-                            String [] columnsTable = {boldBegin + accountS + boldEnd,
-                                    boldBegin + amountDebit.toString() + boldEnd, boldBegin + amountCredit.toString() + boldEnd,
-                                    boldBegin + amountDebit.subtract(amountCredit).toString() + boldEnd};
-                            ledgerReport += constructColumnsHtml(columnsTable, "");
+                            String [] columnsTable = {accountS,
+                                    amountDebit.toString(), amountCredit.toString(),
+                                    amountDebit.subtract(amountCredit).toString()};
+                            ledgerReport += constructTableHeader(columnsTable);
 
                         } else {
                             indexEntry++;
@@ -388,20 +381,20 @@
 
                             ledgerReport +="<tr>";
                             if (indexEntry == 0) {
-                            ledgerReport +=  "<td><table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n" +
-                                    "<tr>\n";
-                                String [] columnsEntry = {boldBegin + _("lima-business.document.date")+ boldEnd,
-                                        boldBegin + _("lima-business.document.entrybook") + boldEnd, boldBegin + _("lima-business.document.voucher") + boldEnd,
-                                        boldBegin + _("lima-business.document.description") + boldEnd, boldBegin + _("lima-business.document.debit") + boldEnd,
-                                        boldBegin + _("lima-business.document.credit") + boldEnd, boldBegin + _("lima-business.document.solde") + boldEnd};
-                                ledgerReport += constructColumnsHtml(columnsEntry, "");
+                            ledgerReport +=  "<td><table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n";
+                                String [] columnsEntry = {_("lima-business.document.date"),
+                                        _("lima-business.document.entrybook"), _("lima-business.document.voucher"),
+                                        _("lima-business.document.description"), _("lima-business.document.debit"),
+                                        _("lima-business.document.credit"), _("lima-business.document.solde")};
+                                ledgerReport += constructTableHeader(columnsEntry);
+                                ledgerReport += "<tbody>";
                             }
 
                             String [] columnsTable = {_("lima-business.document.dateformat",entry.getFinancialTransaction().getTransactionDate()),
                                     entryBookCode, entry.getVoucher(), entry.getDescription(),
                                     amountDebit.toString(), amountCredit.toString(), amountDebit.subtract(amountCredit).toString()};
-                            ledgerReport += constructColumnsHtml(columnsTable, "");
-                                ledgerReport += "</tr>";
+                            ledgerReport += constructTableLine(columnsTable, even);
+                            even = !even;
                         }
                     }
 
@@ -427,18 +420,20 @@
                             String [] columnsTable = {"", boldBegin + _("lima-business.document.carryforward") + boldEnd,
                                     boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd,
                                     boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd};
-                            ledgerReport += constructColumnsHtml(columnsTable, "");
+                            ledgerReport += constructTableLine(columnsTable, even);
+                            even = !even;
                         }
                         //final amounts
                         if (i >= n - max) {
                             String [] columnsTable = { boldBegin + _("lima-business.document.amounts") + boldEnd,
                                     boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd,
                                     boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd};
-                            ledgerReport += constructColumnsHtml(columnsTable, "");
+                            ledgerReport += constructTableLine(columnsTable, even);
+                            even = !even;
                         }
                         i = i + max;
                 }
-                ledgerReport += "</table></body>\n</html>";
+                ledgerReport += "</tbody></table></body>\n</html>";
             }catch (Exception ex) {
                 log.error("Can't create document", ex);
             }
@@ -452,12 +447,8 @@
         String entryBookReport;
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MMMMM yyyy");
         try {
-            entryBookReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
-                    "<html>\n";
+            entryBookReport = constructHtmlHeader(_("lima-business.document.entrybooks"));
 
-            String titre = _("lima-business.document.entrybooks");
-            entryBookReport += constructHeadHtml(titre);
-
             if (beginDate != null && endDate != null) {
 
                 ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO =
@@ -468,7 +459,6 @@
                 List<ClosedPeriodicEntryBook> closedPeriodicEntryBookList =
                         closedPeriodicEntryBookDAO.findAllByDates(beginDate, endDate);
 
-                entryBookReport += "<body>\n";
                 String journal = "";
                 for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookList) {
 
@@ -508,7 +498,7 @@
                             entryBookReport += constructSubTitleHtml("", subTitleSecPart);
                         }
 
-                        entryBookReport += "<p><table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" +
+                        entryBookReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" +
                                 "<tr align=\"center\">\n";
 
                         String [] columnNames = {_("lima-business.document.date"), _("lima-business.document.accountnumber"),
@@ -516,7 +506,7 @@
                                 _("lima-business.document.debit"),
                                 _("lima-business.document.credit")};
 
-                        entryBookReport += constructColumnsHtml(columnNames, "");
+                        entryBookReport += constructTableHeader(columnNames);
 
                         for (Entry entry : entries) {
                             String numaccount = null;
@@ -529,10 +519,10 @@
                                     (entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO).toString(),
                                     (entry.getDebit() ? BigDecimal.ZERO : entry.getAmount()).toString()};
 
-                            entryBookReport += constructColumnsHtml(columnData, "");
+                            entryBookReport += constructTableHeader(columnData);
                         }
                         String [] columnDataTotal = {"", "", "", _("lima-business.document.amounts"), debit.toString(), credit.toString()};
-                        entryBookReport += constructColumnsHtml(columnDataTotal, "");
+                        entryBookReport += constructTableHeader(columnDataTotal);
                         entryBookReport += "</table></p>\n";
                     }
                 }
@@ -556,9 +546,7 @@
 
         List<ReportsDatas> list = (List<ReportsDatas>) balanceTrial.getReportsDatas();
 
-        String balanceReport = "";
-        balanceReport += "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
-                "<html>\n";
+        String balanceReport = constructHtmlHeader(_("lima-business.document.balance"));
 
         if (beginDate != null && endDate != null) {
             try{
@@ -581,85 +569,15 @@
                     }
                     List<ReportsDatas> subList = list.subList(i, j);
 
-                    balanceReport += "<body>\n";
                     balanceReport += constructHeaderTitle(_("lima-business.document.balance"), beginDate, endDate);
 
-                    /*balanceReport += "<table>" +
-                            "<tr> " +
-                            "<td>" +
-                            "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n" +
-                            "<tr>\n";
+                    balanceReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n";
 
-                    String boldItalicBegin = "<b>" + "<i>";
-                    String boldItalicEnd = "</i>" + "</b>";
-
-                    String [] columnsNameSociety = {boldItalicBegin + identity.getName()+ boldItalicEnd};
-                    balanceReport += constructColumnsHtml(columnsNameSociety, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsDescription = {"<i>" + identity.getDescription()+ "</i>"};
-                    balanceReport += constructColumnsHtml(columnsDescription, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsAdressOne = {"<i>" + identity.getAddress() + "</i>"};
-                    balanceReport += constructColumnsHtml(columnsAdressOne, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsAdressTwo = {"<i>" + identity.getAddress2() + "</i>"};
-                    balanceReport += constructColumnsHtml(columnsAdressTwo, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsZipCode = {"<i>" + identity.getZipCode() + "</i>"};
-                    balanceReport += constructColumnsHtml(columnsZipCode, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsCity = {"<i>" + identity.getCity()+ "</i>"};
-                    balanceReport += constructColumnsHtml(columnsCity, "");
-
-                    balanceReport += "</table>\n" +
-                                "</td>" +
-                                "<td valign=\"middle\" align=\"center\" style=\"width:100%\">" +
-                                "<p style=\"font-size:30px;\">" + _("lima-business.document.balance") + "</p>" +
-                                "</td>" +
-                                "<td>" +
-                                "<table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n";
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsBusinessNumber = {boldItalicBegin + _("lima-business.document.businessnumber") +
-                            boldItalicEnd, "<i>" + identity.getBusinessNumber()+ "</i>"};
-                    balanceReport += constructColumnsHtml(columnsBusinessNumber, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsClassifCode = {boldItalicBegin + _("lima-business.document.classificationcode") +
-                            boldItalicEnd, "<i>" + identity.getClassificationCode()+ "</i>"};
-                    balanceReport += constructColumnsHtml(columnsClassifCode, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsVatNumber = {boldItalicBegin + _("lima-business.document.vatnumber") + boldItalicEnd,
-                            "<i>" + identity.getVatNumber()+ "</i>", };
-                    balanceReport += constructColumnsHtml(columnsVatNumber, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsPeriodOne = {boldItalicBegin + _("lima-business.document.period1") + boldItalicEnd, "<i>"
-                            + _("lima-business.document.period1format", beginDate)+ "</i>"};
-                    balanceReport += constructColumnsHtml(columnsPeriodOne, "");
-
-                    balanceReport += "<tr>\n";
-                    String [] columnsPeriodTwo = {boldItalicBegin + _("lima-business.document.period2") + boldItalicEnd, "<i>"
-                            + _("lima-business.document.period2format", endDate)+ "</i>"};
-                    balanceReport += constructColumnsHtml(columnsPeriodTwo, "");
-
-                    balanceReport += "</table>" +
-                            "</td>" +
-                            "</table>"*/
-
-                    balanceReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" +
-                            "<tr align=\"center\">\n";
-
                     String [] columnsNames = {_("lima-business.document.accountnumber"), _("lima-business.document.description"),
                             _("lima-business.document.movementdebit"), _("lima-business.document.movementcredit"),
                             _("lima-business.document.soldedebit"), _("lima-business.document.soldecredit")};
-                    balanceReport += constructColumnsHtml(columnsNames, "");
+                    balanceReport += constructTableHeader(columnsNames);
+                    balanceReport += "\t\t<tbody>\n";
 
                     if (n > max) {
                         String boldBegin = "<b>";
@@ -667,10 +585,11 @@
                         String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.carryback") + boldEnd,
                                 boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd,
                                 boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd};
-                        balanceReport += constructColumnsHtml(columnsBalanceAmount, "");
-                        balanceReport += "</table>\n";
+                        balanceReport += constructTableLine(columnsBalanceAmount);
+                        balanceReport += "</tbody></table>\n";
                     }
 
+                    boolean even = true;
                     for (ReportsDatas reportsDatas : subList) {
                         String soldeDebit = String.valueOf(reportsDatas.getSoldeDebit() ? reportsDatas.getAmountSolde() : 0);
                         String soldeCredit = String.valueOf(reportsDatas.getSoldeDebit() ? 0 : reportsDatas.getAmountSolde());
@@ -678,7 +597,8 @@
                         String [] columnsBalanceAmount = {reportsDatas.getAccount().getAccountNumber(), reportsDatas.getAccount().getLabel(),
                                 reportsDatas.getAmountDebit().toString(), reportsDatas.getAmountCredit().toString(),
                                 soldeDebit, soldeCredit};
-                        balanceReport += constructColumnsHtml(columnsBalanceAmount, "");
+                        balanceReport += constructTableLine(columnsBalanceAmount, even);
+                        even = !even;
                     }
 
                     for (ReportsDatas reportsDatas : subList) {
@@ -697,8 +617,9 @@
                         String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.carryforward") + boldEnd,
                                 boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd,
                                 boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd};
-                        balanceReport += constructColumnsHtml(columnsBalanceAmount, "");
-                        balanceReport += "</table>\n";
+                        balanceReport += constructTableLine(columnsBalanceAmount, even);
+                        even = !even;
+                        balanceReport += "</tbody></table>\n";
                     }
 
                     //final amounts
@@ -708,8 +629,9 @@
                         String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.amounts") + boldEnd,
                                 boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd,
                                 boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd};
-                        balanceReport += constructColumnsHtml(columnsBalanceAmount, "");
-                        balanceReport += "</table>\n";
+                        balanceReport += constructTableLine(columnsBalanceAmount, even);
+                        even = !even;
+                        balanceReport += "</tbody></table>\n";
                     }
                     i = i + max;
                 }
@@ -731,13 +653,15 @@
 
         String entryBookReport;
         try {
-            entryBookReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
-                    "<html>\n";
+            entryBookReport = constructHtmlHeader(_("lima-business.document.entrybook"));
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy");
 
-            String titre = _("lima-business.document.entrybook");
-            entryBookReport += constructHeadHtml(titre);
-
             if (beginDate != null && endDate != null) {
+                String subTitle =  _("lima-business.document.period1") +
+                    simpleDateFormat.format(beginDate) + " " +
+                    _("lima-business.document.period2") +
+                    simpleDateFormat.format(endDate);
+                entryBookReport += constructSubTitleHtml(subTitle);
 
                 FinancialPeriodDAO financialPeriodDAO =
                         getDaoHelper().getFinancialPeriodDAO();
@@ -815,16 +739,16 @@
                 generalEntryBooksDatas.setDebit(amountDebit);
                 list.add(generalEntryBooksDatas);
 
-                entryBookReport += "<body>\n" +
-                        "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" +
-                        "<tr align=\"center\">\n";
+                entryBookReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n";
 
                 String[] columnNames = {_("lima-business.document.entrybook"), _("lima-business.document.label"),
                         _("lima-business.document.date"), _("lima-business.document.debit"),
                         _("lima-business.document.credit")};
 
-                entryBookReport += constructColumnsHtml(columnNames, "");
+                entryBookReport += constructTableHeader(columnNames);
+                entryBookReport += "\t\t<tbody>\n";
                 String entryBookCode = "";
+                boolean even = true;
 
                 for (GeneralEntryBooksDatas generalEntryBooksDataInList : list) {
                     if (!generalEntryBooksDataInList.getDebit().equals(BigDecimal.ZERO) && !generalEntryBooksDataInList.getCredit().equals(BigDecimal.ZERO)) {
@@ -843,7 +767,8 @@
                                     _("lima-business.document.monthformat", generalEntryBooksDataInList.getPeriod()),
                                     generalEntryBooksDataInList.getDebit().toString(),
                                     generalEntryBooksDataInList.getCredit().toString()};
-                            entryBookReport += constructColumnsHtml(columnData, "");
+                            entryBookReport += constructTableLine(columnData, even);
+                            even = !even;
                         } else {
                             String amount;
                             if (generalEntryBooksDataInList.getAmount()) {
@@ -851,14 +776,18 @@
                             } else {
                                 amount = _("lima-business.document.amountsperiod", generalEntryBooksDataInList.getPeriod());
                             }
-                            String[] columnDataTotal = {"", "", "<b>"+ (StringUtils.isBlank(amount)?"":amount) + "</b>",
+                            String[] columnDataTotal = {"", "", (StringUtils.isBlank(amount)?"":amount),
                                     generalEntryBooksDataInList.getDebit().toString(),
                                     generalEntryBooksDataInList.getCredit().toString()};
-                            entryBookReport += constructColumnsHtml(columnDataTotal, "");
+                            entryBookReport += constructTableLine(columnDataTotal, even);
+                            even = !even;
                             entryBookCode = "";
                         }
                     }
                 }
+                entryBookReport += "\t\t</tbody>\n" +
+                    "\t</table>\n" +
+                    "</body>\n</html>";
             }
         } catch (Exception ex) {
             throw new LimaException("Can't generate document", ex);
@@ -954,10 +883,7 @@
             Account accountFormat = accountDAO.findByTopiaId(account);
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy");
 
-            accountReport += "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
-                    "<html>\n";
-            String title = _("lima.reports.accounts");
-            accountReport = constructHeadHtml(title);
+            accountReport = constructHtmlHeader(_("lima.reports.accounts"));
 
             ReportsDatas results;
 
@@ -975,12 +901,12 @@
                                         _("lima.table.voucher"), _("lima.table.description"), _("lima.table.letter"),
                                         _("lima.table.debit"), _("lima.table.credit")};
 
-                accountReport += "<body>\n" +
-                                "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" +
-                                "<tr align=\"center\">\n";
+                accountReport += "\t<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n";
 
-                accountReport += constructColumnsHtml(columnNames, "");
-
+                accountReport += constructTableHeader(columnNames);
+                accountReport += "\t\t<tbody>\n";
+                
+                boolean even = true;
                 for(Entry entry : entries) {
 
                     String accountNumber = entry.getAccount().getAccountNumber();
@@ -1000,11 +926,12 @@
                                             (entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO).toString(),
                                             (entry.getDebit() ? BigDecimal.ZERO : entry.getAmount()).toString()};
 
-                    accountReport += constructColumnsHtml(columnData, "");
+                    accountReport += constructTableLine(columnData, even);
+                    even = !even;
                 }
 
-                accountReport += "</table>\n" +
-                                 "</body>\n";
+                accountReport += "\t\t</tbody>\n\t</table>\n" +
+                    "</body>\n";
 
             } else {
                 JOptionPane.showMessageDialog(null, _("lima.reports.account.noaccount"), _("lima.reports.account.noaccounttitle"), JOptionPane.INFORMATION_MESSAGE);
@@ -1022,45 +949,59 @@
         return accountReport;
     }
 
-    protected String constructHeadHtml(String title) {
-        String head =
-                "<head>\n" +
-                "<title>"+title+"</title>\n" +
-                "</head>\n" +
-                "<p align=\"center\">" +
-                "<font size=5>\n" +
-                title +
-                "</font>\n" +
-                "</p>\n" +
-                "<p>";
-
+    protected String constructHtmlHeader(String title) {
+        String head = "<!DOCTYPE html>\n" +
+            "<html>\n" +
+            "<head>\n" +
+            "\t<meta charset=\"UTF-8\" />\n" +
+            "\t<title>" + title + "</title>\n" +
+            "</head>\n" +
+            "<body>\n" +
+            "\t<h1>" + title + "</h1>\n";
         return head;
     }
 
+    protected String constructSubTitleHtml(String subTitle) {
+        return "\t<h2>" + subTitle + "</h2>\n";
+    }
+
     protected String constructSubTitleHtml(String subTitleFirstpart, String subTitleSecPart) {
-        String subTitle = "<font size=3>\n" +
+        String subTitle = "\t<h2>\n" +
                 subTitleFirstpart +
-                "</p>\n" +
-                "<p>" +
+                "<br/>\n" +
                 subTitleSecPart +
-                "</font>"+
-                "</p>";
+                "</h2>\n";
 
         return subTitle;
     }
 
-    protected String constructColumnsHtml(String[] columnsNames, String fontColor) {
-
-        String columns = "";
-
+    protected String constructTableHeader(String[] columnsNames) {
+        String header = "\t\t<thead>\n\t\t\t<tr>\n";
         for (String name : columnsNames) {
-            columns += "<td style=\"background-color:"+fontColor+";\">" +  name + "</td>\n";
+            header += "\t\t\t\t<th>" +  name + "</th>\n";
         }
-        columns += "<tr>\n";
+        header += "\t\t\t</tr>\t\t\n</thead>\n";
+        return header;
+    }
 
-
-        return columns;
+    protected String constructTableLine(String[] cells, boolean even) {
+        String style = even ? "line_even" : "line_odd";
+        String line = "\t\t<tr class=\"" + style + "\">\n";
+        for (String cell : cells) {
+            line += "\t\t\t<td>" + cell + "</td>\n";
+        }
+        line += "\t\t</tr>\n";
+        return line;
     }
+    
+    protected String constructTableLine(String[] cells) {
+        String line = "\t\t<tr>\n";
+        for (String cell : cells) {
+            line += "\t\t\t<td>" + cell + "</td>\n";
+        }
+        line += "\t\t</tr>\n";
+        return line;
+    }
 
     protected String constructHeaderTitle(String title, Date beginDate, Date endDate) {
         String headerTitle = "";
@@ -1076,59 +1017,47 @@
         String boldItalicEnd = "</i>" + "</b>";
 
         String [] columnsNameSociety = {boldItalicBegin + identity.getName()+ boldItalicEnd};
-        headerTitle += constructColumnsHtml(columnsNameSociety, "");
+        headerTitle += constructTableLine(columnsNameSociety);
 
-        headerTitle += "<tr>\n";
         String [] columnsDescription = {"<i>" + identity.getDescription()+ "</i>"};
-        headerTitle += constructColumnsHtml(columnsDescription, "");
+        headerTitle += constructTableLine(columnsDescription);
 
-        headerTitle += "<tr>\n";
         String [] columnsAdressOne = {"<i>" + identity.getAddress() + "</i>"};
-        headerTitle += constructColumnsHtml(columnsAdressOne, "");
-        headerTitle += "<tr>\n";
+        headerTitle += constructTableLine(columnsAdressOne);
         String [] columnsAdressTwo = {"<i>" + identity.getAddress2() + "</i>"};
-        headerTitle += constructColumnsHtml(columnsAdressTwo, "");
+        headerTitle += constructTableLine(columnsAdressTwo);
 
-        headerTitle += "<tr>\n";
         String [] columnsZipCode = {"<i>" + identity.getZipCode() + "</i>"};
-        headerTitle += constructColumnsHtml(columnsZipCode, "");
+        headerTitle += constructTableLine(columnsZipCode);
 
-        headerTitle += "<tr>\n";
         String [] columnsCity = {"<i>" + identity.getCity()+ "</i>"};
-        headerTitle += constructColumnsHtml(columnsCity, "");
+        headerTitle += constructTableLine(columnsCity);
 
         headerTitle += "</table>\n" +
                 "</td>" +
-                "<td valign=\"middle\" align=\"center\" style=\"width:100%\">" +
-                "<p style=\"font-size:30px;\">" + title + "</p>" +
-                "</td>" +
                 "<td>" +
                 "<table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n";
 
-        headerTitle += "<tr>\n";
         String [] columnsBusinessNumber = {boldItalicBegin + _("lima-business.document.businessnumber") +
                 boldItalicEnd, "<i>" + identity.getBusinessNumber()+ "</i>"};
-        headerTitle += constructColumnsHtml(columnsBusinessNumber, "");
+        headerTitle += constructTableLine(columnsBusinessNumber);
 
-        headerTitle += "<tr>\n";
         String [] columnsClassifCode = {boldItalicBegin + _("lima-business.document.classificationcode") +
                 boldItalicEnd, "<i>" + identity.getClassificationCode()+ "</i>"};
-        headerTitle += constructColumnsHtml(columnsClassifCode, "");
+        headerTitle += constructTableLine(columnsClassifCode);
 
-        headerTitle += "<tr>\n";
         String [] columnsVatNumber = {boldItalicBegin + _("lima-business.document.vatnumber") + boldItalicEnd,
                 "<i>" + identity.getVatNumber()+ "</i>", };
-        headerTitle += constructColumnsHtml(columnsVatNumber, "");
+        headerTitle += constructTableLine(columnsVatNumber);
 
-        headerTitle += "<tr>\n";
         String [] columnsPeriodOne = {boldItalicBegin + _("lima-business.document.period1") + boldItalicEnd, "<i>"
                 + _("lima-business.document.period1format", beginDate)+ "</i>"};
-        headerTitle += constructColumnsHtml(columnsPeriodOne, "");
+        headerTitle += constructTableLine(columnsPeriodOne);
 
         headerTitle += "<tr>\n";
         String [] columnsPeriodTwo = {boldItalicBegin + _("lima-business.document.period2") + boldItalicEnd, "<i>"
                 + _("lima-business.document.period2format", endDate)+ "</i>"};
-        headerTitle += constructColumnsHtml(columnsPeriodTwo, "");
+        headerTitle += constructTableLine(columnsPeriodTwo);
 
         headerTitle += "</table>" +
                 "</td>" +

    

r3648 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb

tchemit＠users.chorem.org

tags

participants (1)