Chorem-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
January 2013
- 3 participants
- 15 discussions
r305 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/sales resources webapp/WEB-INF/jsp/salesReports
by jcouteau@users.chorem.org 26 Jan '13
by jcouteau@users.chorem.org 26 Jan '13
26 Jan '13
Author: jcouteau
Date: 2013-01-26 11:23:12 +0100 (Sat, 26 Jan 2013)
New Revision: 305
Url: http://chorem.org/projects/chorem/repository/revisions/305
Log:
Add a report on sales per account (customer)
Added:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp
Modified:
trunk/chorem-webmotion/src/main/resources/log4j.properties
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2013-01-26 10:23:12 UTC (rev 305)
@@ -0,0 +1,93 @@
+package org.chorem.webmotion.actions.sales;
+
+import org.chorem.ChoremClient;
+import org.chorem.entities.Accepted;
+import org.chorem.entities.Quotation;
+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 org.nuiton.wikitty.query.conditions.Aggregate;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jcouteau <couteau(a)codelutin.com>
+ */
+public class AccountSalesReportAction extends WebMotionController {
+
+ /**
+ * Rend le graphe des devis envoyés par mois
+ *
+ * @param client
+ * @return
+ */
+ public Render sales(ChoremClient client, String account, String from,
+ String to) {
+
+ if (null == from) {
+ from = String.valueOf(SalesReportHelper.getFirstYear(client));
+ }
+
+ if (null == to) {
+ to = String.valueOf(SalesReportHelper.getLastYear());
+ }
+
+ Map<Integer, SalesData> salesData = new LinkedHashMap<Integer, SalesData>();
+
+ List<Integer> listAllYears = SalesReportHelper.listAllYears(from, to);
+
+ List<Integer> listAllYearsInChorem = SalesReportHelper.listAllYears(client);
+
+ int previousYearValue = 0;
+
+ for (Integer year:listAllYears){
+ Date yearFirstDay = SalesReportHelper.getFirstDayOfYear(year);
+ Date yearLastDay = SalesReportHelper.getLastDayOfYear(year);
+
+ SalesData yearData = new SalesData();
+
+ WikittyQuery projectQuery = new WikittyQueryMaker()
+ .select("Quotation.amount", Aggregate.SUM).and()
+ .eq(Quotation.FQ_FIELD_QUOTATION_CUSTOMER, account)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, 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(Quotation.FQ_FIELD_QUOTATION_CUSTOMER, account)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, yearFirstDay,
+ yearLastDay)
+ .end();
+
+ List<Quotation> quotations = client.findAllByQuery(Quotation.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("salesReports/accountSalesReport.jsp",
+ "data", salesData,
+ "allYears", listAllYearsInChorem,
+ "fromYear", from,
+ "toYear", to);
+ }
+}
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2013-01-26 10:23:12 UTC (rev 305)
@@ -0,0 +1,99 @@
+package org.chorem.webmotion.actions.sales;
+
+import org.chorem.ChoremClient;
+import org.chorem.entities.Accepted;
+import org.chorem.entities.Employee;
+import org.chorem.entities.Quotation;
+import org.debux.webmotion.server.WebMotionController;
+import org.debux.webmotion.server.render.Render;
+import org.nuiton.wikitty.WikittyClient;
+import org.nuiton.wikitty.query.WikittyQuery;
+import org.nuiton.wikitty.query.WikittyQueryMaker;
+import org.nuiton.wikitty.query.conditions.Aggregate;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jcouteau <couteau(a)codelutin.com>
+ */
+public class SalesPerAccountReportAction extends WebMotionController {
+
+ /**
+ * Rend le graphe des devis envoyés par mois
+ *
+ * @param client
+ * @return
+ */
+ public Render sales(ChoremClient client, String from, String to) {
+
+ if (null == from) {
+ from = String.valueOf(SalesReportHelper.getFirstYear(client));
+ }
+
+ if (null == to) {
+ to = String.valueOf(SalesReportHelper.getLastYear());
+ }
+
+ Map<Employee, SalesData> salesData = getSalesPerProjectData(from, to, client);
+
+ List<Integer> listAllYearsInChorem = SalesReportHelper.listAllYears(client);
+
+ return renderView("salesReports/salesPerAccountReport.jsp",
+ "data", salesData,
+ "allYears", listAllYearsInChorem,
+ "fromYear", from,
+ "toYear", to);
+ }
+
+ protected Map<Employee,SalesData> getSalesPerProjectData(String firstYear,
+ String lastYear,
+ WikittyClient client){
+
+ Date last = SalesReportHelper.getLastDayOfYear(Integer.valueOf(lastYear));
+ Date first = SalesReportHelper.getFirstDayOfYear(Integer.valueOf(firstYear));
+
+ Map<Employee,SalesData> salesData = new LinkedHashMap<Employee, SalesData>();
+
+ //a query to get all the accounts
+ //FIXME JC 2012-01-26 Really bad to find all employees and iterate on them :(
+ WikittyQuery accountsQuery = new WikittyQueryMaker().and()
+ .exteq(Employee.EXT_EMPLOYEE).end();
+
+ List<Employee> accounts = client.findAllByQuery(Employee.class, accountsQuery).getAll();
+
+ //iterate and two queries per account :(
+ for (Employee account:accounts){
+
+ SalesData projectData = new SalesData();
+
+ WikittyQuery accountQuery = new WikittyQueryMaker()
+ .select("Quotation.amount", Aggregate.SUM).and()
+ .eq(Quotation.FQ_FIELD_QUOTATION_CUSTOMER, account)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, first, last)
+ .end();
+
+ Integer sales = client.findByQuery(Integer.class, accountQuery);
+
+ //TODO JC 2012-01-26 Find a way to replace two queries into one.
+ WikittyQuery quotationsQuery = new WikittyQueryMaker().and()
+ .eq(Quotation.FQ_FIELD_QUOTATION_CUSTOMER, account)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, first, last)
+ .end();
+
+ List<Quotation> quotations = client.findAllByQuery(Quotation.class,
+ quotationsQuery).getAll();
+
+ //Rempli la map que si on a des valeurs
+ if (null != sales && sales != 0) {
+ projectData.setSales(sales);
+ projectData.setQuotations(quotations.size());
+ salesData.put(account, projectData);
+ }
+ }
+
+ return salesData;
+ }
+}
Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties
===================================================================
--- trunk/chorem-webmotion/src/main/resources/log4j.properties 2013-01-23 15:33:00 UTC (rev 304)
+++ trunk/chorem-webmotion/src/main/resources/log4j.properties 2013-01-26 10:23:12 UTC (rev 305)
@@ -40,4 +40,5 @@
log4j.logger.org.chorem=DEBUG
log4j.logger.org.nuiton=INFO
log4j.logger.org.debux=ERROR
+log4j.logger.org.apache=ERROR
#log4j.logger.org.nuiton.wikitty.storage.solr.SolrUtil=DEBUG
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2013-01-23 15:33:00 UTC (rev 304)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2013-01-26 10:23:12 UTC (rev 305)
@@ -58,5 +58,5 @@
* /sales/report/sales action:sales.SalesReportAction.sales
* /sales/report/salesPerProject action:sales.SalesPerProjectReportAction.sales
* /sales/report/salesPerProject/{project} action:sales.ProjectSalesReportAction.sales
-* /sales/{method} action:sales.SalesAction.{method}
-* /sales/{method}/{id} action:sales.SalesAction.{method}
+* /sales/report/salesPerAccount action:sales.SalesPerAccountReportAction.sales
+* /sales/report/salesPerAccount/{account} action:sales.AccountSalesReportAction.sales
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp 2013-01-26 10:23:12 UTC (rev 305)
@@ -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="/salesMenu"/>
+ </div>
+
+ <div class="span10">
+ <!-- Javascript to display graph -->
+ <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:'Ventes 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>Ventes</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>Ventes</th>
+ <th>Devis</th>
+ <th>€/devis</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/salesReports/projectSalesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2013-01-23 15:33:00 UTC (rev 304)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2013-01-26 10:23:12 UTC (rev 305)
@@ -68,8 +68,7 @@
series:[
<c:forEach var="entry" items="${data}" varStatus="counter">
{label:${entry.key}}<c:if test="${!counter.last}">,</c:if>
- </c:forEach>],
- legend: {show:true, location: 'e', placement: 'outsideGrid' }
+ </c:forEach>]
});
});
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2013-01-26 10:23:12 UTC (rev 305)
@@ -0,0 +1,106 @@
+<%--
+ #%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="/salesMenu"/>
+ </div>
+
+ <div class="span10">
+ <!-- Javascript to display graph -->
+ <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:'Ventes par compte client',
+ seriesDefaults:{
+ renderer:$.jqplot.PieRenderer,
+ rendererOptions: {
+ showDataLabels: true,
+ dataLabels: 'value',
+ sliceMargin: 3
+ }
+ },
+ cursor: {
+ show: false
+ },
+ legend: {show:true, location: 'e'}
+ });
+
+ });
+ </script>
+
+ <h2>Ventes</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>Compte client</th>
+ <th>Ventes</th>
+ <th>Devis</th>
+ <th>€/devis</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach var="account" items="${data}">
+ <tr>
+ <td><a href="<c:url value="/sales/report/salesPerAccount/${account.key.wikittyId}"/>">${account.key}</a></td>
+ <td>${account.value.sales}</td>
+ <td>${account.value.quotations}</td>
+ <td>${account.value.mean} €</td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+
+ </div>
+</div>
+
+<div style="clear:both;"/>
\ No newline at end of file
1
0
23 Jan '13
Author: jcouteau
Date: 2013-01-23 16:33:00 +0100 (Wed, 23 Jan 2013)
New Revision: 304
Url: http://chorem.org/projects/chorem/repository/revisions/304
Log:
Clean imports
Modified:
trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2013-01-23 09:39:46 UTC (rev 303)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2013-01-23 15:33:00 UTC (rev 304)
@@ -22,13 +22,8 @@
*/
package org.chorem;
-import org.chorem.entities.Invoice;
-import org.chorem.entities.InvoiceMigration;
-import org.chorem.entities.Quotation;
-import org.chorem.entities.QuotationMigration;
-import static org.nuiton.i18n.I18n._;
import org.nuiton.util.ApplicationConfig;
-import org.nuiton.wikitty.WikittyConfigOption;
+import static org.nuiton.i18n.I18n._;
/**
* Chorem option definition.
1
0
r303 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/sales resources webapp/WEB-INF/jsp/salesReports
by jcouteau@users.chorem.org 23 Jan '13
by jcouteau@users.chorem.org 23 Jan '13
23 Jan '13
Author: jcouteau
Date: 2013-01-23 10:39:46 +0100 (Wed, 23 Jan 2013)
New Revision: 303
Url: http://chorem.org/projects/chorem/repository/revisions/303
Log:
refs #862 : Add a report for a project (sales by year on the project). Available from the sales per project report
Added:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2013-01-23 09:39:46 UTC (rev 303)
@@ -0,0 +1,93 @@
+package org.chorem.webmotion.actions.sales;
+
+import org.chorem.ChoremClient;
+import org.chorem.entities.Accepted;
+import org.chorem.entities.Quotation;
+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 org.nuiton.wikitty.query.conditions.Aggregate;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jcouteau <couteau(a)codelutin.com>
+ */
+public class ProjectSalesReportAction extends WebMotionController {
+
+ /**
+ * Rend le graphe des devis envoyés par mois
+ *
+ * @param client
+ * @return
+ */
+ public Render sales(ChoremClient client, String project, String from,
+ String to) {
+
+ if (null == from) {
+ from = String.valueOf(SalesReportHelper.getFirstYear(client));
+ }
+
+ if (null == to) {
+ to = String.valueOf(SalesReportHelper.getLastYear());
+ }
+
+ Map<Integer, SalesData> salesData = new LinkedHashMap<Integer, SalesData>();
+
+ List<Integer> listAllYears = SalesReportHelper.listAllYears(from, to);
+
+ List<Integer> listAllYearsInChorem = SalesReportHelper.listAllYears(client);
+
+ int previousYearValue = 0;
+
+ for (Integer year:listAllYears){
+ Date yearFirstDay = SalesReportHelper.getFirstDayOfYear(year);
+ Date yearLastDay = SalesReportHelper.getLastDayOfYear(year);
+
+ SalesData yearData = new SalesData();
+
+ WikittyQuery projectQuery = new WikittyQueryMaker()
+ .select("Quotation.amount", Aggregate.SUM).and()
+ .eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, project)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, yearFirstDay,
+ yearLastDay)
+ .end();
+
+ Integer sales = 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(Quotation.FQ_FIELD_QUOTATION_PROJECT, project)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, yearFirstDay,
+ yearLastDay)
+ .end();
+
+ List<Quotation> quotations = client.findAllByQuery(Quotation.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("salesReports/projectSalesReport.jsp",
+ "data", salesData,
+ "allYears", listAllYearsInChorem,
+ "fromYear", from,
+ "toYear", to);
+ }
+}
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2013-01-23 09:39:02 UTC (rev 302)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2013-01-23 09:39:46 UTC (rev 303)
@@ -9,6 +9,8 @@
protected Integer quotations;
+ protected Integer progression;
+
public Integer getSales() {
return sales;
}
@@ -35,4 +37,12 @@
return mean;
}
+
+ public Integer getProgression() {
+ return progression;
+ }
+
+ public void setProgression(Integer progression) {
+ this.progression = progression;
+ }
}
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2013-01-23 09:39:02 UTC (rev 302)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2013-01-23 09:39:46 UTC (rev 303)
@@ -57,5 +57,6 @@
* /sales/report/acceptedQuotation action:sales.AcceptedQuotationsReportAction.acceptedQuotationPerMonth
* /sales/report/sales action:sales.SalesReportAction.sales
* /sales/report/salesPerProject action:sales.SalesPerProjectReportAction.sales
+* /sales/report/salesPerProject/{project} action:sales.ProjectSalesReportAction.sales
* /sales/{method} action:sales.SalesAction.{method}
* /sales/{method}/{id} action:sales.SalesAction.{method}
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 2013-01-23 09:39:02 UTC (rev 302)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2013-01-23 09:39:46 UTC (rev 303)
@@ -1,7 +1,7 @@
<ul class="nav nav-list">
- <li><a href="#"><i class="icon-chevron-right"></i> Ventes</a></li>
+ <li><a href="sales"><i class="icon-chevron-right"></i> Ventes</a></li>
<li><a href="#"><i class="icon-chevron-right"></i> Ventes par client</a></li>
- <li><a href="#"><i class="icon-chevron-right"></i> Ventes par projet</a></li>
+ <li><a href="salesPerProject"><i class="icon-chevron-right"></i> Ventes par projet</a></li>
<li><a href="sentQuotation"><i class="icon-chevron-right"></i> Devis envoyés</a></li>
<li><a href="acceptedQuotation"><i class="icon-chevron-right"></i> Devis acceptés</a></li>
</ul>
\ No newline at end of file
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2013-01-23 09:39:46 UTC (rev 303)
@@ -0,0 +1,123 @@
+<%--
+ #%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="/salesMenu"/>
+ </div>
+
+ <div class="span10">
+ <!-- Javascript to display graph -->
+ <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:'Ventes 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>],
+ legend: {show:true, location: 'e', placement: 'outsideGrid' }
+ });
+
+ });
+ </script>
+
+ <h2>Ventes</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>Ventes</th>
+ <th>Devis</th>
+ <th>€/devis</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/salesReports/salesPerProjectReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2013-01-23 09:39:02 UTC (rev 302)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2013-01-23 09:39:46 UTC (rev 303)
@@ -91,7 +91,7 @@
<tbody>
<c:forEach var="project" items="${data}">
<tr>
- <td>${project.key.name}</td>
+ <td><a href="<c:url value="/sales/report/salesPerProject/${project.key.wikittyId}"/>">${project.key.name}</a></td>
<td>${project.value.sales}</td>
<td>${project.value.quotations}</td>
<td>${project.value.mean} €</td>
1
0
r302 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports
by jcouteau@users.chorem.org 23 Jan '13
by jcouteau@users.chorem.org 23 Jan '13
23 Jan '13
Author: jcouteau
Date: 2013-01-23 10:39:02 +0100 (Wed, 23 Jan 2013)
New Revision: 302
Url: http://chorem.org/projects/chorem/repository/revisions/302
Log:
refs #862 : Fix sales report graph
Modified:
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2013-01-22 10:49:22 UTC (rev 301)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2013-01-23 09:39:02 UTC (rev 302)
@@ -35,11 +35,16 @@
<script type="text/javascript">
$(document).ready(function(){
var sales = [
- <c:forEach var="entry" items="${data}" varStatus="counter">
- ['${entry.key}', ${entry.value}]
- <c:if test="${!counter.last}">, </c:if>
- </c:forEach>
- ];
+ <c:forEach var="entry" items="${data}" varStatus="counter">
+ [
+ <c:forEach var="entry2" items="${entry.value.plotValues}" varStatus="counter2">
+ ['${entry2.key}', ${entry2.value}]
+ <c:if test="${!counter2.last}">, </c:if>
+ </c:forEach>
+ ]
+ <c:if test="${!counter.last}">, </c:if>
+ </c:forEach>
+ ];
var plot1 = $.jqplot ('sales', sales, {
title:'Ventes par mois',
1
0
r301 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports
by jcouteau@users.chorem.org 22 Jan '13
by jcouteau@users.chorem.org 22 Jan '13
22 Jan '13
Author: jcouteau
Date: 2013-01-22 11:49:22 +0100 (Tue, 22 Jan 2013)
New Revision: 301
Url: http://chorem.org/projects/chorem/repository/revisions/301
Log:
Remove useless files
Removed:
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesEvolutionPerProject.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesPerProject.jsp
Deleted: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesEvolutionPerProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesEvolutionPerProject.jsp 2013-01-22 10:47:20 UTC (rev 300)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesEvolutionPerProject.jsp 2013-01-22 10:49:22 UTC (rev 301)
@@ -1,38 +0,0 @@
-<%--
- #%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">
- <!--Sidebar content-->
- </div>
-
- <div class="span10">
- <!--Body content-->
- </div>
-</div>
-
-<div style="clear:both;"/>
\ No newline at end of file
Deleted: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesPerProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesPerProject.jsp 2013-01-22 10:47:20 UTC (rev 300)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dashboardSalesReportSalesPerProject.jsp 2013-01-22 10:49:22 UTC (rev 301)
@@ -1,38 +0,0 @@
-<%--
- #%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">
- <!--Sidebar content-->
- </div>
-
- <div class="span10">
- <!--Body content-->
- </div>
-</div>
-
-<div style="clear:both;"/>
\ No newline at end of file
1
0
r300 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/sales webapp/WEB-INF/jsp/salesReports
by jcouteau@users.chorem.org 22 Jan '13
by jcouteau@users.chorem.org 22 Jan '13
22 Jan '13
Author: jcouteau
Date: 2013-01-22 11:47:20 +0100 (Tue, 22 Jan 2013)
New Revision: 300
Url: http://chorem.org/projects/chorem/repository/revisions/300
Log:
refs #862 :
- Finish sales per project report (list all project with sales between two years with amount and number of quotations)
Added:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2013-01-22 10:47:20 UTC (rev 300)
@@ -0,0 +1,38 @@
+package org.chorem.webmotion.actions.sales;
+
+/**
+ * @author jcouteau <couteau(a)codelutin.com>
+ */
+public class SalesData {
+
+ protected Integer sales;
+
+ protected Integer quotations;
+
+ public Integer getSales() {
+ return sales;
+ }
+
+ public void setSales(Integer sales) {
+ this.sales = sales;
+ }
+
+ public Integer getQuotations() {
+ return quotations;
+ }
+
+ public void setQuotations(Integer quotations) {
+ this.quotations = quotations;
+ }
+
+ public Integer getMean() {
+
+ Integer mean = 0;
+
+ if (null != sales && null != quotations && quotations != 0) {
+ mean = sales/quotations;
+ }
+
+ return mean;
+ }
+}
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2013-01-19 10:11:15 UTC (rev 299)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2013-01-22 10:47:20 UTC (rev 300)
@@ -37,25 +37,25 @@
to = String.valueOf(SalesReportHelper.getLastYear());
}
- Map<String, Integer> salesPerProjectData = getSalesPerProjectData(from, to, client);
+ Map<Project, SalesData> salesData = getSalesPerProjectData(from, to, client);
List<Integer> listAllYearsInChorem = SalesReportHelper.listAllYears(client);
return renderView("salesReports/salesPerProjectReport.jsp",
- "data", salesPerProjectData,
+ "data", salesData,
"allYears", listAllYearsInChorem,
"fromYear", from,
"toYear", to);
}
- protected Map<String,Integer> getSalesPerProjectData(String firstYear,
+ protected Map<Project,SalesData> getSalesPerProjectData(String firstYear,
String lastYear,
WikittyClient client){
Date last = SalesReportHelper.getLastDayOfYear(Integer.valueOf(lastYear));
Date first = SalesReportHelper.getFirstDayOfYear(Integer.valueOf(firstYear));
- Map<String,Integer> salesData = new LinkedHashMap<String, Integer>();
+ Map<Project,SalesData> salesData = new LinkedHashMap<Project, SalesData>();
//a query to get all the projects
WikittyQuery projectsQuery = new WikittyQueryMaker().and()
@@ -66,6 +66,8 @@
//a query per project :(
for (Project project:projects){
+ SalesData projectData = new SalesData();
+
WikittyQuery projectQuery = new WikittyQueryMaker()
.select("Quotation.amount", Aggregate.SUM).and()
.eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, project)
@@ -74,10 +76,21 @@
Integer sales = 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(Quotation.FQ_FIELD_QUOTATION_PROJECT, project)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, first, last)
+ .end();
+
+ List<Quotation> quotations = client.findAllByQuery(Quotation.class,
+ quotationsQuery).getAll();
+
+ //Rempli la map que si on a des valeurs
if (null != sales && sales != 0) {
- salesData.put( project.getName(), sales);
+ projectData.setSales(sales);
+ projectData.setQuotations(quotations.size());
+ salesData.put(project, projectData);
}
-
}
return salesData;
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2013-01-19 10:11:15 UTC (rev 299)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2013-01-22 10:47:20 UTC (rev 300)
@@ -36,18 +36,20 @@
$(document).ready(function(){
var sales = [
<c:forEach var="entry" items="${data}" varStatus="counter">
- ['${entry.key}', ${entry.value}]
+ ['${entry.key.name}', ${entry.value.sales}]
<c:if test="${!counter.last}">, </c:if>
</c:forEach>
];
- var plot1 = $.jqplot ('sales', sales, {
+ var plot1 = $.jqplot ('sales', [sales], {
title:'Ventes par projet',
seriesDefaults:{
- renderer:$.jqplot.PieRenderer
- },
- highlighter: {
- show: true
+ renderer:$.jqplot.PieRenderer,
+ rendererOptions: {
+ showDataLabels: true,
+ dataLabels: 'value',
+ sliceMargin: 3
+ }
},
cursor: {
show: false
@@ -76,7 +78,29 @@
<div id="sales" style="height:200px;"></div>
- </div>
+
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>Projet</th>
+ <th>Ventes</th>
+ <th>Devis</th>
+ <th>€/devis</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach var="project" items="${data}">
+ <tr>
+ <td>${project.key.name}</td>
+ <td>${project.value.sales}</td>
+ <td>${project.value.quotations}</td>
+ <td>${project.value.mean} €</td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+
+ </div>
</div>
<div style="clear:both;"/>
\ No newline at end of file
1
0
r299 - in trunk: . chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales chorem-webmotion/src/main/resources chorem-webmotion/src/main/webapp/WEB-INF chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports
by jcouteau@users.chorem.org 19 Jan '13
by jcouteau@users.chorem.org 19 Jan '13
19 Jan '13
Author: jcouteau
Date: 2013-01-19 11:11:15 +0100 (Sat, 19 Jan 2013)
New Revision: 299
Url: http://chorem.org/projects/chorem/repository/revisions/299
Log:
Fix build :
- Update webmotion version
- Clean dependencies
Added:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
Modified:
trunk/chorem-webmotion/pom.xml
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
trunk/pom.xml
Modified: trunk/chorem-webmotion/pom.xml
===================================================================
--- trunk/chorem-webmotion/pom.xml 2013-01-15 20:40:42 UTC (rev 298)
+++ trunk/chorem-webmotion/pom.xml 2013-01-19 10:11:15 UTC (rev 299)
@@ -171,11 +171,6 @@
</dependency>
<dependency>
- <groupId>org.nuiton.js</groupId>
- <artifactId>nuiton-js-jquery-tokeninput</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.debux.webmotion</groupId>
<artifactId>webmotion</artifactId>
</dependency>
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2013-01-19 10:11:15 UTC (rev 299)
@@ -0,0 +1,85 @@
+package org.chorem.webmotion.actions.sales;
+
+import org.chorem.ChoremClient;
+import org.chorem.entities.Accepted;
+import org.chorem.entities.Project;
+import org.chorem.entities.Quotation;
+import org.debux.webmotion.server.WebMotionController;
+import org.debux.webmotion.server.render.Render;
+import org.nuiton.wikitty.WikittyClient;
+import org.nuiton.wikitty.query.WikittyQuery;
+import org.nuiton.wikitty.query.WikittyQueryMaker;
+import org.nuiton.wikitty.query.conditions.Aggregate;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jcouteau <couteau(a)codelutin.com>
+ */
+public class SalesPerProjectReportAction extends WebMotionController {
+
+ /**
+ * Rend le graphe des devis envoyés par mois
+ *
+ * @param client
+ * @return
+ */
+ public Render sales(ChoremClient client, String from, String to) {
+
+ if (null == from) {
+ from = String.valueOf(SalesReportHelper.getFirstYear(client));
+ }
+
+ if (null == to) {
+ to = String.valueOf(SalesReportHelper.getLastYear());
+ }
+
+ Map<String, Integer> salesPerProjectData = getSalesPerProjectData(from, to, client);
+
+ List<Integer> listAllYearsInChorem = SalesReportHelper.listAllYears(client);
+
+ return renderView("salesReports/salesPerProjectReport.jsp",
+ "data", salesPerProjectData,
+ "allYears", listAllYearsInChorem,
+ "fromYear", from,
+ "toYear", to);
+ }
+
+ protected Map<String,Integer> getSalesPerProjectData(String firstYear,
+ String lastYear,
+ WikittyClient client){
+
+ Date last = SalesReportHelper.getLastDayOfYear(Integer.valueOf(lastYear));
+ Date first = SalesReportHelper.getFirstDayOfYear(Integer.valueOf(firstYear));
+
+ Map<String,Integer> salesData = new LinkedHashMap<String, Integer>();
+
+ //a query to get all the projects
+ WikittyQuery projectsQuery = new WikittyQueryMaker().and()
+ .exteq(Project.EXT_PROJECT).end();
+
+ List<Project> projects = client.findAllByQuery(Project.class, projectsQuery).getAll();
+
+ //a query per project :(
+ for (Project project:projects){
+
+ WikittyQuery projectQuery = new WikittyQueryMaker()
+ .select("Quotation.amount", Aggregate.SUM).and()
+ .eq(Quotation.FQ_FIELD_QUOTATION_PROJECT, project)
+ .bw(Accepted.FQ_FIELD_ACCEPTED_ACCEPTEDDATE, first, last)
+ .end();
+
+ Integer sales = client.findByQuery(Integer.class, projectQuery);
+
+ if (null != sales && sales != 0) {
+ salesData.put( project.getName(), sales);
+ }
+
+ }
+
+ return salesData;
+ }
+}
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2013-01-15 20:40:42 UTC (rev 298)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2013-01-19 10:11:15 UTC (rev 299)
@@ -87,7 +87,6 @@
protected Map<String,Integer> getSalesData(Integer year, WikittyClient client){
- Date last = SalesReportHelper.getLastDayOfYear(year);
Date first = SalesReportHelper.getFirstDayOfYear(year);
Map<String,Integer> salesData = new LinkedHashMap<String, Integer>();
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2013-01-15 20:40:42 UTC (rev 298)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2013-01-19 10:11:15 UTC (rev 299)
@@ -56,5 +56,6 @@
* /sales/report/sentQuotation action:sales.SentQuotationsReportAction.sentQuotationPerMonth
* /sales/report/acceptedQuotation action:sales.AcceptedQuotationsReportAction.acceptedQuotationPerMonth
* /sales/report/sales action:sales.SalesReportAction.sales
+* /sales/report/salesPerProject action:sales.SalesPerProjectReportAction.sales
* /sales/{method} action:sales.SalesAction.{method}
* /sales/{method}/{id} action:sales.SalesAction.{method}
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2013-01-19 10:11:15 UTC (rev 299)
@@ -0,0 +1,82 @@
+<%--
+ #%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="/salesMenu"/>
+ </div>
+
+ <div class="span10">
+ <!-- Javascript to display graph -->
+ <script type="text/javascript">
+ $(document).ready(function(){
+ var sales = [
+ <c:forEach var="entry" items="${data}" varStatus="counter">
+ ['${entry.key}', ${entry.value}]
+ <c:if test="${!counter.last}">, </c:if>
+ </c:forEach>
+ ];
+
+ var plot1 = $.jqplot ('sales', sales, {
+ title:'Ventes par projet',
+ seriesDefaults:{
+ renderer:$.jqplot.PieRenderer
+ },
+ highlighter: {
+ show: true
+ },
+ cursor: {
+ show: false
+ },
+ legend: {show:true, location: 'e'}
+ });
+
+ });
+ </script>
+
+ <h2>Ventes</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>
+
+ </div>
+</div>
+
+<div style="clear:both;"/>
\ No newline at end of file
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2013-01-15 20:40:42 UTC (rev 298)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2013-01-19 10:11:15 UTC (rev 299)
@@ -36,12 +36,7 @@
$(document).ready(function(){
var sales = [
<c:forEach var="entry" items="${data}" varStatus="counter">
- [
- <c:forEach var="entry2" items="${entry.value.plotValues}" varStatus="counter2">
- ['${entry2.key}', ${entry2.value}]
- <c:if test="${!counter2.last}">, </c:if>
- </c:forEach>
- ]
+ ['${entry.key}', ${entry.value}]
<c:if test="${!counter.last}">, </c:if>
</c:forEach>
];
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 20:40:42 UTC (rev 298)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-19 10:11:15 UTC (rev 299)
@@ -15,6 +15,7 @@
<group-ref>jqplot.cursor</group-ref>
<group-ref>jqplot.highlighter</group-ref>
<group-ref>jqplot.barRenderer</group-ref>
+ <group-ref>jqplot.pieRenderer</group-ref>
<js>/js/jquery-ui-timepicker-addon.js</js>
<js>/js/jquery-ui-timepicker-fr.js</js>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-01-15 20:40:42 UTC (rev 298)
+++ trunk/pom.xml 2013-01-19 10:11:15 UTC (rev 299)
@@ -104,7 +104,7 @@
<servletApiVersion>2.5</servletApiVersion>
<jspApiVersion>2.0</jspApiVersion>
<h2Version>1.2.134</h2Version>
- <webmotionVersion>2.2</webmotionVersion>
+ <webmotionVersion>2.3.3</webmotionVersion>
<jstlVersion>1.2</jstlVersion>
<nuitonJsVersion>0.1-SNAPSHOT</nuitonJsVersion>
@@ -127,6 +127,12 @@
</dependency>
<dependency>
+ <groupId>org.debux.webmotion</groupId>
+ <artifactId>webmotion-extra-sitemesh</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstlVersion}</version>
1
0
r298 - in trunk/chorem-webmotion/src/main/webapp: WEB-INF js
by bpoussin@users.chorem.org 15 Jan '13
by bpoussin@users.chorem.org 15 Jan '13
15 Jan '13
Author: bpoussin
Date: 2013-01-15 21:40:42 +0100 (Tue, 15 Jan 2013)
New Revision: 298
Url: http://chorem.org/projects/chorem/repository/revisions/298
Log:
utilisation de fichier de langue 'fr' de nuiton-js pour jquery-ui
Removed:
trunk/chorem-webmotion/src/main/webapp/js/jquery.ui.datepicker-fr.js
Modified:
trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 19:06:18 UTC (rev 297)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 20:40:42 UTC (rev 298)
@@ -5,6 +5,7 @@
<group-ref>bootstrap-responsive</group-ref>
<group-ref>jquery-ui</group-ref>
<group-ref>jquery-ui-cupertino</group-ref>
+ <group-ref>jquery-ui-fr</group-ref>
<group-ref>jqplot</group-ref>
<!-- plugin jqplot -->
<group-ref>jqplot.dateAxisRenderer</group-ref>
@@ -15,7 +16,6 @@
<group-ref>jqplot.highlighter</group-ref>
<group-ref>jqplot.barRenderer</group-ref>
- <js>/js/jquery.ui.datepicker-fr.js</js>
<js>/js/jquery-ui-timepicker-addon.js</js>
<js>/js/jquery-ui-timepicker-fr.js</js>
Deleted: trunk/chorem-webmotion/src/main/webapp/js/jquery.ui.datepicker-fr.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/jquery.ui.datepicker-fr.js 2013-01-15 19:06:18 UTC (rev 297)
+++ trunk/chorem-webmotion/src/main/webapp/js/jquery.ui.datepicker-fr.js 2013-01-15 20:40:42 UTC (rev 298)
@@ -1,25 +0,0 @@
-/*
- * %%Ignore-License
- */
-/* French initialisation for the jQuery UI date picker plugin. */
-/* Written by Keith Wood (kbwood(a)virginbroadband.com.au) and Stéphane Nahmani (sholby(a)sholby.net) */
-jQuery(function($){
- $.datepicker.regional['fr'] = {clearText: 'Effacer', clearStatus: '',
- closeText: 'Fermer', closeStatus: 'Fermer sans modifier',
- prevText: '<Préc', prevStatus: 'Voir le mois précédent',
- nextText: 'Suiv>', nextStatus: 'Voir le mois suivant',
- currentText: 'Courant', currentStatus: 'Voir le mois courant',
- monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
- 'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
- monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun',
- 'Jul','Aoû','Sep','Oct','Nov','Déc'],
- monthStatus: 'Voir un autre mois', yearStatus: 'Voir un autre année',
- weekHeader: 'Sm', weekStatus: '',
- dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
- dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
- dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
- dayStatus: 'Utiliser DD comme premier jour de la semaine', dateStatus: 'Choisir le DD, MM d',
- dateFormat: 'dd/mm/yy', firstDay: 0,
- initStatus: 'Choisir la date', isRTL: false};
- $.datepicker.setDefaults($.datepicker.regional['fr']);
-});
1
0
r297 - in trunk/chorem-webmotion/src/main/webapp: WEB-INF css js
by bpoussin@users.chorem.org 15 Jan '13
by bpoussin@users.chorem.org 15 Jan '13
15 Jan '13
Author: bpoussin
Date: 2013-01-15 20:06:18 +0100 (Tue, 15 Jan 2013)
New Revision: 297
Url: http://chorem.org/projects/chorem/repository/revisions/297
Log:
suppression de fichier devenu inutils
Removed:
trunk/chorem-webmotion/src/main/webapp/css/jquery.jqplot.css
trunk/chorem-webmotion/src/main/webapp/css/token-input-facebook.css
trunk/chorem-webmotion/src/main/webapp/css/token-input-mac.css
trunk/chorem-webmotion/src/main/webapp/css/token-input.css
trunk/chorem-webmotion/src/main/webapp/js/jquery.tokeninput.js
Modified:
trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 19:05:07 UTC (rev 296)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 19:06:18 UTC (rev 297)
@@ -19,7 +19,6 @@
<js>/js/jquery-ui-timepicker-addon.js</js>
<js>/js/jquery-ui-timepicker-fr.js</js>
-<!-- <js>/js/jquery.tokeninput.js</js> -->
<js>/js/less-1.2.1.min.js</js>
<js>/js/chorem.js</js>
</group>
Deleted: trunk/chorem-webmotion/src/main/webapp/css/jquery.jqplot.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/jquery.jqplot.css 2013-01-15 19:05:07 UTC (rev 296)
+++ trunk/chorem-webmotion/src/main/webapp/css/jquery.jqplot.css 2013-01-15 19:06:18 UTC (rev 297)
@@ -1,259 +0,0 @@
-/*rules for the plot target div. These will be cascaded down to all plot elements according to css rules*/
-.jqplot-target {
- position: relative;
- color: #666666;
- font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
- font-size: 1em;
-/* height: 300px;
- width: 400px;*/
-}
-
-/*rules applied to all axes*/
-.jqplot-axis {
- font-size: 0.75em;
-}
-
-.jqplot-xaxis {
- margin-top: 10px;
-}
-
-.jqplot-x2axis {
- margin-bottom: 10px;
-}
-
-.jqplot-yaxis {
- margin-right: 10px;
-}
-
-.jqplot-y2axis, .jqplot-y3axis, .jqplot-y4axis, .jqplot-y5axis, .jqplot-y6axis, .jqplot-y7axis, .jqplot-y8axis, .jqplot-y9axis, .jqplot-yMidAxis {
- margin-left: 10px;
- margin-right: 10px;
-}
-
-/*rules applied to all axis tick divs*/
-.jqplot-axis-tick, .jqplot-xaxis-tick, .jqplot-yaxis-tick, .jqplot-x2axis-tick, .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick, .jqplot-yMidAxis-tick {
- position: absolute;
- white-space: pre;
-}
-
-
-.jqplot-xaxis-tick {
- top: 0px;
- /* initial position untill tick is drawn in proper place */
- left: 15px;
-/* padding-top: 10px;*/
- vertical-align: top;
-}
-
-.jqplot-x2axis-tick {
- bottom: 0px;
- /* initial position untill tick is drawn in proper place */
- left: 15px;
-/* padding-bottom: 10px;*/
- vertical-align: bottom;
-}
-
-.jqplot-yaxis-tick {
- right: 0px;
- /* initial position untill tick is drawn in proper place */
- top: 15px;
-/* padding-right: 10px;*/
- text-align: right;
-}
-
-.jqplot-yaxis-tick.jqplot-breakTick {
- right: -20px;
- margin-right: 0px;
- padding:1px 5px 1px 5px;
-/* background-color: white;*/
- z-index: 2;
- font-size: 1.5em;
-}
-
-.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick {
- left: 0px;
- /* initial position untill tick is drawn in proper place */
- top: 15px;
-/* padding-left: 10px;*/
-/* padding-right: 15px;*/
- text-align: left;
-}
-
-.jqplot-yMidAxis-tick {
- text-align: center;
- white-space: nowrap;
-}
-
-.jqplot-xaxis-label {
- margin-top: 10px;
- font-size: 11pt;
- position: absolute;
-}
-
-.jqplot-x2axis-label {
- margin-bottom: 10px;
- font-size: 11pt;
- position: absolute;
-}
-
-.jqplot-yaxis-label {
- margin-right: 10px;
-/* text-align: center;*/
- font-size: 11pt;
- position: absolute;
-}
-
-.jqplot-yMidAxis-label {
- font-size: 11pt;
- position: absolute;
-}
-
-.jqplot-y2axis-label, .jqplot-y3axis-label, .jqplot-y4axis-label, .jqplot-y5axis-label, .jqplot-y6axis-label, .jqplot-y7axis-label, .jqplot-y8axis-label, .jqplot-y9axis-label {
-/* text-align: center;*/
- font-size: 11pt;
- margin-left: 10px;
- position: absolute;
-}
-
-.jqplot-meterGauge-tick {
- font-size: 0.75em;
- color: #999999;
-}
-
-.jqplot-meterGauge-label {
- font-size: 1em;
- color: #999999;
-}
-
-table.jqplot-table-legend {
- margin-top: 12px;
- margin-bottom: 12px;
- margin-left: 12px;
- margin-right: 12px;
-}
-
-table.jqplot-table-legend, table.jqplot-cursor-legend {
- background-color: rgba(255,255,255,0.6);
- border: 1px solid #cccccc;
- position: absolute;
- font-size: 0.75em;
-}
-
-td.jqplot-table-legend {
- vertical-align:middle;
-}
-
-/*
-These rules could be used instead of assigning
-element styles and relying on js object properties.
-*/
-
-/*
-td.jqplot-table-legend-swatch {
- padding-top: 0.5em;
- text-align: center;
-}
-
-tr.jqplot-table-legend:first td.jqplot-table-legend-swatch {
- padding-top: 0px;
-}
-*/
-
-td.jqplot-seriesToggle:hover, td.jqplot-seriesToggle:active {
- cursor: pointer;
-}
-
-.jqplot-table-legend .jqplot-series-hidden {
- text-decoration: line-through;
-}
-
-div.jqplot-table-legend-swatch-outline {
- border: 1px solid #cccccc;
- padding:1px;
-}
-
-div.jqplot-table-legend-swatch {
- width:0px;
- height:0px;
- border-top-width: 5px;
- border-bottom-width: 5px;
- border-left-width: 6px;
- border-right-width: 6px;
- border-top-style: solid;
- border-bottom-style: solid;
- border-left-style: solid;
- border-right-style: solid;
-}
-
-.jqplot-title {
- top: 0px;
- left: 0px;
- padding-bottom: 0.5em;
- font-size: 1.2em;
-}
-
-table.jqplot-cursor-tooltip {
- border: 1px solid #cccccc;
- font-size: 0.75em;
-}
-
-
-.jqplot-cursor-tooltip {
- border: 1px solid #cccccc;
- font-size: 0.75em;
- white-space: nowrap;
- background: rgba(208,208,208,0.5);
- padding: 1px;
-}
-
-.jqplot-highlighter-tooltip, .jqplot-canvasOverlay-tooltip {
- border: 1px solid #cccccc;
- font-size: 0.75em;
- white-space: nowrap;
- background: rgba(208,208,208,0.5);
- padding: 1px;
-}
-
-.jqplot-point-label {
- font-size: 0.75em;
- z-index: 2;
-}
-
-td.jqplot-cursor-legend-swatch {
- vertical-align: middle;
- text-align: center;
-}
-
-div.jqplot-cursor-legend-swatch {
- width: 1.2em;
- height: 0.7em;
-}
-
-.jqplot-error {
-/* Styles added to the plot target container when there is an error go here.*/
- text-align: center;
-}
-
-.jqplot-error-message {
-/* Styling of the custom error message div goes here.*/
- position: relative;
- top: 46%;
- display: inline-block;
-}
-
-div.jqplot-bubble-label {
- font-size: 0.8em;
-/* background: rgba(90%, 90%, 90%, 0.15);*/
- padding-left: 2px;
- padding-right: 2px;
- color: rgb(20%, 20%, 20%);
-}
-
-div.jqplot-bubble-label.jqplot-bubble-label-highlight {
- background: rgba(90%, 90%, 90%, 0.7);
-}
-
-div.jqplot-noData-container {
- text-align: center;
- background-color: rgba(96%, 96%, 96%, 0.3);
-}
Deleted: trunk/chorem-webmotion/src/main/webapp/css/token-input-facebook.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/token-input-facebook.css 2013-01-15 19:05:07 UTC (rev 296)
+++ trunk/chorem-webmotion/src/main/webapp/css/token-input-facebook.css 2013-01-15 19:06:18 UTC (rev 297)
@@ -1,144 +0,0 @@
-/*
- * #%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%
- */
-/* Example tokeninput style #2: Facebook style */
-ul.token-input-list-facebook {
- overflow: hidden;
- height: auto !important;
- height: 1%;
- width: 400px;
- border: 1px solid #8496ba;
- cursor: text;
- font-size: 12px;
- font-family: Verdana;
- min-height: 1px;
- z-index: 999;
- margin: 0;
- padding: 0;
- background-color: #fff;
- list-style-type: none;
- clear: left;
-}
-
-ul.token-input-list-facebook li input {
- border: 0;
- width: 100px;
- padding: 3px 8px;
- background-color: white;
- margin: 2px 0;
- -webkit-appearance: caret;
-}
-
-li.token-input-token-facebook {
- overflow: hidden;
- height: auto !important;
- height: 15px;
- margin: 3px;
- padding: 1px 3px;
- background-color: #eff2f7;
- color: #000;
- cursor: default;
- border: 1px solid #ccd5e4;
- font-size: 11px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- float: left;
- white-space: nowrap;
-}
-
-li.token-input-token-facebook p {
- display: inline;
- padding: 0;
- margin: 0;
-}
-
-li.token-input-token-facebook span {
- color: #a6b3cf;
- margin-left: 5px;
- font-weight: bold;
- cursor: pointer;
-}
-
-li.token-input-selected-token-facebook {
- background-color: #5670a6;
- border: 1px solid #3b5998;
- color: #fff;
-}
-
-li.token-input-input-token-facebook {
- float: left;
- margin: 0;
- padding: 0;
- list-style-type: none;
-}
-
-div.token-input-dropdown-facebook {
- position: absolute;
- width: 400px;
- background-color: #fff;
- overflow: hidden;
- border-left: 1px solid #ccc;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- cursor: default;
- font-size: 11px;
- font-family: Verdana;
- z-index: 1;
-}
-
-div.token-input-dropdown-facebook p {
- margin: 0;
- padding: 5px;
- font-weight: bold;
- color: #777;
-}
-
-div.token-input-dropdown-facebook ul {
- margin: 0;
- padding: 0;
-}
-
-div.token-input-dropdown-facebook ul li {
- background-color: #fff;
- padding: 3px;
- margin: 0;
- list-style-type: none;
-}
-
-div.token-input-dropdown-facebook ul li.token-input-dropdown-item-facebook {
- background-color: #fff;
-}
-
-div.token-input-dropdown-facebook ul li.token-input-dropdown-item2-facebook {
- background-color: #fff;
-}
-
-div.token-input-dropdown-facebook ul li em {
- font-weight: bold;
- font-style: normal;
-}
-
-div.token-input-dropdown-facebook ul li.token-input-selected-dropdown-item-facebook {
- background-color: #3b5998;
- color: #fff;
-}
\ No newline at end of file
Deleted: trunk/chorem-webmotion/src/main/webapp/css/token-input-mac.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/token-input-mac.css 2013-01-15 19:05:07 UTC (rev 296)
+++ trunk/chorem-webmotion/src/main/webapp/css/token-input-mac.css 2013-01-15 19:06:18 UTC (rev 297)
@@ -1,226 +0,0 @@
-/*
- * #%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%
- */
-/* Example tokeninput style #2: Mac Style */
-fieldset.token-input-mac {
- position: relative;
- padding: 0;
- margin: 5px 0;
- background: #fff;
- width: 400px;
- border: 1px solid #A4BDEC;
- border-radius: 10px;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
-}
-
-fieldset.token-input-mac.token-input-dropdown-mac {
- border-radius: 10px 10px 0 0;
- -moz-border-radius: 10px 10px 0 0;
- -webkit-border-radius: 10px 10px 0 0;
- box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
- -moz-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
- -webkit-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
-}
-
-ul.token-input-list-mac {
- overflow: hidden;
- height: auto !important;
- height: 1%;
- cursor: text;
- font-size: 12px;
- font-family: Verdana;
- min-height: 1px;
- z-index: 999;
- margin: 0;
- padding: 3px;
- background: transparent;
-}
-
-ul.token-input-list-mac.error {
- border: 1px solid #C52020;
-}
-
-ul.token-input-list-mac li {
- list-style-type: none;
-}
-
-li.token-input-token-mac p {
- display: inline;
- padding: 0;
- margin: 0;
-}
-
-li.token-input-token-mac span {
- color: #a6b3cf;
- margin-left: 5px;
- font-weight: bold;
- cursor: pointer;
-}
-
-/* TOKENS */
-
-li.token-input-token-mac {
- font-family: "Lucida Grande", Arial, serif;
- font-size: 9pt;
- line-height: 12pt;
- overflow: hidden;
- height: 16px;
- margin: 3px;
- padding: 0 10px;
- background: none;
- background-color: #dee7f8;
- color: #000;
- cursor: default;
- border: 1px solid #a4bdec;
- border-radius: 15px;
- -moz-border-radius: 15px;
- -webkit-border-radius: 15px;
- float: left;
-}
-
-li.token-input-highlighted-token-mac {
- background-color: #bbcef1;
- border: 1px solid #598bec;
- color: #000;
-}
-
-li.token-input-selected-token-mac {
- background-color: #598bec;
- border: 1px solid transparent;
- color: #fff;
-}
-
-li.token-input-highlighted-token-mac span.token-input-delete-token-mac {
- color: #000;
-}
-
-li.token-input-selected-token-mac span.token-input-delete-token-mac {
- color: #fff;
-}
-
-li.token-input-input-token-mac {
- border: none;
- background: transparent;
- float: left;
- padding: 0;
- margin: 0;
-}
-
-li.token-input-input-token-mac input {
- border: 0;
- width: 100px;
- padding: 3px;
- background-color: transparent;
- margin: 0;
-}
-
-div.token-input-dropdown-mac {
- position: absolute;
- border: 1px solid #A4BDEC;
- border-top: none;
- left: -1px;
- right: -1px;
- background-color: #fff;
- overflow: hidden;
- cursor: default;
- font-size: 10pt;
- font-family: "Lucida Grande", Arial, serif;
- padding: 5px;
- border-radius: 0 0 10px 10px;
- -moz-border-radius: 0 0 10px 10px;
- -webkit-border-radius: 0 0 10px 10px;
- box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
- -moz-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
- -webkit-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
- clip:rect(0px, 1000px, 1000px, -10px);
-}
-
-div.token-input-dropdown-mac p {
- font-size: 8pt;
- margin: 0;
- padding: 0 5px;
- font-style: italic;
- color: #aaa;
-}
-
-div.token-input-dropdown-mac h3.token-input-dropdown-category-mac {
- font-family: "Lucida Grande", Arial, serif;
- font-size: 10pt;
- font-weight: bold;
- border: none;
- padding: 0 5px;
- margin: 0;
-}
-
-div.token-input-dropdown-mac ul {
- margin: 0;
- padding: 0;
-}
-
-div.token-input-dropdown-mac ul li {
- list-style-type: none;
- cursor: pointer;
- background: none;
- background-color: #fff;
- margin: 0;
- padding: 0 0 0 25px;
-}
-
-div.token-input-dropdown-mac ul li.token-input-dropdown-item-mac {
- background-color: #fff;
-}
-
-div.token-input-dropdown-mac ul li.token-input-dropdown-item-mac.odd {
- background-color: #ECF4F9;
- border-radius: 15px;
- -moz-border-radius: 15px;
- -webkit-border-radius: 15px;
-}
-
-div.token-input-dropdown-mac ul li.token-input-dropdown-item-mac span.token-input-dropdown-item-description-mac {
- float: right;
- font-size: 8pt;
- font-style: italic;
- padding: 0 10px 0 0;
- color: #999;
-}
-
-div.token-input-dropdown-mac ul li strong {
- font-weight: bold;
- text-decoration: underline;
- font-style: none;
-}
-
-div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac,
-div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac.odd {
- background-color: #598bec;
- color: #fff;
- border-radius: 15px;
- -moz-border-radius: 15px;
- -webkit-border-radius: 15px;
-}
-
-div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac span.token-input-dropdown-item-description-mac,
-div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac.odd span.token-input-dropdown-item-description-mac {
- color: #fff;
-}
Deleted: trunk/chorem-webmotion/src/main/webapp/css/token-input.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/token-input.css 2013-01-15 19:05:07 UTC (rev 296)
+++ trunk/chorem-webmotion/src/main/webapp/css/token-input.css 2013-01-15 19:06:18 UTC (rev 297)
@@ -1,135 +0,0 @@
-/*
- * #%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%
- */
-/* Example tokeninput style #1: Token vertical list*/
-ul.token-input-list {
- overflow: hidden;
- height: auto !important;
- height: 1%;
- width: 400px;
- border: 1px solid #999;
- cursor: text;
- font-size: 12px;
- font-family: Verdana;
- z-index: 999;
- margin: 0;
- padding: 0;
- background-color: #fff;
- list-style-type: none;
- clear: left;
-}
-
-ul.token-input-list li {
- list-style-type: none;
-}
-
-ul.token-input-list li input {
- border: 0;
- width: 350px;
- padding: 3px 8px;
- background-color: white;
- -webkit-appearance: caret;
-}
-
-li.token-input-token {
- overflow: hidden;
- height: auto !important;
- height: 1%;
- margin: 3px;
- padding: 3px 5px;
- background-color: #d0efa0;
- color: #000;
- font-weight: bold;
- cursor: default;
- display: block;
-}
-
-li.token-input-token p {
- float: left;
- padding: 0;
- margin: 0;
-}
-
-li.token-input-token span {
- float: right;
- color: #777;
- cursor: pointer;
-}
-
-li.token-input-selected-token {
- background-color: #08844e;
- color: #fff;
-}
-
-li.token-input-selected-token span {
- color: #bbb;
-}
-
-div.token-input-dropdown {
- position: absolute;
- width: 400px;
- background-color: #fff;
- overflow: hidden;
- border-left: 1px solid #ccc;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- cursor: default;
- font-size: 12px;
- font-family: Verdana;
- z-index: 1;
-}
-
-div.token-input-dropdown p {
- margin: 0;
- padding: 5px;
- font-weight: bold;
- color: #777;
-}
-
-div.token-input-dropdown ul {
- margin: 0;
- padding: 0;
-}
-
-div.token-input-dropdown ul li {
- background-color: #fff;
- padding: 3px;
- list-style-type: none;
-}
-
-div.token-input-dropdown ul li.token-input-dropdown-item {
- background-color: #fafafa;
-}
-
-div.token-input-dropdown ul li.token-input-dropdown-item2 {
- background-color: #fff;
-}
-
-div.token-input-dropdown ul li em {
- font-weight: bold;
- font-style: normal;
-}
-
-div.token-input-dropdown ul li.token-input-selected-dropdown-item {
- background-color: #d0efa0;
-}
-
Deleted: trunk/chorem-webmotion/src/main/webapp/js/jquery.tokeninput.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/jquery.tokeninput.js 2013-01-15 19:05:07 UTC (rev 296)
+++ trunk/chorem-webmotion/src/main/webapp/js/jquery.tokeninput.js 2013-01-15 19:06:18 UTC (rev 297)
@@ -1,862 +0,0 @@
-/*
- * %%Ignore-License
- *
- * jQuery Plugin: Tokenizing Autocomplete Text Entry
- * Version 1.6.0
- *
- * Copyright (c) 2009 James Smith (http://loopj.com)
- * Licensed jointly under the GPL and MIT licenses,
- * choose which one suits your project best!
- *
- */
-
-(function ($) {
-// Default settings
-var DEFAULT_SETTINGS = {
- // Search settings
- method: "GET",
- contentType: "json",
- queryParam: "q",
- searchDelay: 300,
- minChars: 1,
- propertyToSearch: "name",
- jsonContainer: null,
-
- // Display settings
- hintText: "Type in a search term",
- noResultsText: "No results",
- searchingText: "Searching...",
- deleteText: "×",
- animateDropdown: true,
-
- // Tokenization settings
- tokenLimit: null,
- tokenDelimiter: ",",
- preventDuplicates: false,
-
- // Output settings
- tokenValue: "id",
-
- // Prepopulation settings
- prePopulate: null,
- processPrePopulate: false,
-
- // Manipulation settings
- idPrefix: "token-input-",
-
- // Formatters
- resultsFormatter: function(item){ return "<li>" + item[this.propertyToSearch]+ "</li>" },
- tokenFormatter: function(item) { return "<li><p>" + item[this.propertyToSearch] + "</p></li>" },
-
- // Callbacks
- onResult: null,
- onAdd: null,
- onDelete: null,
- onReady: null
-};
-
-// Default classes to use when theming
-var DEFAULT_CLASSES = {
- tokenList: "token-input-list",
- token: "token-input-token",
- tokenDelete: "token-input-delete-token",
- selectedToken: "token-input-selected-token",
- highlightedToken: "token-input-highlighted-token",
- dropdown: "token-input-dropdown",
- dropdownItem: "token-input-dropdown-item",
- dropdownItem2: "token-input-dropdown-item2",
- selectedDropdownItem: "token-input-selected-dropdown-item",
- inputToken: "token-input-input-token"
-};
-
-// Input box position "enum"
-var POSITION = {
- BEFORE: 0,
- AFTER: 1,
- END: 2
-};
-
-// Keys "enum"
-var KEY = {
- BACKSPACE: 8,
- TAB: 9,
- ENTER: 13,
- ESCAPE: 27,
- SPACE: 32,
- PAGE_UP: 33,
- PAGE_DOWN: 34,
- END: 35,
- HOME: 36,
- LEFT: 37,
- UP: 38,
- RIGHT: 39,
- DOWN: 40,
- NUMPAD_ENTER: 108,
- COMMA: 188
-};
-
-// Additional public (exposed) methods
-var methods = {
- init: function(url_or_data_or_function, options) {
- var settings = $.extend({}, DEFAULT_SETTINGS, options || {});
-
- return this.each(function () {
- $(this).data("tokenInputObject", new $.TokenList(this, url_or_data_or_function, settings));
- });
- },
- clear: function() {
- this.data("tokenInputObject").clear();
- return this;
- },
- add: function(item) {
- this.data("tokenInputObject").add(item);
- return this;
- },
- remove: function(item) {
- this.data("tokenInputObject").remove(item);
- return this;
- },
- get: function() {
- return this.data("tokenInputObject").getTokens();
- }
-}
-
-// Expose the .tokenInput function to jQuery as a plugin
-$.fn.tokenInput = function (method) {
- // Method calling and initialization logic
- if(methods[method]) {
- return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
- } else {
- return methods.init.apply(this, arguments);
- }
-};
-
-// TokenList class for each input
-$.TokenList = function (input, url_or_data, settings) {
- //
- // Initialization
- //
-
- // Configure the data source
- if($.type(url_or_data) === "string" || $.type(url_or_data) === "function") {
- // Set the url to query against
- settings.url = url_or_data;
-
- // If the URL is a function, evaluate it here to do our initalization work
- var url = computeURL();
-
- // Make a smart guess about cross-domain if it wasn't explicitly specified
- if(settings.crossDomain === undefined) {
- if(url.indexOf("://") === -1) {
- settings.crossDomain = false;
- } else {
- settings.crossDomain = (location.href.split(/\/+/g)[1] !== url.split(/\/+/g)[1]);
- }
- }
- } else if(typeof(url_or_data) === "object") {
- // Set the local data to search through
- settings.local_data = url_or_data;
- }
-
- // Build class names
- if(settings.classes) {
- // Use custom class names
- settings.classes = $.extend({}, DEFAULT_CLASSES, settings.classes);
- } else if(settings.theme) {
- // Use theme-suffixed default class names
- settings.classes = {};
- $.each(DEFAULT_CLASSES, function(key, value) {
- settings.classes[key] = value + "-" + settings.theme;
- });
- } else {
- settings.classes = DEFAULT_CLASSES;
- }
-
-
- // Save the tokens
- var saved_tokens = [];
-
- // Keep track of the number of tokens in the list
- var token_count = 0;
-
- // Basic cache to save on db hits
- var cache = new $.TokenList.Cache();
-
- // Keep track of the timeout, old vals
- var timeout;
- var input_val;
-
- // Create a new text input an attach keyup events
- var input_box = $("<input type=\"text\" autocomplete=\"off\">")
- .css({
- outline: "none"
- })
- .attr("id", settings.idPrefix + input.id)
- .focus(function () {
- if (settings.tokenLimit === null || settings.tokenLimit !== token_count) {
- show_dropdown_hint();
- }
- })
- .blur(function () {
- hide_dropdown();
- $(this).val("");
- })
- .bind("keyup keydown blur update", resize_input)
- .keydown(function (event) {
- var previous_token;
- var next_token;
-
- switch(event.keyCode) {
- case KEY.LEFT:
- case KEY.RIGHT:
- case KEY.UP:
- case KEY.DOWN:
- if(!$(this).val()) {
- previous_token = input_token.prev();
- next_token = input_token.next();
-
- if((previous_token.length && previous_token.get(0) === selected_token) || (next_token.length && next_token.get(0) === selected_token)) {
- // Check if there is a previous/next token and it is selected
- if(event.keyCode === KEY.LEFT || event.keyCode === KEY.UP) {
- deselect_token($(selected_token), POSITION.BEFORE);
- } else {
- deselect_token($(selected_token), POSITION.AFTER);
- }
- } else if((event.keyCode === KEY.LEFT || event.keyCode === KEY.UP) && previous_token.length) {
- // We are moving left, select the previous token if it exists
- select_token($(previous_token.get(0)));
- } else if((event.keyCode === KEY.RIGHT || event.keyCode === KEY.DOWN) && next_token.length) {
- // We are moving right, select the next token if it exists
- select_token($(next_token.get(0)));
- }
- } else {
- var dropdown_item = null;
-
- if(event.keyCode === KEY.DOWN || event.keyCode === KEY.RIGHT) {
- dropdown_item = $(selected_dropdown_item).next();
- } else {
- dropdown_item = $(selected_dropdown_item).prev();
- }
-
- if(dropdown_item.length) {
- select_dropdown_item(dropdown_item);
- }
- return false;
- }
- break;
-
- case KEY.BACKSPACE:
- previous_token = input_token.prev();
-
- if(!$(this).val().length) {
- if(selected_token) {
- delete_token($(selected_token));
- hidden_input.change();
- } else if(previous_token.length) {
- select_token($(previous_token.get(0)));
- }
-
- return false;
- } else if($(this).val().length === 1) {
- hide_dropdown();
- } else {
- // set a timeout just long enough to let this function finish.
- setTimeout(function(){do_search();}, 5);
- }
- break;
-
- case KEY.TAB:
- case KEY.ENTER:
- case KEY.NUMPAD_ENTER:
- case KEY.COMMA:
- if(selected_dropdown_item) {
- add_token($(selected_dropdown_item).data("tokeninput"));
- hidden_input.change();
- return false;
- }
- break;
-
- case KEY.ESCAPE:
- hide_dropdown();
- return true;
-
- default:
- if(String.fromCharCode(event.which)) {
- // set a timeout just long enough to let this function finish.
- setTimeout(function(){do_search();}, 5);
- }
- break;
- }
- });
-
- // Keep a reference to the original input box
- var hidden_input = $(input)
- .hide()
- .val("")
- .focus(function () {
- input_box.focus();
- })
- .blur(function () {
- input_box.blur();
- });
-
- // Keep a reference to the selected token and dropdown item
- var selected_token = null;
- var selected_token_index = 0;
- var selected_dropdown_item = null;
-
- // The list to store the token items in
- var token_list = $("<ul />")
- .addClass(settings.classes.tokenList)
- .click(function (event) {
- var li = $(event.target).closest("li");
- if(li && li.get(0) && $.data(li.get(0), "tokeninput")) {
- toggle_select_token(li);
- } else {
- // Deselect selected token
- if(selected_token) {
- deselect_token($(selected_token), POSITION.END);
- }
-
- // Focus input box
- input_box.focus();
- }
- })
- .mouseover(function (event) {
- var li = $(event.target).closest("li");
- if(li && selected_token !== this) {
- li.addClass(settings.classes.highlightedToken);
- }
- })
- .mouseout(function (event) {
- var li = $(event.target).closest("li");
- if(li && selected_token !== this) {
- li.removeClass(settings.classes.highlightedToken);
- }
- })
- .insertBefore(hidden_input);
-
- // The token holding the input box
- var input_token = $("<li />")
- .addClass(settings.classes.inputToken)
- .appendTo(token_list)
- .append(input_box);
-
- // The list to store the dropdown items in
- var dropdown = $("<div>")
- .addClass(settings.classes.dropdown)
- .appendTo("body")
- .hide();
-
- // Magic element to help us resize the text input
- var input_resizer = $("<tester/>")
- .insertAfter(input_box)
- .css({
- position: "absolute",
- top: -9999,
- left: -9999,
- width: "auto",
- fontSize: input_box.css("fontSize"),
- fontFamily: input_box.css("fontFamily"),
- fontWeight: input_box.css("fontWeight"),
- letterSpacing: input_box.css("letterSpacing"),
- whiteSpace: "nowrap"
- });
-
- // Pre-populate list if items exist
- hidden_input.val("");
- var li_data = settings.prePopulate || hidden_input.data("pre");
- if(settings.processPrePopulate && $.isFunction(settings.onResult)) {
- li_data = settings.onResult.call(hidden_input, li_data);
- }
- if(li_data && li_data.length) {
- $.each(li_data, function (index, value) {
- insert_token(value);
- checkTokenLimit();
- });
- }
-
- // Initialization is done
- if($.isFunction(settings.onReady)) {
- settings.onReady.call();
- }
-
- //
- // Public functions
- //
-
- this.clear = function() {
- token_list.children("li").each(function() {
- if ($(this).children("input").length === 0) {
- delete_token($(this));
- }
- });
- }
-
- this.add = function(item) {
- add_token(item);
- }
-
- this.remove = function(item) {
- token_list.children("li").each(function() {
- if ($(this).children("input").length === 0) {
- var currToken = $(this).data("tokeninput");
- var match = true;
- for (var prop in item) {
- if (item[prop] !== currToken[prop]) {
- match = false;
- break;
- }
- }
- if (match) {
- delete_token($(this));
- }
- }
- });
- }
-
- this.getTokens = function() {
- return saved_tokens;
- }
-
- //
- // Private functions
- //
-
- function checkTokenLimit() {
- if(settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
- input_box.hide();
- hide_dropdown();
- return;
- }
- }
-
- function resize_input() {
- if(input_val === (input_val = input_box.val())) {return;}
-
- // Enter new content into resizer and resize input accordingly
- var escaped = input_val.replace(/&/g, '&').replace(/\s/g,' ').replace(/</g, '<').replace(/>/g, '>');
- input_resizer.html(escaped);
- input_box.width(input_resizer.width() + 30);
- }
-
- function is_printable_character(keycode) {
- return ((keycode >= 48 && keycode <= 90) || // 0-1a-z
- (keycode >= 96 && keycode <= 111) || // numpad 0-9 + - / * .
- (keycode >= 186 && keycode <= 192) || // ; = , - . / ^
- (keycode >= 219 && keycode <= 222)); // ( \ ) '
- }
-
- // Inner function to a token to the list
- function insert_token(item) {
- var this_token = settings.tokenFormatter(item);
- this_token = $(this_token)
- .addClass(settings.classes.token)
- .insertBefore(input_token);
-
- // The 'delete token' button
- $("<span>" + settings.deleteText + "</span>")
- .addClass(settings.classes.tokenDelete)
- .appendTo(this_token)
- .click(function () {
- delete_token($(this).parent());
- hidden_input.change();
- return false;
- });
-
- // Store data on the token
- var token_data = {"id": item.id};
- token_data[settings.propertyToSearch] = item[settings.propertyToSearch];
- $.data(this_token.get(0), "tokeninput", item);
-
- // Save this token for duplicate checking
- saved_tokens = saved_tokens.slice(0,selected_token_index).concat([token_data]).concat(saved_tokens.slice(selected_token_index));
- selected_token_index++;
-
- // Update the hidden input
- update_hidden_input(saved_tokens, hidden_input);
-
- token_count += 1;
-
- // Check the token limit
- if(settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
- input_box.hide();
- hide_dropdown();
- }
-
- return this_token;
- }
-
- // Add a token to the token list based on user input
- function add_token (item) {
- var callback = settings.onAdd;
-
- // See if the token already exists and select it if we don't want duplicates
- if(token_count > 0 && settings.preventDuplicates) {
- var found_existing_token = null;
- token_list.children().each(function () {
- var existing_token = $(this);
- var existing_data = $.data(existing_token.get(0), "tokeninput");
- if(existing_data && existing_data.id === item.id) {
- found_existing_token = existing_token;
- return false;
- }
- });
-
- if(found_existing_token) {
- select_token(found_existing_token);
- input_token.insertAfter(found_existing_token);
- input_box.focus();
- return;
- }
- }
-
- // Insert the new tokens
- if(settings.tokenLimit == null || token_count < settings.tokenLimit) {
- insert_token(item);
- checkTokenLimit();
- }
-
- // Clear input box
- input_box.val("");
-
- // Don't show the help dropdown, they've got the idea
- hide_dropdown();
-
- // Execute the onAdd callback if defined
- if($.isFunction(callback)) {
- callback.call(hidden_input,item);
- }
- }
-
- // Select a token in the token list
- function select_token (token) {
- token.addClass(settings.classes.selectedToken);
- selected_token = token.get(0);
-
- // Hide input box
- input_box.val("");
-
- // Hide dropdown if it is visible (eg if we clicked to select token)
- hide_dropdown();
- }
-
- // Deselect a token in the token list
- function deselect_token (token, position) {
- token.removeClass(settings.classes.selectedToken);
- selected_token = null;
-
- if(position === POSITION.BEFORE) {
- input_token.insertBefore(token);
- selected_token_index--;
- } else if(position === POSITION.AFTER) {
- input_token.insertAfter(token);
- selected_token_index++;
- } else {
- input_token.appendTo(token_list);
- selected_token_index = token_count;
- }
-
- // Show the input box and give it focus again
- input_box.focus();
- }
-
- // Toggle selection of a token in the token list
- function toggle_select_token(token) {
- var previous_selected_token = selected_token;
-
- if(selected_token) {
- deselect_token($(selected_token), POSITION.END);
- }
-
- if(previous_selected_token === token.get(0)) {
- deselect_token(token, POSITION.END);
- } else {
- select_token(token);
- }
- }
-
- // Delete a token from the token list
- function delete_token (token) {
- // Remove the id from the saved list
- var token_data = $.data(token.get(0), "tokeninput");
- var callback = settings.onDelete;
-
- var index = token.prevAll().length;
- if(index > selected_token_index) index--;
-
- // Delete the token
- token.remove();
- selected_token = null;
-
- // Show the input box and give it focus again
- input_box.focus();
-
- // Remove this token from the saved list
- saved_tokens = saved_tokens.slice(0,index).concat(saved_tokens.slice(index+1));
- if(index < selected_token_index) selected_token_index--;
-
- // Update the hidden input
- update_hidden_input(saved_tokens, hidden_input);
-
- token_count -= 1;
-
- if(settings.tokenLimit !== null) {
- input_box
- .show()
- .val("")
- .focus();
- }
-
- // Execute the onDelete callback if defined
- if($.isFunction(callback)) {
- callback.call(hidden_input,token_data);
- }
- }
-
- // Update the hidden input box value
- function update_hidden_input(saved_tokens, hidden_input) {
- var token_values = $.map(saved_tokens, function (el) {
- return el[settings.tokenValue];
- });
- hidden_input.val(token_values.join(settings.tokenDelimiter));
-
- }
-
- // Hide and clear the results dropdown
- function hide_dropdown () {
- dropdown.hide().empty();
- selected_dropdown_item = null;
- }
-
- function show_dropdown() {
- dropdown
- .css({
- position: "absolute",
- top: $(token_list).offset().top + $(token_list).outerHeight(),
- left: $(token_list).offset().left,
- zindex: 999
- })
- .show();
- }
-
- function show_dropdown_searching () {
- if(settings.searchingText) {
- dropdown.html("<p>"+settings.searchingText+"</p>");
- show_dropdown();
- }
- }
-
- function show_dropdown_hint () {
- if(settings.hintText) {
- dropdown.html("<p>"+settings.hintText+"</p>");
- show_dropdown();
- }
- }
-
- // Highlight the query part of the search term
- function highlight_term(value, term) {
- return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>");
- }
-
- function find_value_and_highlight_term(template, value, term) {
- return template.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + value + ")(?![^<>]*>)(?![^&;]+;)", "g"), highlight_term(value, term));
- }
-
- // Populate the results dropdown with some results
- function populate_dropdown (query, results) {
- if(results && results.length) {
- dropdown.empty();
- var dropdown_ul = $("<ul>")
- .appendTo(dropdown)
- .mouseover(function (event) {
- select_dropdown_item($(event.target).closest("li"));
- })
- .mousedown(function (event) {
- add_token($(event.target).closest("li").data("tokeninput"));
- hidden_input.change();
- return false;
- })
- .hide();
-
- $.each(results, function(index, value) {
- var this_li = settings.resultsFormatter(value);
-
- this_li = find_value_and_highlight_term(this_li ,value[settings.propertyToSearch], query);
-
- this_li = $(this_li).appendTo(dropdown_ul);
-
- if(index % 2) {
- this_li.addClass(settings.classes.dropdownItem);
- } else {
- this_li.addClass(settings.classes.dropdownItem2);
- }
-
- if(index === 0) {
- select_dropdown_item(this_li);
- }
-
- $.data(this_li.get(0), "tokeninput", value);
- });
-
- show_dropdown();
-
- if(settings.animateDropdown) {
- dropdown_ul.slideDown("fast");
- } else {
- dropdown_ul.show();
- }
- } else {
- if(settings.noResultsText) {
- dropdown.html("<p>"+settings.noResultsText+"</p>");
- show_dropdown();
- }
- }
- }
-
- // Highlight an item in the results dropdown
- function select_dropdown_item (item) {
- if(item) {
- if(selected_dropdown_item) {
- deselect_dropdown_item($(selected_dropdown_item));
- }
-
- item.addClass(settings.classes.selectedDropdownItem);
- selected_dropdown_item = item.get(0);
- }
- }
-
- // Remove highlighting from an item in the results dropdown
- function deselect_dropdown_item (item) {
- item.removeClass(settings.classes.selectedDropdownItem);
- selected_dropdown_item = null;
- }
-
- // Do a search and show the "searching" dropdown if the input is longer
- // than settings.minChars
- function do_search() {
- var query = input_box.val().toLowerCase();
-
- if(query && query.length) {
- if(selected_token) {
- deselect_token($(selected_token), POSITION.AFTER);
- }
-
- if(query.length >= settings.minChars) {
- show_dropdown_searching();
- clearTimeout(timeout);
-
- timeout = setTimeout(function(){
- run_search(query);
- }, settings.searchDelay);
- } else {
- hide_dropdown();
- }
- }
- }
-
- // Do the actual search
- function run_search(query) {
- var cache_key = query + computeURL();
- var cached_results = cache.get(cache_key);
- if(cached_results) {
- populate_dropdown(query, cached_results);
- } else {
- // Are we doing an ajax search or local data search?
- if(settings.url) {
- var url = computeURL();
- // Extract exisiting get params
- var ajax_params = {};
- ajax_params.data = {};
- if(url.indexOf("?") > -1) {
- var parts = url.split("?");
- ajax_params.url = parts[0];
-
- var param_array = parts[1].split("&");
- $.each(param_array, function (index, value) {
- var kv = value.split("=");
- ajax_params.data[kv[0]] = kv[1];
- });
- } else {
- ajax_params.url = url;
- }
-
- // Prepare the request
- ajax_params.data[settings.queryParam] = query;
- ajax_params.type = settings.method;
- ajax_params.dataType = settings.contentType;
- if(settings.crossDomain) {
- ajax_params.dataType = "jsonp";
- }
-
- // Attach the success callback
- ajax_params.success = function(results) {
- if($.isFunction(settings.onResult)) {
- results = settings.onResult.call(hidden_input, results);
- }
- cache.add(cache_key, settings.jsonContainer ? results[settings.jsonContainer] : results);
-
- // only populate the dropdown if the results are associated with the active search query
- if(input_box.val().toLowerCase() === query) {
- populate_dropdown(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
- }
- };
-
- // Make the request
- $.ajax(ajax_params);
- } else if(settings.local_data) {
- // Do the search through local data
- var results = $.grep(settings.local_data, function (row) {
- return row[settings.propertyToSearch].toLowerCase().indexOf(query.toLowerCase()) > -1;
- });
-
- if($.isFunction(settings.onResult)) {
- results = settings.onResult.call(hidden_input, results);
- }
- cache.add(cache_key, results);
- populate_dropdown(query, results);
- }
- }
- }
-
- // compute the dynamic URL
- function computeURL() {
- var url = settings.url;
- if(typeof settings.url == 'function') {
- url = settings.url.call();
- }
- return url;
- }
-};
-
-// Really basic cache for the results
-$.TokenList.Cache = function (options) {
- var settings = $.extend({
- max_size: 500
- }, options);
-
- var data = {};
- var size = 0;
-
- var flush = function () {
- data = {};
- size = 0;
- };
-
- this.add = function (query, results) {
- if(size > settings.max_size) {
- flush();
- }
-
- if(!data[query]) {
- size += 1;
- }
-
- data[query] = results;
- };
-
- this.get = function (query) {
- return data[query];
- };
-};
-}(jQuery));
1
0
r296 - in trunk/chorem-webmotion: . src/main/java/org/chorem/webmotion/injector src/main/webapp/WEB-INF src/main/webapp/WEB-INF/jsp src/main/webapp/js
by bpoussin@users.chorem.org 15 Jan '13
by bpoussin@users.chorem.org 15 Jan '13
15 Jan '13
Author: bpoussin
Date: 2013-01-15 20:05:07 +0100 (Tue, 15 Jan 2013)
New Revision: 296
Url: http://chorem.org/projects/chorem/repository/revisions/296
Log:
- passage en webmotion 2.3.3
- correction bug sur la selection d'entite dans les formulaires (du au changement de version jquery-ui)
- ajout d'un theme jquery-ui
Modified:
trunk/chorem-webmotion/pom.xml
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
trunk/chorem-webmotion/src/main/webapp/js/chorem.js
Modified: trunk/chorem-webmotion/pom.xml
===================================================================
--- trunk/chorem-webmotion/pom.xml 2013-01-12 14:03:56 UTC (rev 295)
+++ trunk/chorem-webmotion/pom.xml 2013-01-15 19:05:07 UTC (rev 296)
@@ -52,11 +52,6 @@
</dependency>
<dependency>
- <groupId>org.debux.webmotion</groupId>
- <artifactId>webmotion</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-api</artifactId>
</dependency>
@@ -175,6 +170,21 @@
<artifactId>nuiton-js-bootstrap</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.nuiton.js</groupId>
+ <artifactId>nuiton-js-jquery-tokeninput</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.debux.webmotion</groupId>
+ <artifactId>webmotion</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.debux.webmotion</groupId>
+ <artifactId>webmotion-extra-sitemesh</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-01-12 14:03:56 UTC (rev 295)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-01-15 19:05:07 UTC (rev 296)
@@ -45,7 +45,7 @@
public class InjectorListener implements WebMotionServerListener {
@Override
- public void onStart(ServerContext context) {
+ public void onStart(Mapping mpng, ServerContext context) {
// Declare injector
context.addInjector(new Injector() {
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-01-12 14:03:56 UTC (rev 295)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-01-15 19:05:07 UTC (rev 296)
@@ -36,7 +36,7 @@
<link rel="stylesheet/less" href="<c:url value='/css/chorem.less '/>">
<%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%>
<link href="<c:url value='/nuiton-js/chorem.css'/>" rel="stylesheet" type="text/css"/>
- <script type="text/javascript" src="<c:url value='/nuiton-js/chorem.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/nuiton-js/chorem.js?minimize=false'/>"></script>
</head>
<body>
<div class="navbar navbar-fixed-top">
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-12 14:03:56 UTC (rev 295)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 19:05:07 UTC (rev 296)
@@ -4,6 +4,7 @@
<group-ref>jquery</group-ref>
<group-ref>bootstrap-responsive</group-ref>
<group-ref>jquery-ui</group-ref>
+ <group-ref>jquery-ui-cupertino</group-ref>
<group-ref>jqplot</group-ref>
<!-- plugin jqplot -->
<group-ref>jqplot.dateAxisRenderer</group-ref>
@@ -14,15 +15,11 @@
<group-ref>jqplot.highlighter</group-ref>
<group-ref>jqplot.barRenderer</group-ref>
- <css>/css/token-input.css/</css>
- <css>/css/token-input-mac.css</css>
- <css>/css/token-input-facebook.css</css>
-
<js>/js/jquery.ui.datepicker-fr.js</js>
<js>/js/jquery-ui-timepicker-addon.js</js>
<js>/js/jquery-ui-timepicker-fr.js</js>
- <js>/js/jquery.tokeninput.js</js>
+<!-- <js>/js/jquery.tokeninput.js</js> -->
<js>/js/less-1.2.1.min.js</js>
<js>/js/chorem.js</js>
</group>
Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-01-12 14:03:56 UTC (rev 295)
+++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-01-15 19:05:07 UTC (rev 296)
@@ -73,7 +73,7 @@
ul.append( "<li class='ui-autocomplete-category'>" + item.extension + "</li>" );
currentExtension = item.extension;
}
- self._renderItem( ul, item );
+ self._renderItemData( ul, item );
});
}
});
1
0