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

r447 - trunk
by ymartel＠users.chorem.org Oct. 23, 2014

Oct. 23, 2014

Author: ymartel Date: 2014-10-23 10:00:39 +0200 (Thu, 23 Oct 2014) New Revision: 447 Url: http://forge.chorem.org/projects/chorem/repository/revisions/447 Log: some upgrade before release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-21 15:04:43 UTC (rev 446) +++ trunk/pom.xml 2014-10-23 08:00:39 UTC (rev 447) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.5</version> + <version>5.1</version> </parent> <groupId>org.chorem</groupId> @@ -87,8 +87,8 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> </distributionManagement> @@ -96,14 +96,14 @@ <platform>chorem.org</platform> <projectId>chorem</projectId> - <guavaVersion>17.0</guavaVersion> - <gsonVersion>2.2.4</gsonVersion> + <guavaVersion>18.0</guavaVersion> + <gsonVersion>2.3</gsonVersion> <opencsvVersion>2.3</opencsvVersion> <slf4jVersion>1.7.7</slf4jVersion> <javaxMailVersion>1.5.0-b01</javaxMailVersion> <servletApiVersion>3.0-alpha-1</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> - <h2Version>1.4.179</h2Version> + <h2Version>1.4.182</h2Version> <jstlVersion>1.2</jstlVersion> <webmotionVersion>2.4</webmotionVersion> <processPluginVersion>1.1</processPluginVersion> @@ -113,8 +113,8 @@ <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> - <nuitonWebVersion>1.16</nuitonWebVersion> - <wikittyVersion>3.11-SNAPSHOT</wikittyVersion> + <nuitonWebVersion>1.17</nuitonWebVersion> + <wikittyVersion>3.11</wikittyVersion> <nuitonjsWro.version>1.0.3</nuitonjsWro.version> <nuitonjsAngularjs.version>1.3.0-beta.7-1</nuitonjsAngularjs.version>

1 0

r446 - trunk
by ymartel＠users.chorem.org Oct. 21, 2014

Oct. 21, 2014

Author: ymartel Date: 2014-10-21 17:04:43 +0200 (Tue, 21 Oct 2014) New Revision: 446 Url: http://forge.chorem.org/projects/chorem/repository/revisions/446 Log: update scm Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-20 14:02:10 UTC (rev 445) +++ trunk/pom.xml 2014-10-21 15:04:43 UTC (rev 446) @@ -79,9 +79,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/chorem/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/chorem/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/chorem/trunk + scm:svn:http://svn.chorem.org/chorem/trunk </developerConnection> <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> </scm>

1 0

r445 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by jcouteau＠users.chorem.org Oct. 20, 2014

Oct. 20, 2014

Author: jcouteau Date: 2014-10-20 16:02:10 +0200 (Mon, 20 Oct 2014) New Revision: 445 Url: http://forge.chorem.org/projects/chorem/repository/revisions/445 Log: Ajout des propales dans le menu commercial Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-10-20 13:50:11 UTC (rev 444) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-10-20 14:02:10 UTC (rev 445) @@ -146,7 +146,10 @@ </a> <ul class="dropdown-menu" role="menu"> <li><a href="<c:url value="/sales/funnel"/>"><span class="glyphicon glyphicon-tasks"></span> Tunnel de commande</a></li> - <li><a href="<c:url value="/sales/report/sales"/>"><span class="glyphicon glyphicon-th-list"></span> Rapports</a></li> + <li><a href="<c:url value="/sales/report/sales"/>"><span class="glyphicon glyphicon-th-list"></span> Rapports</a></li><li class="divider"></li> + <li>Propale</li> + <li><a href="<c:url value="/wikitty/Quotation/search"/>"><span class="glyphicon glyphicon-th-list"></span> All quotations</a></li> + <li><a href="<c:url value="/wikitty/Quotation/edit/new"/>"><span class="glyphicon glyphicon-plus"></span> Add quotation</a></li> </ul> </li> <li class="dropdown nav-group">

1 0

r444 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports
by jcouteau＠users.chorem.org Oct. 20, 2014

Oct. 20, 2014

Author: jcouteau Date: 2014-10-20 15:50:11 +0200 (Mon, 20 Oct 2014) New Revision: 444 Url: http://forge.chorem.org/projects/chorem/repository/revisions/444 Log: Fix sales funnel forms Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-10-20 13:19:50 UTC (rev 443) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-10-20 13:50:11 UTC (rev 444) @@ -24,13 +24,21 @@ <h3>Proposition commerciale annulée</h3> </div> <div class="modal-body"> - <form class="form-horizontal"> - <fieldset> - <label for="cancelledDate">Date d'annulation</label> - <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="toCancel.cancelledDate" id="cancelledDate" class="datepicker" /> - <label for="cancelledReason">Raison</label> - <input type="text" ng-model="toCancel.cancelledReason" name="cancelledReason" id="cancelledReason" value="" class="text ui-widget-content ui-corner-all" /> - </fieldset> + <form class="form-horizontal" role="form"> + <div class="form-group"> + <label for="cancelledDate" class="control-label col-sm-4">Date d'annulation</label> + <div class="col-sm-4"> + <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="toCancel.cancelledDate" + id="cancelledDate" class="datepicker form-control" /> + </div> + </div> + <div class="form-group"> + <label for="cancelledReason" class="control-label col-sm-4">Raison</label> + <div class="col-sm-4"> + <input type="text" ng-model="toCancel.cancelledReason" name="cancelledReason" + id="cancelledReason" value="" class="text form-control" /> + </div> + </div> </form> </div> <div class="modal-footer"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-10-20 13:19:50 UTC (rev 443) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-10-20 13:50:11 UTC (rev 444) @@ -26,8 +26,13 @@ <div class="modal-body"> <form class="form-horizontal"> <fieldset> - <label for="sendDate">Date d'envoi</label> - <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="draft.sendingDate" id="sendDate" class="datepicker" /> + <div class="form-group"> + <label for="sendDate" class="control-label col-sm-4">Date d'envoi</label> + <div class="col-sm-4"> + <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="draft.sendingDate" + id="sendDate" class="datepicker form-control" /> + </div> + </div> </fieldset> </form> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-10-20 13:19:50 UTC (rev 443) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-10-20 13:50:11 UTC (rev 444) @@ -26,10 +26,20 @@ <div class="modal-body"> <form class="form-horizontal"> <fieldset> - <label for="sendingDate">Date d'envoi</label> - <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="lead.sendingDate" id="sendingDate" class="datepicker" /> - <label for="reference">Référence</label> - <input type="text" ng-model="lead.reference" id="reference" class="text ui-widget-content ui-corner-all" /> + <div class="form-group"> + <label for="sendingDate" class="control-label col-sm-4">Date d'envoi</label> + <div class="col-sm-4"> + <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="lead.sendingDate" + id="sendingDate" class="datepicker form-control" /> + </div> + </div> + <div class="form-group"> + <label for="reference" class="control-label col-sm-4">Référence</label> + <div class="col-sm-4"> + <input type="text" ng-model="lead.reference" id="reference" + class="text ui-widget-content ui-corner-all form-control" /> + </div> + </div> </fieldset> </form> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-10-20 13:19:50 UTC (rev 443) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-10-20 13:50:11 UTC (rev 444) @@ -26,8 +26,13 @@ <div class="modal-body"> <form class="form-horizontal"> <fieldset> - <label for="acceptedDate">Date d'acceptation</label> - <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.acceptedDate" id="acceptedDate" class="datepicker" /> + <div class="form-group"> + <label for="acceptedDate" class="control-label col-sm-4">Date d'acceptation</label> + <div class="col-sm-4"> + <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.acceptedDate" + id="acceptedDate" class="datepicker form-control" /> + </div> + </div> </fieldset> </form> </div> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-10-20 13:19:50 UTC (rev 443) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-10-20 13:50:11 UTC (rev 444) @@ -26,8 +26,13 @@ <div class="modal-body"> <form class="form-horizontal"> <fieldset> - <label for="rejectedDate">Date de rejet</label> - <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.rejectedDate" id="rejectedDate" class="datepicker" /> + <div class="form-group"> + <label for="rejectedDate" class="control-label col-sm-4">Date de rejet</label> + <div class="col-sm-4"> + <input type="text" ui-date ui-date-format="dd/mm/yy" ng-model="sent.rejectedDate" + id="rejectedDate" class="datepicker form-control" /> + </div> + </div> </fieldset> </form> </div>

1 0

r443 - in trunk/chorem-webmotion/src/main: java/org/wikitty/web/jsptag webapp/WEB-INF/jsp
by jcouteau＠users.chorem.org Oct. 20, 2014

Oct. 20, 2014

Author: jcouteau Date: 2014-10-20 15:19:50 +0200 (Mon, 20 Oct 2014) New Revision: 443 Url: http://forge.chorem.org/projects/chorem/repository/revisions/443 Log: Fix form style Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-10-20 08:58:44 UTC (rev 442) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-10-20 13:19:50 UTC (rev 443) @@ -185,7 +185,7 @@ protected void inputBinary(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - /*{<input type="file" name="<%=name%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input type="file" class="form-control" name="<%=name%>" <%=getDynamicAttribute()%>/>}*/ } protected void inputBoolean(JspWriter output, String contextPath, String name, @@ -212,22 +212,22 @@ if (date != null) { value = DateFormatUtils.format(date, "MM/yyyy"); } - /*{<input class="monthpicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="monthpicker form-control" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("time".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "HH:mm"); } - /*{<input class="timepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="timepicker form-control" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else if ("datetime".equals(field.getTagValue("subtype"))) { if (date != null) { value = DateFormatUtils.format(date, "dd/MM/yyyy HH:mm"); } - /*{<input class="datetimepicker" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ + /*{<input class="datetimepicker form-control" type="text" name="<%=name%>" value="<%=value%>" <%=getDynamicAttribute()%>/>}*/ } else { if (date != null) { value = DateFormatUtils.format(date, "dd/MM/yyyy"); } - /*{<input class="datepicker" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input class="datepicker form-control" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ } } @@ -239,7 +239,7 @@ value= wikitty.getFieldAsBigDecimal(extName, fieldName); NumberFormat formatter = NumberFormat.getNumberInstance(); String formattedValue = formatter.format(value); - /*{<input type="text" name="<%=name%>" value="<%=formattedValue%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input type="text" class="form-control" name="<%=name%>" value="<%=formattedValue%>"<%=getDynamicAttribute()%>/>}*/ } protected void inputString(JspWriter output, String contextPath, String name, @@ -252,7 +252,7 @@ fieldValue = wikitty.getFieldAsString(extName, fieldName); String value = fieldValue !=null ? fieldValue : ""; if ("monoline".equalsIgnoreCase(field.getSubtype())) { - /*{<input id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input id="text-<%=id%>" class="form-control" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ if (field.hasChoiceQuery()) { String url = contextPath + "/wikitty-json/searchField?q=" + field.getChoiceQuery(); /*{ @@ -267,7 +267,7 @@ }*/ } } else { - /*{<textarea name="<%=name%>"<%=getDynamicAttribute()%>><%=value%></textarea>}*/ + /*{<textarea class="form-control" name="<%=name%>"<%=getDynamicAttribute()%>><%=value%></textarea>}*/ } } @@ -278,7 +278,7 @@ String value = ""; if(!emptyField) value = wikitty.getFieldAsString(extName, fieldName); - /*{<select id="text-<%=id%>" name="<%=name%>" <%=getDynamicAttribute()%> }*/ + /*{<select class="form-control" id="text-<%=id%>" name="<%=name%>" <%=getDynamicAttribute()%> }*/ if (field.isCollection()) { /*{ multiple="multiple" }*/ } @@ -303,7 +303,7 @@ value = wikitty.getFieldAsList(extName, fieldName, String.class); if ("monoline".equalsIgnoreCase(field.getSubtype())) { - /*{<input id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ + /*{<input class="form-control" id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ if (field.hasChoiceQuery()) { String url = contextPath + "/wikitty-json/searchField?q=" + field.getChoiceQuery(); /*{ @@ -368,7 +368,7 @@ }); </script> -<input type="text" id="text-<%=id%>" value="<%=wlabel%>"<%=getDynamicAttribute()%>/> +<input type="text" class="form-control" id="text-<%=id%>" value="<%=wlabel%>"<%=getDynamicAttribute()%>/> <input type="hidden" id="hidden-<%=id%>" name="<%=name%>" value="<%=wid%>"/> }*/ } @@ -417,7 +417,7 @@ }); </script> -<input type="text" id="text-<%=id%>" name="<%=name%>"<%=getDynamicAttribute()%>/> +<input type="text" class="form-control" id="text-<%=id%>" name="<%=name%>"<%=getDynamicAttribute()%>/> }*/ } Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-10-20 08:58:44 UTC (rev 442) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-10-20 13:19:50 UTC (rev 443) @@ -38,9 +38,9 @@ <legend>${ext.name}</legend> <input type="hidden" name="extension" value="${ext.name}"> <c:forEach var="fieldName" items="${ext.fieldNames}"> - <div class="control-group"> - <label class="control-label">${fieldName}</label> - <div class="controls"> + <div class="form-group"> + <label class="control-label col-sm-2">${fieldName}</label> + <div class="col-sm-3"> <w:input wikitty="${wikitty}" fqfield="${ext.name}.${fieldName}"/> </div> </div>

1 0

r442 - in trunk/chorem-entities/src/main/java/org/chorem: . entities
by jcouteau＠users.chorem.org Oct. 20, 2014

Oct. 20, 2014

Author: jcouteau Date: 2014-10-20 10:58:44 +0200 (Mon, 20 Oct 2014) New Revision: 442 Url: http://forge.chorem.org/projects/chorem/repository/revisions/442 Log: Misc javadoc fixes Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2014-10-20 08:58:25 UTC (rev 441) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2014-10-20 08:58:44 UTC (rev 442) @@ -138,8 +138,8 @@ /** * Try to parse date, if not possible, return null. * acceptable pattern - * <li>"yyyy-MM-dd HH:mm:ss" - * <li>"yyyy-MM-dd" + * - "yyyy-MM-dd HH:mm:ss" + * - "yyyy-MM-dd" * * @param s date to parse * @return Date object or null if s is not date with right pattern Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-10-20 08:58:25 UTC (rev 441) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-10-20 08:58:44 UTC (rev 442) @@ -35,7 +35,7 @@ * * Quotation is now split into several extensions (one per status) * - * @author jcouteau <couteau(a)codelutin.com> + * @author jcouteau * @since 0.3 */ public class Quotation18Migration extends WikittyExtensionMigrationRename {

1 0

r441 - in trunk: . chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports chorem-webmotion/src/main/webapp/js
by jcouteau＠users.chorem.org Oct. 20, 2014

Oct. 20, 2014

Author: jcouteau Date: 2014-10-20 10:58:25 +0200 (Mon, 20 Oct 2014) New Revision: 441 Url: http://forge.chorem.org/projects/chorem/repository/revisions/441 Log: Update versions and fix sales funnel (changes after version updates) Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js trunk/pom.xml Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2014-10-17 16:05:55 UTC (rev 440) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2014-10-20 08:58:25 UTC (rev 441) @@ -87,7 +87,7 @@ getContext().addInfoMessage("message", "Warning: Could not parse date " + rejectedDate); } client.store(rejected); - return new RenderWikitty().setModelWikitty((Wikitty) rejected); + return new RenderWikittyJson(rejected); } public Render start(ChoremClient client, String id) { 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 2014-10-17 16:05:55 UTC (rev 440) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2014-10-20 08:58:25 UTC (rev 441) @@ -28,7 +28,7 @@ <head> <link rel="stylesheet/less" href="<c:url value='/css/chorem-sales.css'/>"> <script type="text/javascript" src="<c:url value='/js/salesFunnel.js'/>"></script> - <script type="text/javascript" src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.5.0.js"></script> + <script type="text/javascript" src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.11.2.js"></script> <script type="text/javascript" src="https://raw.github.com/angular-ui/ui-date/master/src/date.js"></script> </head> Modified: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-10-17 16:05:55 UTC (rev 440) +++ trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-10-20 08:58:25 UTC (rev 441) @@ -41,7 +41,7 @@ }); -var salesFunnelController = ['$scope', '$dialog', 'Wikitty', function ($scope, $dialog, Wikitty) { +var salesFunnelController = ['$scope', '$modal', 'Wikitty', function ($scope, $modal, Wikitty) { $scope.wikittyId = ''; $scope.wikitty = {}; @@ -68,7 +68,7 @@ }); $scope.leadToDraft = function(lead){ - var d = $dialog.dialog({ + var d = $modal.open({ templateUrl: './funnel/partial/dialog-leadToDraft.html', controller: 'LeadToDraftDialogController', resolve: { @@ -77,12 +77,10 @@ } } }); - d.open(); - //initFields(); }; $scope.draftToSent = function(draft){ - var d = $dialog.dialog({ + var d = $modal.open({ templateUrl: './funnel/partial/dialog-draftToSent.html', controller: 'DraftToSentDialogController', resolve: { @@ -91,11 +89,10 @@ } } }); - d.open(); }; $scope.sentToAccepted = function(sent){ - var d = $dialog.dialog({ + var d = $modal.open({ templateUrl: './funnel/partial/dialog-sentToAccepted.html', controller: 'SentToAcceptedDialogController', resolve: { @@ -104,11 +101,10 @@ } } }); - d.open(); }; $scope.sentToRejected = function(sent){ - var d = $dialog.dialog({ + var d = $modal.open({ templateUrl: './funnel/partial/dialog-sentToRejected.html', controller: 'SentToRejectedDialogController', resolve: { @@ -117,11 +113,10 @@ } } }); - d.open(); }; $scope.cancel = function(toCancel){ - var d = $dialog.dialog({ + var d = $modal.open({ templateUrl: './funnel/partial/dialog-cancel.html', controller: 'CancelDialogController', resolve: { @@ -130,21 +125,20 @@ } } }); - d.open(); }; }]; // Controller for the Lead To Draft Dialog -var LeadToDraftDialogController = ['$scope', '$http', 'dialog', 'dialogModel', 'Wikitty', function ($scope, $http, dialog, dialogModel, Wikitty) { +var LeadToDraftDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', 'Wikitty', function ($scope, $http, $modalInstance, dialogModel, Wikitty) { $scope.lead = dialogModel.lead; $scope.drafts = dialogModel.drafts; $scope.leads = dialogModel.leads; //$scope.lead.sendingDate = new Date().toString("dd/mm/yy"); $scope.cancel = function(){ - dialog.close(); + $modalInstance.close(); }; $scope.validate = function(){ @@ -155,7 +149,7 @@ function(data,status){ scope.drafts.push(new Wikitty(data)); scope.leads.splice(scope.leads.indexOf(scope.lead),1); - dialog.close(); + $modalInstance.close(); } ); } @@ -164,14 +158,14 @@ // Controller for the Draft To Sent Dialog -var DraftToSentDialogController = ['$scope', '$http', 'dialog', 'dialogModel', 'Wikitty', function ($scope, $http, dialog, dialogModel, Wikitty) { +var DraftToSentDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', 'Wikitty', function ($scope, $http, $modalInstance, dialogModel, Wikitty) { $scope.draft = dialogModel.draft; $scope.drafts = dialogModel.drafts; $scope.sents = dialogModel.sents; //$scope.draft.sendingDate = new Date().toString("dd/mm/yy"); $scope.cancel = function(){ - dialog.close(); + $modalInstance.close(); }; $scope.validate = function(){ @@ -182,7 +176,7 @@ function(data,status){ scope.sents.push(new Wikitty(data)); scope.drafts.splice(scope.drafts.indexOf(scope.draft),1); - dialog.close(); + $modalInstance.close(); } ); } @@ -191,13 +185,13 @@ // Controller for the Sent to Accepted Dialog -var SentToAcceptedDialogController = ['$scope', '$http', 'dialog', 'dialogModel', function ($scope, $http, dialog, dialogModel) { +var SentToAcceptedDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', function ($scope, $http, $modalInstance, dialogModel) { $scope.sent = dialogModel.sent; $scope.sents = dialogModel.sents; $scope.sent.acceptedDate = new Date(); $scope.cancel = function(){ - dialog.close(); + $modalInstance.close(); }; $scope.validate = function(){ @@ -207,7 +201,7 @@ {params: {acceptedDate:$scope.sent.acceptedDate}}).success( function(data,status){ $scope.sents.splice($scope.sents.indexOf(sent),1); - dialog.close(); + $modalInstance.close(); } ); } @@ -216,13 +210,13 @@ // Controller for the Sent to Rejected Dialog -var SentToRejectedDialogController = ['$scope', '$http', 'dialog', 'dialogModel', function ($scope, $http, dialog, dialogModel) { +var SentToRejectedDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', function ($scope, $http, $modalInstance, dialogModel) { $scope.sent = dialogModel.sent; $scope.sents = dialogModel.sents; $scope.sent.rejectedDate = new Date(); $scope.cancel = function(){ - dialog.close(); + $modalInstance.close(); }; $scope.validate = function(){ @@ -231,7 +225,7 @@ $http.get(createUrl('sales/funnel/json/reject/'+$scope.sent.meta.id),{params: {rejectedDate:$scope.sent.rejectedDate}}).success( function(data,status){ $scope.sents.splice($scope.sents.indexOf(sent),1); - dialog.close(); + $modalInstance.close(); } ); } @@ -240,20 +234,20 @@ // Controller for the Cancel Dialog -var CancelDialogController = ['$scope', '$http', 'dialog', 'dialogModel', function ($scope, $http, dialog, dialogModel) { +var CancelDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel', function ($scope, $http, $modalInstance, dialogModel) { $scope.toCancel = dialogModel.toCancel; $scope.sents = dialogModel.sents; $scope.leads = dialogModel.leads; $scope.drafts = dialogModel.drafts; $scope.cancel = function(){ - dialog.close(); + $modalInstance.close(); }; $scope.validate = function(){ //pass scope to the success function var scope = $scope; - $http.get(createUrl('sales/funnel/json/cancel/'+$scope.toCancel.meta.id),{params: {cancelledDate:$scope.toCancel.cancelledDate, reason:$scope.toCancel.reason}}).success( + $http.get(createUrl('sales/funnel/json/cancel/'+$scope.toCancel.meta.id),{params: {cancelledDate:$scope.toCancel.cancelledDate, reason:$scope.toCancel.cancelledReason}}).success( function(data,status){ if ($scope.sents.indexOf($scope.toCancel)!= -1) { $scope.sents.splice($scope.sents.indexOf($scope.toCancel),1); @@ -265,7 +259,7 @@ $scope.leads.splice($scope.leads.indexOf($scope.toCancel),1); } - dialog.close(); + $modalInstance.close(); } ); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-17 16:05:55 UTC (rev 440) +++ trunk/pom.xml 2014-10-20 08:58:25 UTC (rev 441) @@ -59,6 +59,18 @@ <role>developer</role> </roles> </developer> + + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </developer> </developers> <modules> @@ -97,18 +109,18 @@ <processPluginVersion>1.1</processPluginVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> - <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> - <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> - <nuitonI18nVersion>3.1</nuitonI18nVersion> - <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> + <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> <nuitonWebVersion>1.16</nuitonWebVersion> <wikittyVersion>3.11-SNAPSHOT</wikittyVersion> <nuitonjsWro.version>1.0.3</nuitonjsWro.version> - <nuitonjsAngularjs.version>1.2.12-1</nuitonjsAngularjs.version> + <nuitonjsAngularjs.version>1.3.0-beta.7-1</nuitonjsAngularjs.version> <nuitonjsJquery.version>2.1.1-1</nuitonjsJquery.version> - <nuitonjsJqueryui.version>1.10.4-1</nuitonjsJqueryui.version> - <nuitonjsJqplot.version>1.0.8r1250-1-SNAPSHOT</nuitonjsJqplot.version> + <nuitonjsJqueryui.version>1.11.2-1</nuitonjsJqueryui.version> + <nuitonjsJqplot.version>1.0.8r1250-1</nuitonjsJqplot.version> <nuitonjsBootstrap.version>3.2.0-1</nuitonjsBootstrap.version>

1 0

r440 - trunk/chorem-webmotion/src/main/webapp/css
by jcouteau＠users.chorem.org Oct. 17, 2014

Oct. 17, 2014

Author: jcouteau Date: 2014-10-17 18:05:55 +0200 (Fri, 17 Oct 2014) New Revision: 440 Url: http://forge.chorem.org/projects/chorem/repository/revisions/440 Log: Improve sales funnel css Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-10-17 15:50:50 UTC (rev 439) +++ trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-10-17 16:05:55 UTC (rev 440) @@ -28,6 +28,7 @@ margin-bottom: 10px; min-height: 20px; padding: 5px; + list-style-type:none; } .salesFunnelItemTitle{

1 0

r439 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports
by jcouteau＠users.chorem.org Oct. 17, 2014

Oct. 17, 2014

Author: jcouteau Date: 2014-10-17 17:50:50 +0200 (Fri, 17 Oct 2014) New Revision: 439 Url: http://forge.chorem.org/projects/chorem/repository/revisions/439 Log: Fix sales reports menu Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-10-17 15:43:57 UTC (rev 438) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-10-17 15:50:50 UTC (rev 439) @@ -20,10 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + <ul class="list-group"> - <li class="list-group-item"><a href="sales"><i class="icon-chevron-right"></i> Ventes</a></li> - <li class="list-group-item"><a href="salesPerAccount"><i class="icon-chevron-right"></i> Ventes par client</a></li> - <li class="list-group-item"><a href="salesPerProject"><i class="icon-chevron-right"></i> Ventes par projet</a></li> - <li class="list-group-item"><a href="sentQuotation"><i class="icon-chevron-right"></i> Devis envoy�s</a></li> - <li class="list-group-item"><a href="acceptedQuotation"><i class="icon-chevron-right"></i> Devis accept�s</a></li> + <li class="list-group-item"><a href="<c:url value="/sales/report/sales"/>"><i class="icon-chevron-right"></i> Ventes</a></li> + <li class="list-group-item"><a href="<c:url value="/sales/report/salesPerAccount"/>"><i class="icon-chevron-right"></i> Ventes par client</a></li> + <li class="list-group-item"><a href="<c:url value="/sales/report/salesPerProject"/>"><i class="icon-chevron-right"></i> Ventes par projet</a></li> + <li class="list-group-item"><a href="<c:url value="/sales/report/sentQuotation"/>"><i class="icon-chevron-right"></i> Devis envoyés</a></li> + <li class="list-group-item"><a href="<c:url value="/sales/report/acceptedQuotation"/>"><i class="icon-chevron-right"></i> Devis acceptés</a></li> </ul> \ No newline at end of file

1 0

r438 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/financial resources webapp/WEB-INF/jsp/financial/reports
by jcouteau＠users.chorem.org Oct. 17, 2014

Oct. 17, 2014

Author: jcouteau Date: 2014-10-17 17:43:57 +0200 (Fri, 17 Oct 2014) New Revision: 438 Url: http://forge.chorem.org/projects/chorem/repository/revisions/438 Log: fixes #944 : [Financial] Reporting : - reporting on billing per year for an account - reporting on billing per year for a project Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp Modified: trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp Copied: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java (from rev 435, trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java) =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java 2014-10-17 15:43:57 UTC (rev 438) @@ -0,0 +1,118 @@ +package org.chorem.webmotion.actions.financial; + +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.ChoremClient; +import org.chorem.entities.Accepted; +import org.chorem.entities.FinancialTransaction; +import org.chorem.entities.Quotation; +import org.chorem.webmotion.actions.sales.SalesData; +import org.chorem.webmotion.actions.sales.SalesReportHelper; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.render.Render; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; + +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @author jcouteau <couteau(a)codelutin.com> + */ +public class AccountBillingReportAction extends WebMotionController { + + /** + * Rend le graphe des devis envoyés par mois + * + * @param client + * @return + */ + public Render billing(ChoremClient client, String account, String from, + String to) { + + if (null == from) { + from = String.valueOf(BillingReportHelper.getFirstYear(client)); + } + + if (null == to) { + to = String.valueOf(BillingReportHelper.getLastYear()); + } + + Map<Integer, SalesData> salesData = new LinkedHashMap<Integer, SalesData>(); + + List<Integer> listAllYears = BillingReportHelper.listAllYears(from, to); + + List<Integer> listAllYearsInChorem = BillingReportHelper.listAllYears(client); + + int previousYearValue = 0; + + for (Integer year:listAllYears){ + Date yearFirstDay = BillingReportHelper.getFirstDayOfYear(year); + Date yearLastDay = BillingReportHelper.getLastDayOfYear(year); + + SalesData yearData = new SalesData(); + + WikittyQuery projectQuery = new WikittyQueryMaker() + .select().sum(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_AMOUNT).where().and() + .eq(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER, account) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, yearFirstDay, + yearLastDay) + .end(); + + Integer sales = client.findByQuery(Integer.class, projectQuery); + + //TODO JC 2012-01-26 Find a way to replace two queries into one. + WikittyQuery quotationsQuery = new WikittyQueryMaker().and() + .eq(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER, account) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, yearFirstDay, + yearLastDay) + .end(); + + List<FinancialTransaction> quotations = client.findAllByQuery(FinancialTransaction.class, + quotationsQuery).getAll(); + + //Progression devis envoyés + int salesProgression = 0; + if (previousYearValue != 0){ + salesProgression = 100 * (sales - previousYearValue) / previousYearValue; + } + + previousYearValue = sales; + + yearData.setSales(sales); + yearData.setProgression(salesProgression); + yearData.setQuotations(quotations.size()); + + salesData.put(year, yearData); + } + + return renderView("financial/reports/accountBillingReport.jsp", + "data", salesData, + "allYears", listAllYearsInChorem, + "fromYear", from, + "toYear", to); + } +} Copied: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java (from rev 435, trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java) =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java 2014-10-17 15:43:57 UTC (rev 438) @@ -0,0 +1,118 @@ +package org.chorem.webmotion.actions.financial; + +/* + * #%L + * Chorem :: webmotion + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.ChoremClient; +import org.chorem.entities.Accepted; +import org.chorem.entities.FinancialTransaction; +import org.chorem.entities.Quotation; +import org.chorem.webmotion.actions.sales.SalesData; +import org.chorem.webmotion.actions.sales.SalesReportHelper; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.render.Render; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; + +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @author jcouteau <couteau(a)codelutin.com> + */ +public class ProjectBillingReportAction extends WebMotionController { + + /** + * Rend le graphe des devis envoyés par mois + * + * @param client + * @return + */ + public Render billing(ChoremClient client, String project, String from, + String to) { + + if (null == from) { + from = String.valueOf(BillingReportHelper.getFirstYear(client)); + } + + if (null == to) { + to = String.valueOf(BillingReportHelper.getLastYear()); + } + + Map<Integer, SalesData> salesData = new LinkedHashMap<Integer, SalesData>(); + + List<Integer> listAllYears = BillingReportHelper.listAllYears(from, to); + + List<Integer> listAllYearsInChorem = BillingReportHelper.listAllYears(client); + + int previousYearValue = 0; + + for (Integer year:listAllYears){ + Date yearFirstDay = BillingReportHelper.getFirstDayOfYear(year); + Date yearLastDay = BillingReportHelper.getLastDayOfYear(year); + + SalesData yearData = new SalesData(); + + WikittyQuery projectQuery = new WikittyQueryMaker() + .select().sum("FinancialTransaction.amount").where().and() + .eq(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_TARGET, project) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, yearFirstDay, + yearLastDay) + .end(); + + Integer billing = client.findByQuery(Integer.class, projectQuery); + + //TODO JC 2012-01-22 Find a way to replace two queries into one. + WikittyQuery quotationsQuery = new WikittyQueryMaker().and() + .eq(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_TARGET, project) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, yearFirstDay, + yearLastDay) + .end(); + + List<FinancialTransaction> quotations = client.findAllByQuery(FinancialTransaction.class, + quotationsQuery).getAll(); + + //Progression devis envoyés + int salesProgression = 0; + if (previousYearValue != 0){ + salesProgression = 100 * (billing - previousYearValue) / previousYearValue; + } + + previousYearValue = billing; + + yearData.setSales(billing); + yearData.setProgression(salesProgression); + yearData.setQuotations(quotations.size()); + + salesData.put(year, yearData); + } + + return renderView("financial/reports/projectBillingReport.jsp", + "data", salesData, + "allYears", listAllYearsInChorem, + "fromYear", from, + "toYear", to); + } +} Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2014-10-17 14:54:24 UTC (rev 437) +++ trunk/chorem-webmotion/src/main/resources/mapping 2014-10-17 15:43:57 UTC (rev 438) @@ -108,7 +108,9 @@ PUT /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.saveExpenseAccount * /financial/report/billing action:financial.BillingReportAction.billing * /financial/report/billingPerProject action:financial.BillingPerProjectReportAction.billing +* /financial/report/billingPerProject/{project} action:financial.ProjectBillingReportAction.billing * /financial/report/billingPerAccount action:financial.BillingPerAccountReportAction.billing +* /financial/report/billingPerAccount/{account} action:financial.AccountBillingReportAction.billing * /billingMenu view:financial/reports/menu.jsp Copied: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp (from rev 435, trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp) =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp 2014-10-17 15:43:57 UTC (rev 438) @@ -0,0 +1,122 @@ +<%-- + #%L + Chorem webmotion + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<div class="row-fluid"> + <div class="span2"> + <jsp:include page="/billingMenu"/> + </div> + + <div class="span10"> +  + <script type="text/javascript"> + $(document).ready(function(){ + var sales = [ + <c:forEach var="entry" items="${data}" varStatus="counter"> + ['${entry.key}', ${entry.value.sales}] + <c:if test="${!counter.last}">, </c:if> + </c:forEach> + ]; + + var plot1 = $.jqplot ('sales', [sales], { + title:'Facturation par année', + seriesDefaults:{ + renderer:$.jqplot.BarRenderer, + rendererOptions: {fillToZero: true} + }, + axes:{ + xaxis:{ + pad: 0, + tickRenderer: $.jqplot.CanvasAxisTickRenderer , + tickOptions: { + angle: -30, + fontSize: '10pt' + }, + renderer: $.jqplot.CategoryAxisRenderer + }, + }, + highlighter: { + show: true, + tooltipAxes: 'y' + }, + cursor: { + show: false + }, + series:[ + <c:forEach var="entry" items="${data}" varStatus="counter"> + {label:${entry.key}}<c:if test="${!counter.last}">,</c:if> + </c:forEach>] + }); + + }); + </script> + + <h2>Facturation par année</h2> + + <form action="sales" method="get"> + <select name="from"> + <c:forEach var="entry" items="${allYears}" varStatus="counter"> + <option value="${entry}" <c:if test="${entry==fromYear}">selected</c:if>>${entry}</option> + </c:forEach> + </select> + <select name="to"> + <c:forEach var="entry" items="${allYears}" varStatus="counter"> + <option value="${entry}" ${entry == toYear ? 'selected' : ''} >${entry}</option> + </c:forEach> + </select> + <input type="submit" value="Rechercher"> + </form> + + <div id="sales" style="height:200px;"></div> + + + <table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Année</th> + <th>Facturation</th> + <th>Factures</th> + <th>€/factures</th> + <th>Progression</th> + </tr> + </thead> + <tbody> + <c:forEach var="year" items="${data}"> + <tr> + <td>${year.key}</td> + <td class="currency">${year.value.sales}</td> + <td>${year.value.quotations}</td> + <td class="currency">${year.value.mean}</td> + <td class="percent">${year.value.progression} %</td> + </tr> + </c:forEach> + </tbody> + </table> + + </div> +</div> + +<div style="clear:both;"/> \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp 2014-10-17 14:54:24 UTC (rev 437) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp 2014-10-17 15:43:57 UTC (rev 438) @@ -91,7 +91,7 @@ <tbody> <c:forEach var="account" items="${data}"> <tr> - <td>${account.key}</td> + <td><a href="<c:url value="/financial/report/billingPerAccount/${account.key.wikittyId}"/>">${account.key}</a></td> <td>${account.value.sales}</td> <td>${account.value.quotations}</td> <td>${account.value.mean} €</td> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp 2014-10-17 14:54:24 UTC (rev 437) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp 2014-10-17 15:43:57 UTC (rev 438) @@ -91,7 +91,7 @@ <tbody> <c:forEach var="project" items="${data}"> <tr> - <td>${project.key.name}</td> + <td><a href="<c:url value="/financial/report/billingPerProject/${project.key.wikittyId}"/>">${project.key.name}</a></td> <td>${project.value.sales}</td> <td>${project.value.quotations}</td> <td>${project.value.mean} €</td> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp 2014-10-17 14:54:24 UTC (rev 437) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp 2014-10-17 15:43:57 UTC (rev 438) @@ -20,8 +20,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --%> + + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + <ul class="list-group"> - <li class="list-group-item"><a href="billing"><i class="icon-chevron-right"></i> Facturation</a></li> - <li class="list-group-item"><a href="billingPerAccount"><i class="icon-chevron-right"></i> Facturation par client</a></li> - <li class="list-group-item"><a href="billingPerProject"><i class="icon-chevron-right"></i> Facturation par projet</a></li> + <li class="list-group-item"><a href="<c:url value="/financial/report/billing"/>"><i class="icon-chevron-right"></i> Facturation</a></li> + <li class="list-group-item"><a href="<c:url value="/financial/report/billingPerAccount"/>"><i class="icon-chevron-right"></i> Facturation par client</a></li> + <li class="list-group-item"><a href="<c:url value="/financial/report/billingPerProject"/>"><i class="icon-chevron-right"></i> Facturation par projet</a></li> </ul> \ No newline at end of file Copied: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp (from rev 435, trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp) =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp 2014-10-17 15:43:57 UTC (rev 438) @@ -0,0 +1,122 @@ +<%-- + #%L + Chorem webmotion + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<div class="row-fluid"> + <div class="span2"> + <jsp:include page="/billingMenu"/> + </div> + + <div class="span10"> +  + <script type="text/javascript"> + $(document).ready(function(){ + var sales = [ + <c:forEach var="entry" items="${data}" varStatus="counter"> + ['${entry.key}', ${entry.value.sales}] + <c:if test="${!counter.last}">, </c:if> + </c:forEach> + ]; + + var plot1 = $.jqplot ('sales', [sales], { + title:'Facturation par année', + seriesDefaults:{ + renderer:$.jqplot.BarRenderer, + rendererOptions: {fillToZero: true} + }, + axes:{ + xaxis:{ + pad: 0, + tickRenderer: $.jqplot.CanvasAxisTickRenderer , + tickOptions: { + angle: -30, + fontSize: '10pt' + }, + renderer: $.jqplot.CategoryAxisRenderer + }, + }, + highlighter: { + show: true, + tooltipAxes: 'y' + }, + cursor: { + show: false + }, + series:[ + <c:forEach var="entry" items="${data}" varStatus="counter"> + {label:${entry.key}}<c:if test="${!counter.last}">,</c:if> + </c:forEach>] + }); + + }); + </script> + + <h2>Facturation par année</h2> + + <form action="sales" method="get"> + <select name="from"> + <c:forEach var="entry" items="${allYears}" varStatus="counter"> + <option value="${entry}" <c:if test="${entry==fromYear}">selected</c:if>>${entry}</option> + </c:forEach> + </select> + <select name="to"> + <c:forEach var="entry" items="${allYears}" varStatus="counter"> + <option value="${entry}" ${entry == toYear ? 'selected' : ''} >${entry}</option> + </c:forEach> + </select> + <input type="submit" value="Rechercher"> + </form> + + <div id="sales" style="height:200px;"></div> + + + <table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Année</th> + <th>Facturation</th> + <th>Factures</th> + <th>€/factures</th> + <th>Progression</th> + </tr> + </thead> + <tbody> + <c:forEach var="year" items="${data}"> + <tr> + <td>${year.key}</td> + <td class="currency">${year.value.sales}</td> + <td>${year.value.quotations}</td> + <td class="currency">${year.value.mean}</td> + <td class="percent">${year.value.progression} %</td> + </tr> + </c:forEach> + </tbody> + </table> + + </div> +</div> + +<div style="clear:both;"/> \ No newline at end of file

1 0