- Chorem-commits - mailman.cloud.codelutin.com

r336 - trunk/chorem-webmotion/src/main/webapp/js
by jcouteau＠users.chorem.org March 29, 2013

March 29, 2013

Author: jcouteau Date: 2013-03-29 17:01:49 +0100 (Fri, 29 Mar 2013) New Revision: 336 Url: http://chorem.org/projects/chorem/repository/revisions/336 Log: refs #882 : Add focus on input when editing contacts on accoutn page Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-03-27 09:14:42 UTC (rev 335) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-03-29 16:01:49 UTC (rev 336) @@ -186,6 +186,7 @@ }); span.replaceWith(input); + input.focus(); }); //Ajout d'une note sur un compte client

1 0

r335 - in trunk/chorem-webmotion/src/main/webapp: WEB-INF/jsp/salesReports js
by jcouteau＠users.chorem.org March 27, 2013

March 27, 2013

Author: jcouteau Date: 2013-03-27 10:14:42 +0100 (Wed, 27 Mar 2013) New Revision: 335 Url: http://chorem.org/projects/chorem/repository/revisions/335 Log: refs #862 : Add pipeline value in funnel Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2013-03-23 00:23:19 UTC (rev 334) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2013-03-27 09:14:42 UTC (rev 335) @@ -48,6 +48,7 @@  <div class="tab-pane active" id="lead"> + <h4> Total : ${leadAmount}€ - Total espéré : ${leadAmountHope}€</h4> <ul class="unstyled leads"> <c:forEach var="q" items="${leads}"> <li class="salesFunnelItem"> @@ -88,6 +89,7 @@  <div class="tab-pane" id="draft"> + <h4>Total : <span id="draftAmount">${draftAmount}</span>€ - Total espéré : <span id="draftAmountHope">${draftAmountHope}</span>€</h4> <ul class="unstyled drafts"> <c:forEach var="q" items="${drafts}"> <li class="salesFunnelItem draft"> @@ -109,6 +111,7 @@  <div class="tab-pane" id="sent"> + <h4> Total : <span id="sentAmount">${sentAmount}</span>€ - Total espéré : <span id="sentAmountHope">${sentAmountHope}</span>€</h4> <ul class="unstyled sents"> <c:forEach var="q" items="${sents}"> <li class="salesFunnelItem sent"> Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-03-23 00:23:19 UTC (rev 334) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-03-27 09:14:42 UTC (rev 335) @@ -305,6 +305,19 @@ drafts.append(li); oldQuotation.slideUp(); + //update draftAmount and draftAmountHope + var draftAmount = parseInt($("#draftAmount").text()) + wikitty["Quotation.amount"]; + var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100; + var draftAmountHope = parseInt($("#draftAmountHope").text()) + amountHope; + $("#draftAmount").text(draftAmount); + $("#draftAmountHope").text(draftAmountHope); + + //update leadAmount and leadAmountHope + var leadAmount = parseInt($("#leadAmount").text()) - wikitty["Quotation.amount"]; + var leadAmountHope = parseInt($("#leadAmountHope").text()) - amountHope; + $("#leadAmount").text(leadAmount); + $("#leadAmountHope").text(leadAmountHope); + }).fail(function(){ //fail //TODO JC20130212 retour utilisateur @@ -394,6 +407,19 @@ sents.append(li); oldQuotation.slideUp(); + //update draftAmount and draftAmountHope + var draftAmount = parseInt($("#draftAmount").text()) - wikitty["Quotation.amount"]; + var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100; + var draftAmountHope = parseInt($("#draftAmountHope").text()) - amountHope; + $("#draftAmount").text(draftAmount); + $("#draftAmountHope").text(draftAmountHope); + + //update sentAmount and sentAmountHope + var sentAmount = parseInt($("#sentAmount").text()) + wikitty["Quotation.amount"]; + var sentAmountHope = parseInt($("#sentAmountHope").text()) + amountHope; + $("#sentAmount").text(sentAmount); + $("#sentAmountHope").text(sentAmountHope); + }).fail(function(){ //fail //TODO JC20130212 retour utilisateur @@ -404,9 +430,18 @@ var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); $.get(createUrl("/sales/funnel/json/reject/", id), - function(){ + function(data){ //success oldQuotation.slideUp(); + + var wikitty = data.data; + + //update sentAmount and sentAmountHope + var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"]; + var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100; + var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope; + $("#sentAmount").text(sentAmount); + $("#sentAmountHope").text(sentAmountHope); }).fail(function(){ //fail //TODO JC20130212 retour utilisateur @@ -417,9 +452,18 @@ var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); $.get(createUrl("/sales/funnel/json/accept/", id), - function(){ + function(data){ //success oldQuotation.slideUp(); + + var wikitty = data.data; + + //update sentAmount and sentAmountHope + var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"]; + var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100; + var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope; + $("#sentAmount").text(sentAmount); + $("#sentAmountHope").text(sentAmountHope); }).fail(function(){ //fail //TODO JC20130212 retour utilisateur

1 0

r334 - trunk/chorem-webmotion/src/main/webapp/js
by bpoussin＠users.chorem.org March 23, 2013

March 23, 2013

Author: bpoussin Date: 2013-03-23 01:23:19 +0100 (Sat, 23 Mar 2013) New Revision: 334 Url: http://chorem.org/projects/chorem/repository/revisions/334 Log: add item in menu to permit reset field value Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-03-23 00:22:42 UTC (rev 333) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-03-23 00:23:19 UTC (rev 334) @@ -78,6 +78,8 @@ _renderMenu: function( ul, items ) { var self = this, currentExtension = ""; + // ajout d'un element pour permettre l'effacement de l'ancienne entree + self._renderItemData( ul, {label:"None", value:"None", name:"None"} ); $.each( items, function( index, item ) { if ( item.extension != currentExtension ) { ul.append( "<li class='ui-autocomplete-category'>" + item.extension + "</li>" );

1 0

r333 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org March 23, 2013

March 23, 2013

Author: bpoussin Date: 2013-03-23 01:22:42 +0100 (Sat, 23 Mar 2013) New Revision: 333 Url: http://chorem.org/projects/chorem/repository/revisions/333 Log: utilisation du nouveau parser de date de wikitty Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2013-03-22 11:58:09 UTC (rev 332) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2013-03-23 00:22:42 UTC (rev 333) @@ -42,16 +42,29 @@ <td class="header"><span class="level level${c.level}" level="${c.level}">${c.userObject}</span></td> <c:forEach var="d" items="${data.dates}"> <td class="currency"> + <c:url var="addDebtUrl" value="/wikitty/FinancialTransaction/edit/new"> + <c:param name="FinancialTransaction.payer" value="${companyId}"/> + <c:param name="FinancialTransaction.emittedDate" value="today"/> + <c:param name="FinancialTransaction.expectedDate" value="01/${d}"/> + <c:param name="FinancialTransaction.paymentDate" value="01/${d}"/> + <c:param name="FinancialTransaction.category" value="${c.userObject.wikittyId}"/> + </c:url> + <c:url var="addIncomeUrl" value="/wikitty/FinancialTransaction/edit/new"> + <c:param name="FinancialTransaction.beneficiary" value="${companyId}"/> + <c:param name="FinancialTransaction.emittedDate" value="today=${d.substring(3,7)}${d.substring(0,2)}"/> + <c:param name="FinancialTransaction.expectedDate" value="today=${d.substring(3,7)}${d.substring(0,2)}+30DAYS"/> + <c:param name="FinancialTransaction.category" value="${c.userObject.wikittyId}"/> + </c:url> <c:choose> <c:when test="${data.getInvoices(d, c.userObject).isEmpty()}"> <span class="withPopover" - title='Aucune entrée <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.payer=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Debt</a><span> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.beneficiary=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Income</a><span>'> + title='Aucune entrée <span><a href="${addDebtUrl}"><li class="icon-plus"></li>Debt</a><span> <span><a href="${addIncomeUrl}"><li class="icon-plus"></li>Income</a><span>'> <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> </span> </c:when> <c:otherwise> <span class="withPopover" - title='Detail pour <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.payer=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Debt</a><span> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.beneficiary=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Income</a><span>' + title='Detail pour <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> <span><a href="${addDebtUrl}"><li class="icon-plus"></li>Debt</a><span> <span><a href="${addIncomeUrl}"><li class="icon-plus"></li>Income</a><span>' data-content='<w:display wikitties="${data.getInvoices(d, c.userObject)}" toString="<span class=\"withTooltip\" title=\"%FinancialTransaction.category$s: %FinancialTransaction.payer$s -> %FinancialTransaction.beneficiary$s\">%FinancialTransaction.reference|noref$s: %FinancialTransaction.amount|0.0$,.2f</span>"/>'> <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> </span>

1 0

r332 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions resources webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org March 22, 2013

March 22, 2013

Author: bpoussin Date: 2013-03-22 12:58:09 +0100 (Fri, 22 Mar 2013) New Revision: 332 Url: http://chorem.org/projects/chorem/repository/revisions/332 Log: ajout possibilite de cacher les dates du filtre de recherche par defaut ajout possibilite de creer des TransactionFinancial directement a partir du tableau de budget Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-03-18 18:03:53 UTC (rev 331) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-03-22 11:58:09 UTC (rev 332) @@ -708,33 +708,49 @@ // //////////////////////////////////////////////////////////////////////////// + /** + * + * @param client + * @param title + * @param filter le filtre de la method dashboard appelante + * @param noUseDate indique de ne pas utiliser les dates, mais seulement filter et query + * @param start si noUseDate est false est utilise pour filtrer suivant les dates + * si start est null alors la 1 janvier de l'annee courante est pris + * @param end si noUseDate est false est utilise pour filtrer suivant les dates + * si end est null alors le 31 decembre de l'annee courante est pris + * @param query le filtre de l'utilisateur + * @return + */ protected Render invoiceFilter(ChoremClient client, String title, - String filter, Date start, Date end, String query) { - if (start == null) { - start = new Date(); - start = DateUtils.setMonths(start, Calendar.JANUARY); - } - - if (end == null) { - end = DateUtils.setMonths(start, Calendar.DECEMBER); - } - - start = DateUtil.setMinTimeOfDay(start); - end = DateUtil.setMaxTimeOfDay(end); - + String filter, boolean useDate, Date start, Date end, String query) { // recuperation des factures - WikittyQuery invoiceQuery = new WikittyQueryMaker().and() + WikittyQueryMaker maker = new WikittyQueryMaker().and() .parse(filter) .parse(query) .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) - .ne(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED.name()) - .or() - .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, start, end) - .isNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE) - .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, start, end) - .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) - .end().setLimit(WikittyQuery.MAX); + .ne(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED.name()); + if (useDate) { + if (start == null) { + start = new Date(); + start = DateUtils.setMonths(start, Calendar.JANUARY); + } + + if (end == null) { + end = DateUtils.setMonths(start, Calendar.DECEMBER); + } + + start = DateUtil.setMinTimeOfDay(start); + end = DateUtil.setMaxTimeOfDay(end); + + maker.or() + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, start, end) + .isNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, start, end) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end); + } + WikittyQuery invoiceQuery = maker.end().setLimit(WikittyQuery.MAX); + ChoremQueryHelper.addSort(client, invoiceQuery, FinancialTransaction.EXT_FINANCIALTRANSACTION); WikittyQueryResult<FinancialTransaction> invoices = @@ -770,22 +786,22 @@ ); } - public Render invoiceDebt(ChoremClient client, + public Render invoiceDebt(ChoremClient client, boolean useDate, Date start, Date end, String query) { String title = "Factures à payer par la société"; String companyId = client.getConfiguration().getDefaultCompany(); String filter = FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER + "={SELECT id WHERE (" + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR id=" + companyId + ")}"; - return invoiceFilter(client, title, filter, start, end, query); + return invoiceFilter(client, title, filter, useDate, start, end, query); } - public Render invoiceIncome(ChoremClient client, + public Render invoiceIncome(ChoremClient client, boolean useDate, Date start, Date end, String query) { String title = "Factures émises par la société"; String companyId = client.getConfiguration().getDefaultCompany(); String filter = FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY + "={SELECT id WHERE (" + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR id=" + companyId + ")}"; - return invoiceFilter(client, title, filter, start, end, query); + return invoiceFilter(client, title, filter, useDate, start, end, query); } public Render profitability(ChoremClient client, @@ -960,7 +976,7 @@ if (log.isDebugEnabled()) { log.debug("budget data\n\t dates: " + data.getDates() + "\n\t rootTree: " + rootCategory + "\n\t categoriesTree: " + categoriesTree); } - return renderView("dashboardBudget.jsp", + return renderView("dashboardBudget.jsp", "companyId", companyId, "data", data); } Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2013-03-18 18:03:53 UTC (rev 331) +++ trunk/chorem-webmotion/src/main/resources/mapping 2013-03-22 11:58:09 UTC (rev 332) @@ -42,7 +42,7 @@ * /wikitty-json/search?term={query} action:GenericAction.searchJson * /wikitty-json/get/{id} action:GenericAction.getById * /wikitty-json/save action:GenericAction.saveJson -* /fragment/dashboard/{method} action:DashboardAction.{method} +* /fragment/dashboard/{method} action:DashboardAction.{method} useDate=true * /fragment/dashboardHR/{method} action:DashboardHRAction.{method} * /fragment/sales/{method} action:sales.SalesAction.{method} * /admin view:contact.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2013-03-18 18:03:53 UTC (rev 331) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2013-03-22 11:58:09 UTC (rev 332) @@ -44,13 +44,14 @@ <td class="currency"> <c:choose> <c:when test="${data.getInvoices(d, c.userObject).isEmpty()}"> - <span> + <span class="withPopover" + title='Aucune entrée <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.payer=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Debt</a><span> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.beneficiary=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Income</a><span>'> <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> </span> </c:when> <c:otherwise> <span class="withPopover" - title='Detail pour <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/>' + title='Detail pour <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.payer=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Debt</a><span> <span><a href="<c:url value="/wikitty/FinancialTransaction/edit/new?FinancialTransaction.beneficiary=${companyId}&FinancialTransaction.emittedDate=today&FinancialTransaction.expectedDate=01/${d}&FinancialTransaction.paymentDate=01/${d}&FinancialTransaction.category=${c.userObject.wikittyId}"/>"><li class="icon-plus"></li>Income</a><span>' data-content='<w:display wikitties="${data.getInvoices(d, c.userObject)}" toString="<span class=\"withTooltip\" title=\"%FinancialTransaction.category$s: %FinancialTransaction.payer$s -> %FinancialTransaction.beneficiary$s\">%FinancialTransaction.reference|noref$s: %FinancialTransaction.amount|0.0$,.2f</span>"/>'> <f:formatNumber type="currency" value="${data.getAmount(d, c.userObject)}"/> </span> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-03-18 18:03:53 UTC (rev 331) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-03-22 11:58:09 UTC (rev 332) @@ -41,7 +41,7 @@ factures à payer</a> pour un montant de <f:formatNumber type="currency" value="${invoiceDebt}"/></li> <li>Il y a ${invoiceIncomeNb} - <a href='<c:url value="/report?report=invoiceIncome&start=01/01/2000&end=01/01/2222&query=FinancialTransaction.paymentDate=null and FinancialTransaction.expectedDate<NOW"/>'> + <a href='<c:url value="/report?report=invoiceIncome&useDate=false&query=FinancialTransaction.paymentDate=null and FinancialTransaction.expectedDate<NOW"/>'> factures impayées</a> pour un montant de <f:formatNumber type="currency" value="${invoiceIncome}"/></li> <li>Il y a ${touchNb} <a href='<c:url value="/wikitty/search?query=${touchQueryString}"/>'> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2013-03-18 18:03:53 UTC (rev 331) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2013-03-22 11:58:09 UTC (rev 332) @@ -26,8 +26,11 @@ <form class="well form-inline"> <input type="hidden" name="report" value="${report}"/> - <input class="datepicker input-small" type="text" name="start" value="${fn:escapeXml(start)}" placeholder="date from"/> - <input class="datepicker input-small" type="text" name="end" value="${fn:escapeXml(end)}" placeholder="date to"/> + <input type="hidden" name="useDate" value="${useDate}" /> + <c:if test="${useDate != 'false'}"> + <input class="datepicker input-small" type="text" name="start" value="${fn:escapeXml(start)}" placeholder="date from"/> + <input class="datepicker input-small" type="text" name="end" value="${fn:escapeXml(end)}" placeholder="date to"/> + </c:if> <input class="input-xxlarge" type="text" name="query" value="${fn:escapeXml(query)}" placeholder="filter query"/> <input type="submit" class="btn"/> </form>

1 0

r331 - in trunk: . chorem-webmotion
by echatellier＠users.chorem.org March 18, 2013

March 18, 2013

Author: echatellier Date: 2013-03-18 19:03:53 +0100 (Mon, 18 Mar 2013) New Revision: 331 Url: http://chorem.org/projects/chorem/repository/revisions/331 Log: fix svn:ignore Modified: trunk/ trunk/chorem-webmotion/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.iml *.iws *.ipr .idea + target *.iml *.iws *.ipr .idea .settings .project Property changes on: trunk/chorem-webmotion ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iml *.iws + target *.ipr *.iml *.iws .classpath .project .settings

1 0

r330 - in trunk: . chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by echatellier＠users.chorem.org March 18, 2013

March 18, 2013

Author: echatellier Date: 2013-03-18 19:03:25 +0100 (Mon, 18 Mar 2013) New Revision: 330 Url: http://chorem.org/projects/chorem/repository/revisions/330 Log: Fix build, and use nuiton-js (stable 1.0 version) Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java trunk/pom.xml Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2013-03-07 19:34:33 UTC (rev 329) +++ trunk/chorem-webmotion/pom.xml 2013-03-18 18:03:25 UTC (rev 330) @@ -40,12 +40,11 @@ <dependencies>  + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -59,8 +58,7 @@ <dependency> <groupId>org.chorem.chorem</groupId> <artifactId>chorem-entities</artifactId> - <version>0.3-SNAPSHOT</version> - <type>jar</type> + <version>${project.version}</version> </dependency> <dependency> Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2013-03-07 19:34:33 UTC (rev 329) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2013-03-18 18:03:25 UTC (rev 330) @@ -23,7 +23,6 @@ package org.chorem.webmotion.actions; -import com.kenai.jaffl.annotations.Pinned; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.ByteArrayInputStream; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-07 19:34:33 UTC (rev 329) +++ trunk/pom.xml 2013-03-18 18:03:25 UTC (rev 330) @@ -125,117 +125,117 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${opencsvVersion}</version> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${opencsvVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servletApiVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>${jspApiVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${wikittyVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>1.8.3-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.9.2-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jqplot</artifactId> - <version>1.0.4r1121-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>2.2.2-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-tokeninput</artifactId> - <version>1.6.0.0-1-SNAPSHOT</version> - </dependency> - <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> + <version>1.8.3-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-ui</artifactId> + <version>1.9.2-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jqplot</artifactId> + <version>1.0.4r1121-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-bootstrap</artifactId> + <version>2.2.2-1</version> + </dependency> +  + + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion</artifactId> <version>${webmotionVersion}</version>

1 0

r329 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org March 7, 2013

March 7, 2013

Author: bpoussin Date: 2013-03-07 20:34:33 +0100 (Thu, 07 Mar 2013) New Revision: 329 Url: http://chorem.org/projects/chorem/repository/revisions/329 Log: petit bug sur HT et TTC Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-03-07 19:13:54 UTC (rev 328) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-03-07 19:34:33 UTC (rev 329) @@ -72,8 +72,8 @@ </a> </strong>) <li>Bénéfice/perte: - <strong><f:formatNumber type="currency" value="${annualDebtIncome.get('incomesTTC') + annualDebtIncome.get('extraIncomes') - annualDebtIncome.get('debtsTTC')}"/></strong> - (N-1: <strong><f:formatNumber type="currency" value="${pastAnnualDebtIncome.get('incomesTTC') + pastAnnualDebtIncome.get('extraIncomes') - pastAnnualDebtIncome.get('debtsTTC')}"/></strong>) + <strong><f:formatNumber type="currency" value="${annualDebtIncome.get('incomesTTC') + annualDebtIncome.get('extraIncomesTTC') - annualDebtIncome.get('debtsTTC')}"/></strong> + (N-1: <strong><f:formatNumber type="currency" value="${pastAnnualDebtIncome.get('incomesTTC') + pastAnnualDebtIncome.get('extraIncomesTTC') - pastAnnualDebtIncome.get('debtsTTC')}"/></strong>) </ul> </div> </div>

1 0

r328 - in trunk: chorem-web/src/main/resources/i18n chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org March 7, 2013

March 7, 2013

Author: bpoussin Date: 2013-03-07 20:13:54 +0100 (Thu, 07 Mar 2013) New Revision: 328 Url: http://chorem.org/projects/chorem/repository/revisions/328 Log: utilisation de la variable NOW connue de SolR Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2013-02-27 10:17:29 UTC (rev 327) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2013-03-07 19:13:54 UTC (rev 328) @@ -1,8 +1,8 @@ -chorem.beginDate.beforeToday=La date entr\u00e9e ne peut \u00eatre ant\u00e9rieure \u00e0 la date du jour +chorem.beginDate.beforeToday=La date entr\u00E9e ne peut \u00EAtre ant\u00E9rieure \u00E0 la date du jour chorem.billy.home=Accueil chorem.billy.quotation=Devis \#%s chorem.billy.quotation.add=Ajouter un nouveau devis -chorem.billy.quotation.addProjectOrder=Cr\u00e9er un contrat pour ce devis +chorem.billy.quotation.addProjectOrder=Cr\u00E9er un contrat pour ce devis chorem.billy.quotation.addToProject=Ajouter un nouveau devis au projet "%s" chorem.billy.quotation.amount=Montant chorem.billy.quotation.backToProjectDetails=Retourner sur le projet @@ -10,58 +10,58 @@ chorem.billy.quotation.description=Description chorem.billy.quotation.invalidCustomer= chorem.billy.quotation.invalidSupplier= -chorem.billy.quotation.postedDate=Date de d\u00e9p\u00f4t -chorem.billy.quotation.projectOrder=Contrat r\u00e9alis\u00e9 sur la base de ce devis -chorem.billy.quotation.projectOrder.beginDate=Date de d\u00e9but \: %s -chorem.billy.quotation.projectOrder.company=Soci\u00e9t\u00e9 \: %s +chorem.billy.quotation.postedDate=Date de d\u00E9p\u00F4t +chorem.billy.quotation.projectOrder=Contrat r\u00E9alis\u00E9 sur la base de ce devis +chorem.billy.quotation.projectOrder.beginDate=Date de d\u00E9but \: %s +chorem.billy.quotation.projectOrder.company=Soci\u00E9t\u00E9 \: %s chorem.billy.quotation.projectOrder.endDate=Date de fin \: %s chorem.billy.quotation.projectOrder.type=Type \: %s -chorem.billy.quotation.reference=R\u00e9f\u00e9rence +chorem.billy.quotation.reference=R\u00E9f\u00E9rence chorem.billy.quotation.supplier=Fournisseur chorem.billy.quotation.vat=TVA -chorem.billy.quotationDetails.title=D\u00e9tails du devis "%s" +chorem.billy.quotationDetails.title=D\u00E9tails du devis "%s" chorem.bonzoms.companies=Liste des entreprises -chorem.bonzoms.company=Soci\u00e9t\u00e9 -chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00e9t\u00e9 +chorem.bonzoms.company=Soci\u00E9t\u00E9 +chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 chorem.bonzoms.company.address=Adresse chorem.bonzoms.company.addressLine1=Adresse chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.) chorem.bonzoms.company.city=Ville chorem.bonzoms.company.country=Pays -chorem.bonzoms.company.employees=Liste des employ\u00e9s -chorem.bonzoms.company.list=Les soci\u00e9t\u00e9s -chorem.bonzoms.company.name=Nom de la soci\u00e9t\u00e9 -chorem.bonzoms.company.phoneNb=Num\u00e9ro de t\u00e9l\u00e9phone (opt.) +chorem.bonzoms.company.employees=Liste des employ\u00E9s +chorem.bonzoms.company.list=Les soci\u00E9t\u00E9s +chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 +chorem.bonzoms.company.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.company.postcode=Code postal -chorem.bonzoms.company.type=Type de la soci\u00e9t\u00e9 +chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9 chorem.bonzoms.company.website=Site internet (opt.) chorem.bonzoms.companyDetails.name=Entreprise "%s" -chorem.bonzoms.companyDetails.title=D\u00e9tails de l''entreprise "%s" -chorem.bonzoms.contactDetails=M\u00e9thode de contact -chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00e9thode de contact -chorem.bonzoms.contactDetails.name=Nom de la m\u00e9thode de contact -chorem.bonzoms.contactDetails.type=Type de la m\u00e9thode de contact -chorem.bonzoms.contactDetails.value=Valeur de la m\u00e9thode de contact -chorem.bonzoms.employee=Employ\u00e9 +chorem.bonzoms.companyDetails.title=D\u00E9tails de l''entreprise "%s" +chorem.bonzoms.contactDetails=M\u00E9thode de contact +chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00E9thode de contact +chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact +chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact +chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact +chorem.bonzoms.employee=Employ\u00E9 chorem.bonzoms.employee.company=Entreprise -chorem.bonzoms.employee.diploma=Dipl\u00f4me (opt.) +chorem.bonzoms.employee.diploma=Dipl\u00F4me (opt.) chorem.bonzoms.employee.invalidCompany= -chorem.bonzoms.employee.paidLeave=Cong\u00e9s pay\u00e9s -chorem.bonzoms.employee.paidLeave.wrongFormat=Les cong\u00e9s pay\u00e9s doivent \u00eatre \u00eatre un entier positif ou un nombre \u00e0 virgule flottante positif +chorem.bonzoms.employee.paidLeave=Cong\u00E9s pay\u00E9s +chorem.bonzoms.employee.paidLeave.wrongFormat=Les cong\u00E9s pay\u00E9s doivent \u00EAtre \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif chorem.bonzoms.employee.rtt=RTT -chorem.bonzoms.employee.rtt.wrongFormat=Les RTT doivent \u00eatre \u00eatre un entier positif ou un nombre \u00e0 virgule flottante positif -chorem.bonzoms.employees=List des employ\u00e9s +chorem.bonzoms.employee.rtt.wrongFormat=Les RTT doivent \u00EAtre \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif +chorem.bonzoms.employees=List des employ\u00E9s chorem.bonzoms.employmentContract=Contrat de travail chorem.bonzoms.employmentContract.add=Ajouter un nouveau contrat de travail chorem.bonzoms.employmentContract.allFieldsRequired= -chorem.bonzoms.employmentContract.beginDate=Date de d\u00e9but +chorem.bonzoms.employmentContract.beginDate=Date de d\u00E9but chorem.bonzoms.employmentContract.description=Description chorem.bonzoms.employmentContract.endDate=Date de fin (opt.) chorem.bonzoms.employmentContract.salary=Salaire -chorem.bonzoms.employmentContract.salary.wrongFormat=Le salaire doit \u00eatre un entier positif ou un nombre \u00e0 virgule flottante positif (le s\u00e9parateur d\u00e9cimal peut \u00eatre un point ou une virgule) +chorem.bonzoms.employmentContract.salary.wrongFormat=Le salaire doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.bonzoms.employmentContract.type=Type chorem.bonzoms.employmentContract.workingTime=Temps de travail -chorem.bonzoms.employmentContract.workingTime.wrongFormat=Le temps de travail doit \u00eatre un entier positif +chorem.bonzoms.employmentContract.workingTime.wrongFormat=Le temps de travail doit \u00EAtre un entier positif chorem.bonzoms.home=Accueil chorem.bonzoms.person=Personne chorem.bonzoms.person.add=Ajouter une nouvelle personne @@ -71,22 +71,22 @@ chorem.bonzoms.person.city=Ville chorem.bonzoms.person.country=Pays chorem.bonzoms.person.email=Email -chorem.bonzoms.person.email.wrongFormat=L''adresse email que vous avez entr\u00e9e est incorrecte +chorem.bonzoms.person.email.wrongFormat=L''adresse email que vous avez entr\u00E9e est incorrecte chorem.bonzoms.person.employmentContracts=Contrats de travail \: -chorem.bonzoms.person.firstName=Pr\u00e9nom +chorem.bonzoms.person.firstName=Pr\u00E9nom chorem.bonzoms.person.lastName=Nom chorem.bonzoms.person.list=Les personnes -chorem.bonzoms.person.phoneNb=Num\u00e9ro de t\u00e9l\u00e9phone (opt.) +chorem.bonzoms.person.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.person.postcode=Code postal -chorem.bonzoms.personDetails.title=Informations d\u00e9taill\u00e9es de "%s" +chorem.bonzoms.personDetails.title=Informations d\u00E9taill\u00E9es de "%s" chorem.bonzoms.persons=Liste des personnes chorem.config.configFileName.description=Nom du fichier de configuration de chorem -chorem.create.error=Une erreur s''est produite, merci d''essayer \u00e0 nouveau. Si le probl\u00e8me se reproduit, merci de contacter un administrateur +chorem.create.error=Une erreur s''est produite, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy chorem.date.wrongFormat.birth= chorem.date.wrongFormat.contractBegin= chorem.date.wrongFormat.contractEnd= -chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00eatre ant\u00e9rieure \u00e0 la date de d\u00e9but +chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00EAtre ant\u00E9rieure \u00E0 la date de d\u00E9but chorem.error.internal=Une erreur interne s''est produite chorem.field.required=Vous devez remplir ce champ chorem.gepeto.home=Accueil @@ -98,57 +98,57 @@ chorem.gepeto.projectDetails.noQuotations=Pas de devis chorem.gepeto.projectDetails.projectOrder=Contrat du %s au %s chorem.gepeto.projectDetails.projectOrders=Contrats du projet -chorem.gepeto.projectDetails.quotation=Devis du %s (r\u00e9f. %s) +chorem.gepeto.projectDetails.quotation=Devis du %s (r\u00E9f. %s) chorem.gepeto.projectDetails.quotationWithProjectOrder=Devis du projet avec un contrat chorem.gepeto.projectDetails.quotationsWithoutProjectOrder=Devis du projet sans contrat -chorem.gepeto.projectDetails.title=D\u00e9tails du projet "%s" +chorem.gepeto.projectDetails.title=D\u00E9tails du projet "%s" chorem.gepeto.projectOrder=Contrat de commande d''un projet chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet chorem.gepeto.projectOrder.addToQuotation=Lier un nouveau contrat au devis \#%s chorem.gepeto.projectOrder.backToQuotationDetails=Retourner sur le devis -chorem.gepeto.projectOrder.beginDate=Date de d\u00e9but +chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but chorem.gepeto.projectOrder.company=Entreprise chorem.gepeto.projectOrder.company.name= chorem.gepeto.projectOrder.company.type= chorem.gepeto.projectOrder.description=Description -chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00e9e +chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e chorem.gepeto.projectOrder.invalidCompany= chorem.gepeto.projectOrder.status=Statut chorem.gepeto.projectOrder.type=Type -chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00e9but -chorem.gepeto.projectOrderDetails.companyName=Nom de la soci\u00e9t\u00e9 \: %s +chorem.gepeto.projectOrderDetails.beginDate=Date de d\u00E9but +chorem.gepeto.projectOrderDetails.companyName=Nom de la soci\u00E9t\u00E9 \: %s chorem.gepeto.projectOrderDetails.endDate=Date de fin -chorem.gepeto.projectOrderDetails.quotation=Contrat r\u00e9alis\u00e9 sur la base du devis \#%s -chorem.gepeto.projectOrderDetails.task.beginDate=D\u00e9but de la t\u00e2che \: %s -chorem.gepeto.projectOrderDetails.task.endDate=Fin de la t\u00e2che \: %s -chorem.gepeto.projectOrderDetails.task.name=Nom de la t\u00e2che \: %s -chorem.gepeto.projectOrderDetails.task.price=Prix de la t\u00e2che \: %s -chorem.gepeto.projectOrderDetails.task.status=Statut de la t\u00e2che \: %s -chorem.gepeto.projectOrderDetails.tasks=T\u00e2ches li\u00e9es au contrat -chorem.gepeto.projectOrderDetails.title=D\u00e9tails du contrat +chorem.gepeto.projectOrderDetails.quotation=Contrat r\u00E9alis\u00E9 sur la base du devis \#%s +chorem.gepeto.projectOrderDetails.task.beginDate=D\u00E9but de la t\u00E2che \: %s +chorem.gepeto.projectOrderDetails.task.endDate=Fin de la t\u00E2che \: %s +chorem.gepeto.projectOrderDetails.task.name=Nom de la t\u00E2che \: %s +chorem.gepeto.projectOrderDetails.task.price=Prix de la t\u00E2che \: %s +chorem.gepeto.projectOrderDetails.task.status=Statut de la t\u00E2che \: %s +chorem.gepeto.projectOrderDetails.tasks=T\u00E2ches li\u00E9es au contrat +chorem.gepeto.projectOrderDetails.title=D\u00E9tails du contrat chorem.gepeto.projectOrderDetails.type=Type de contrat chorem.gepeto.projects=Liste des projets chorem.gepeto.projectsByYear.thead.company=Demandeur chorem.gepeto.projectsByYear.thead.end=Fin chorem.gepeto.projectsByYear.thead.name=Nom -chorem.gepeto.projectsByYear.thead.start=D\u00e9but -chorem.gepeto.projectsByYear.title=Projets de l''ann\u00e9e %s +chorem.gepeto.projectsByYear.thead.start=D\u00E9but +chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e %s chorem.gepeto.projectsByYear.withProjectOrder=Avec contrat chorem.gepeto.projectsByYear.withoutProjectOrder=Sans contrat chorem.gepeto.projectsWithoutQuotation=Liste des projets sans devis chorem.gepeto.projectsWithoutQuotation.title=Liste des projets sans devis -chorem.gepeto.results.title=R\u00e9sultats par ann\u00e0e -chorem.gepeto.task=T\u00e2che %s -chorem.gepeto.task.add=Ajouter une nouvelle t\u00e2che +chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e +chorem.gepeto.task=T\u00E2che %s +chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che chorem.gepeto.task.backToProjectDetails=Retourner sur le contrat -chorem.gepeto.task.beginDate=Date de d\u00e9but +chorem.gepeto.task.beginDate=Date de d\u00E9but chorem.gepeto.task.description=Description -chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00e9s -chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00e9 doit \u00eatre un entier positif -chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00e9e -chorem.gepeto.task.name=Nom de la t\u00e2che +chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s +chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00E9 doit \u00EAtre un entier positif +chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e +chorem.gepeto.task.name=Nom de la t\u00E2che chorem.gepeto.task.price=Prix -chorem.gepeto.task.price.wrongFormat=Le prix doit \u00eatre un entier positif ou un nombre \u00e0 virgule flottante positif (le s\u00e9parateur d\u00e9cimal peut \u00eatre un point ou une virgule) +chorem.gepeto.task.price.wrongFormat=Le prix doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule) chorem.gepeto.tasksList= chorem.home=Accueil chorem.misc.modify=Modifier Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-02-27 10:17:29 UTC (rev 327) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-03-07 19:13:54 UTC (rev 328) @@ -41,7 +41,7 @@ factures à payer</a> pour un montant de <f:formatNumber type="currency" value="${invoiceDebt}"/></li> <li>Il y a ${invoiceIncomeNb} - <a href='<c:url value="/report?report=invoiceIncome&start=01/01/2000&end=01/01/2222&query=FinancialTransaction.paymentDate=null and FinancialTransaction.expectedDate<${now}"/>'> + <a href='<c:url value="/report?report=invoiceIncome&start=01/01/2000&end=01/01/2222&query=FinancialTransaction.paymentDate=null and FinancialTransaction.expectedDate<NOW"/>'> factures impayées</a> pour un montant de <f:formatNumber type="currency" value="${invoiceIncome}"/></li> <li>Il y a ${touchNb} <a href='<c:url value="/wikitty/search?query=${touchQueryString}"/>'>

1 0

r327 - in trunk/chorem-webmotion/src/main/webapp: WEB-INF/jsp js
by bpoussin＠users.chorem.org Feb. 27, 2013

Feb. 27, 2013

Author: bpoussin Date: 2013-02-27 11:17:29 +0100 (Wed, 27 Feb 2013) New Revision: 327 Url: http://chorem.org/projects/chorem/repository/revisions/327 Log: bugfix in javascript URL, now use webContext to create URL Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-02-25 19:03:26 UTC (rev 326) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-02-27 10:17:29 UTC (rev 327) @@ -41,6 +41,10 @@ <link href="<c:url value='/css/chorem-crm.css'/>" rel="stylesheet" type="text/css"/> <link href="<c:url value='/css/chorem-sales.css'/>" rel="stylesheet" type="text/css"/> + <script type="text/javascript"> + var webContext = "<c:url value='/'/>"; + </script> + <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> <script type="text/javascript" src="<c:url value='/nuiton-js/chorem-lib.js'/>"></script> Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-02-25 19:03:26 UTC (rev 326) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-02-27 10:17:29 UTC (rev 327) @@ -21,6 +21,15 @@ * #L% */ +function createUrl() { + var result = webContext; + for (var i = 0; i < arguments.length; i++) { + result += arguments[i]; + } + result = result.replace('//', '/'); + return result; +} + $(function() { $('.withTooltip').tooltip({html:true}); }); @@ -116,7 +125,7 @@ jQuery.ajax({ type: 'GET', - url:'/chorem/hr/vacationDiv/new', + url: createUrl('/hr/vacationDiv/new'), data:'', sucess: function(data, textStatus, jqXHR){ @@ -145,7 +154,8 @@ input.keyup(function (e) { if (e.keyCode == 13) { value = input.val(); - $.get("/chorem/wikitty-json/save?id="+id+"&extension=ContactDetails&ContactDetails.value="+value, function(){ + $.get(createUrl("/wikitty-json/save?id=", id, "&extension=ContactDetails&ContactDetails.value=", value), + function(){ //success span.text(value); input.replaceWith(span); @@ -184,10 +194,10 @@ var id = $(".elementId").html(); var date = $.datepicker.formatDate('dd/mm/yy', new Date()); - $.get("/chorem/wikitty-json/save?extension=Note&Note.target=" + id + - "&Note.title=" + title + - "&Note.content=" + content + - "&Note.date="+date,function(data){ + $.get(createUrl("/wikitty-json/save?extension=Note&Note.target=", id, + "&Note.title=", title, + "&Note.content=", content, + "&Note.date=", date),function(data){ //success var note; $.each(data, function(key, val) { @@ -220,7 +230,8 @@ function leadToDraft() { var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/answer/" + id,function(data){ + $.get(createUrl("/sales/funnel/json/answer/", id), + function(data){ //success var wikittyId = data.meta.id; var wikitty = data.data; @@ -230,7 +241,7 @@ //leftDiv var leftDiv = $("<div></div>").addClass("pull-left"); var aIconEdit = $("<a></a>") - .attr("href","/chorem/wikitty/edit/" + data.meta.id); + .attr("href", createUrl("/wikitty/edit/", wikittyId)); var iconEdit = $("<i></i>").addClass("icon-edit"); aIconEdit.append(iconEdit); leftDiv.append(aIconEdit); @@ -243,7 +254,7 @@ } var aAccount = $("<a></a>") .text(firstName + " " + lastName + " (" + company + ")") - .attr("href","/chorem/wikitty/Employee/view/" + wikitty["Quotation.customer"]); + .attr("href",createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"])); smallAccount.append(aAccount); leftDiv.append(smallAccount); var leftP = $("<p> - </p>"); @@ -252,7 +263,7 @@ if (wikitty["Quotation.project"]!=null) { var aProject = $("<a/>") .addClass("nameLink") - .attr("href" , "/chorem/wikitty/Project/view/" + wikitty["Quotation.project"]) + .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"])) .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]); } itemTitleSpan.append(aProject); @@ -301,7 +312,8 @@ function draftToSent() { var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/send/" + id,function(data){ + $.get(createUrl("/sales/funnel/json/send/", id), + function(data){ //success var wikittyId = data.meta.id; @@ -312,7 +324,7 @@ //leftDiv var leftDiv = $("<div></div>").addClass("pull-left"); var aIconEdit = $("<a></a>") - .attr("href","/chorem/wikitty/edit/" + data.meta.id); + .attr("href",createUrl("/wikitty/edit/", wikittyId)); var iconEdit = $("<i></i>").addClass("icon-edit"); aIconEdit.append(iconEdit); leftDiv.append(aIconEdit); @@ -325,7 +337,7 @@ } var aAccount = $("<a></a>") .text(firstName + " " + lastName + " (" + company + ")") - .attr("href","/chorem/wikitty/Employee/view/" + wikitty["Quotation.customer"]); + .attr("href", createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"])); smallAccount.append(aAccount); leftDiv.append(smallAccount); var leftP = $("<p> - </p>"); @@ -334,7 +346,7 @@ if (wikitty["Quotation.project"]!=null) { var aProject = $("<a/>") .addClass("nameLink") - .attr("href" , "/chorem/wikitty/Project/view/" + wikitty["Quotation.project"]) + .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"])) .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]); } itemTitleSpan.append(aProject); @@ -389,7 +401,8 @@ function sentToRejected(){ var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/reject/" + id,function(){ + $.get(createUrl("/sales/funnel/json/reject/", id), + function(){ //success oldQuotation.slideUp(); }).fail(function(){ @@ -401,7 +414,8 @@ function sentToAccepted(){ var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/accept/" + id,function(){ + $.get(createUrl("/sales/funnel/json/accept/", id), + function(){ //success oldQuotation.slideUp(); }).fail(function(){

1 0