Lima-commits

Download

lima-commits@list.chorem.org

April 2014

7 participants
21 discussions

r3766 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by dcosse＠users.chorem.org 11 Apr '14

11 Apr '14

Author: dcosse Date: 2014-04-11 14:47:17 +0200 (Fri, 11 Apr 2014) New Revision: 3766 Url: http://forge.chorem.org/projects/lima/repository/revisions/3766 Log: fixes #1014 ajout du choix du compte 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/HttpServerServiceImpl.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 2014-03-17 09:21:37 UTC (rev 3765) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-04-11 12:47:17 UTC (rev 3766) @@ -436,7 +436,7 @@ String subTitleSecPart = _("lima-business.document.date") + " : " + simpleDateFormat.format(closedPeriodicEntryBook.getFinancialPeriod().getBeginDate()); if (closedPeriodicEntryBook.getEntryBook() != null) { - String label = Strings.isNullOrEmpty(closedPeriodicEntryBook.getEntryBook().getLabel()) == true ? "-" :closedPeriodicEntryBook.getEntryBook().getLabel(); + String label = Strings.isNullOrEmpty(closedPeriodicEntryBook.getEntryBook().getLabel()) ? "-" :closedPeriodicEntryBook.getEntryBook().getLabel(); if (!journal.equals(label)) { entryBookReport += constructSubTitleHtml(_("lima-business.document.entrybook") + " : " + label, Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-03-17 09:21:37 UTC (rev 3765) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-04-11 12:47:17 UTC (rev 3766) @@ -37,6 +37,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.List; import javax.ejb.EJB; import javax.ejb.Remote; @@ -55,10 +56,12 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.DocumentService; import org.chorem.lima.business.api.HttpServerService; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; +import org.chorem.lima.entity.Account; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -76,6 +79,9 @@ @EJB private DocumentService documentService; + @EJB + private AccountService accountService; + protected Server server; protected String path; @@ -273,7 +279,27 @@ beginDatePicker = DateUtils.truncate(beginDatePicker, Calendar.YEAR); - pageContent.append("<!DOCTYPE html>\n" + "<html lang=\"fr\">\n" + "<head>\n" + "<title>LIMA Documents Report</title>\n" + "<style type=\"text/css\">" + "body { font: 14px sans-serif; }" + "h1 { font: 20px sans-serif; text-align: center; }" + "table.padding td {padding-right:20px;}" + ".tdright {text-align: right;}" + "</style>" + "</head>\n" + "<body>\n" + "<table class=\"padding\">\n" + "<tr><td><img src=\"?img=puzzle_icon_mini.png\"/></td>\n" + "<td><h1>LIMA Documents Report</h1></td></tr>\n" + "<tr><td class=\"tdright\"><img src=\"?img=identity.png\"/></td>\n" + "<td rowspan=3><form method=GET action=") + pageContent.append("<!DOCTYPE html>\n" + "<html lang=\"fr\">\n" + + "<head>\n" + + "<script type=\"text/javascript\">" + + " function showAccountInput(){" + + " var request = document.getElementById('model');" + + " var requestValue = request == null ? '': request.value;" + + " var isDocumentAccount = requestValue === 'lima_account'; " + + " if (document.getElementById('accountField') != null) {" + + " if (isDocumentAccount) {" + + " document.getElementById('accountField').style.display = 'block';" + + " } else {" + + " document.getElementById('accountField').style.display = 'none';" + + " }" + + " }" + + " }" + + " showAccountInput();" + + " </script>" + + "<title>LIMA Documents Report</title>\n" + "<style type=\"text/css\">" + "body { font: 14px sans-serif; }" + "h1 { font: 20px sans-serif; text-align: center; }" + "table.padding td {padding-right:20px;}" + ".tdright {text-align: right;}" + "</style>" + + "</head>\n" + + "<body>\n" + "<table class=\"padding\">\n" + "<tr><td><img src=\"?img=puzzle_icon_mini.png\"/></td>\n" + "<td><h1>LIMA Documents Report</h1></td></tr>\n" + "<tr><td class=\"tdright\"><img src=\"?img=identity.png\"/></td>\n" + + "<td rowspan=3><form method=GET action=") .append(serverAdress).append(">\n") .append(_("lima-business.document.date.begin")) .append("<input value=\"") @@ -293,7 +319,7 @@ }*/ pageContent.append(/*"</select>\n" - + */"Documents : <select name=\"model\">"); + + */"Documents : <select id=\"model\" name=\"model\" onchange='showAccountInput()'>"); for (DocumentsEnum documentsEnum : DocumentsEnum.values()) { pageContent.append("<option value=\"") @@ -303,13 +329,29 @@ .append("</option>\n"); } - pageContent.append("</select><input type=\"submit\">\n" + List<Account> accounts = accountService.getAllAccounts(); + + StringBuilder optionAccounts = new StringBuilder(); + for (Account account1:accounts) { + optionAccounts.append("<option value=\"" + account1.getTopiaId() + "\">"); + optionAccounts.append(account1.getAccountNumber() + " - " + account1.getLabel()); + optionAccounts.append("</option>\n"); + } + + pageContent.append("</select>" + + "<div id='accountField'>Compte : <select id=\"account\" name=\"account\">" + + optionAccounts.toString() + + "</select></div>" + + "<input type=\"submit\">\n" + "</form></td>" + "<tr><td class=\"tdright\"><img src=\"?img=entries.png\"/></td></tr>\n" + "<tr><td class=\"tdright\"><img src=\"?img=accounts.png\"/></td></tr>\n" + "<tr><td class=\"tdright\"><img src=\"?img=entrybooks.png\"/></td>\n" + "<tr><td class=\"tdright\"><img src=\"?img=fiscalperiods.png\"/></td></tr>\n" + "</table>\n" + + "<script type=\"text/javascript\">" + + " showAccountInput();" + + "</script>" + "</body>\n" + "</html>");

1 0