Chorem-commits
Threads by month
- ----- 2026 -----
- August
- July
- 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
- 542 discussions
r352 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/project resources webapp/WEB-INF/jsp webapp/js
by meynier＠users.chorem.org June 28, 2013
by meynier＠users.chorem.org June 28, 2013
June 28, 2013
Author: meynier
Date: 2013-06-28 16:53:52 +0200 (Fri, 28 Jun 2013)
New Revision: 352
Url: http://chorem.org/projects/chorem/repository/revisions/352
Log:
Corrected dashboard for new model and added the multi-project dashboard
Added:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationCalculation.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
trunk/chorem-webmotion/src/main/webapp/js/chorem.js
trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-06-28 14:35:50 UTC (rev 351)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-06-28 14:53:52 UTC (rev 352)
@@ -19,6 +19,7 @@
import org.debux.webmotion.server.call.Call;
import org.debux.webmotion.server.render.Render;
import org.chorem.entities.Closed;
+import org.chorem.entities.Interval;
import org.chorem.entities.Quotation;
import org.chorem.entities.Project;
import org.chorem.entities.Task;
@@ -55,14 +56,14 @@
.end();
projectResult = client.findAllByQuery(Project.class, projectQuery);
-
+
//Fetch the quotations form the project (if there is one)
if(projectResult.size() != 0) {
for(Project project : projectResult.getAll()) {
WikittyQuery quotationQuery = null;
WikittyQueryMaker wqm = new WikittyQueryMaker();
-
-
+
+
if(quotationFilter.equals("Devis ouverts")) {
wqm.and()
.eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project)
@@ -71,17 +72,17 @@
else {
wqm.eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project);
}
-
+
quotationQuery = wqm.end();
-
+
quotationQuery.addSortDescending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE);
quotationResult = client.findAllByQuery(Quotation.class, quotationQuery);
-
-
+
+
}
-
+
}
-
+
//Fetch the tasks form the quotations (if there are some)
if(quotationResult != null) {
String customClass = "";
@@ -89,16 +90,16 @@
WikittyQuery taskQuery = new WikittyQueryMaker()
.eq(Task.ELEMENT_FIELD_TASK_QUOTATION, quote)
.end();
-
+
taskResult = client.findAllByQuery(Task.class, taskQuery);
taskMap.put(quote, taskResult.getAll());
-
+
}
-
+
}
-
+
}
-
+
if(projectResult == null) {
return renderView("dashboardSingleProject.jsp",
"title", "Tableau de bord projet", "projects", null,"quotations",null);
@@ -110,34 +111,69 @@
}
else {
return renderView("dashboardSingleProject.jsp",
- "title", "Tableau de bord projet", "projects", projectResult.getAll(),
- "quotations", quotationResult.getAll(), "taskMap", taskMap, "extensions",
- Extensions.extensions);
+ "title", "Tableau de bord projet", "projects", projectResult.getAll(),
+ "quotations", quotationResult.getAll(), "taskMap", taskMap, "extensions",
+ Extensions.extensions);
}
}
+ public Render multiProjectFilter(ChoremClient client, Date from, Date to) {
+ System.out.println(from + "," + to);
+ if(from != null && to != null) {
+ WikittyQueryMaker quotationQueryMaker = new WikittyQueryMaker();
+ WikittyQuery quotationQuery = quotationQueryMaker.or()
+ .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to)
+ .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to)
+ .end();
+ WikittyQueryResult<Quotation> result =
+ client.findAllByQuery(Quotation.class, quotationQuery);
+
+ Collection<Quotation> quotations = result.getAll();
+
+ HashMap<Quotation, QuotationCalculation> calculations = new HashMap<Quotation, QuotationCalculation>();
+ for(Quotation q : quotations) {
+ calculations.put(q, new QuotationCalculation(q, client));
+ }
+
+ return renderView("dashboardMultiProject.jsp",
+ "title", "Tableau de bord projets",
+ "quotations", quotations,
+ "calculations", calculations);
+ }
+ else {
+ return renderView("dashboardMultiProject.jsp",
+ "title", "Tableau de bord projets");
+ }
+
+ }
+
+
+
public Render requestProject(ChoremClient client, String project_id, String quotationFilter) {
return projectFilter(client, project_id, quotationFilter);
}
-
+ public Render requestMultiProject(ChoremClient client, Date from, Date to) {
+ return multiProjectFilter(client, from, to);
+ }
+
public Render getGanttInfo(ChoremClient client, String id) {
Wikitty wikitty = client.restore(id);
- WikittyQuery quotationQuery = new WikittyQueryMaker()
+ WikittyQuery quotationQuery = new WikittyQueryMaker()
.ideq(id)
.end();
- Quotation quotation = client.findByQuery(Quotation.class, quotationQuery);
-
-
-
+ Quotation quotation = client.findByQuery(Quotation.class, quotationQuery);
+
+
+
WikittyQuery taskQuery = new WikittyQueryMaker()
.eq(Task.ELEMENT_FIELD_TASK_QUOTATION, quotation)
.end();
-
+
WikittyQueryResult<Task> taskResult = client.findAllByQuery(Task.class, taskQuery);
String customClass = "";
List<JTask> lTask = new ArrayList<JTask>();
for(Task t : taskResult.getAll()) {
-
+
if(t.getStatus().equals("SCHEDULED")) {
customClass = "ganttBlue";
}
@@ -150,25 +186,25 @@
else if(t.getStatus().equals("CLOSED")) {
customClass = "ganttGrey";
}
-
+
Values[] v = null;
- if(t.getReestimatedEnd() != null)
- v= new Values[2];
- else
+ //if(t.getReestimatedEnd() != null)
+ // v= new Values[2];
+ //else
v = new Values[1];
v[0] = new Values(t.getBeginDate(), t.getEndDate(), t.getName(), customClass);
- if(t.getReestimatedEnd() != null)
- v[1]= new Values(t.getEndDate(), t.getReestimatedEnd(), "Reestimated end", "ganttOrange");
-
- JTask jt = new JTask(t.getName(), t.getDescription(), v);
-
+ //if(t.getReestimatedEnd() != null)
+ // v[1]= new Values(t.getEndDate(), t.getReestimatedEnd(), "Reestimated end", "ganttOrange");
+
+ JTask jt = new JTask(t.getName(), t.getDescription(), t.getWikittyId(),t.getPrice(), t.getEstimatedDays(), v);
+
lTask.add(jt);
}
-
+
Collections.sort(lTask);
String dateStart = "/Date(" + quotation.getBeginDate().getTime() + ")/";
String dateEnd = "/Date(" + quotation.getEndDate().getTime() + ")/";
-
+
HashMap<String,String> dateMap = new HashMap<String,String>();
dateMap.put("sendingDate", "Draft");
dateMap.put("postedDate", "Sent");
@@ -180,7 +216,7 @@
dateMap.put("closedDate", "Closed");
dateMap.put("rejectedDate", "Rejected");
dateMap.put("cancelledDate", "Cancelled");
-
+
Iterator i = dateMap.entrySet().iterator();
HashMap<String,String> extDate = new HashMap<String,String>();
while(i.hasNext()) {
@@ -191,12 +227,12 @@
"/Date(" + ((Date) (wikitty.getFieldAsObject(me.getValue(), me.getKey()))).getTime() +")/");
}
}
-
+
JRender data = new JRender(lTask, extDate, dateStart, dateEnd);
- return renderJSON("data", data);
- }
-
-
+ return renderJSON("data", data);
+ }
+
+
private class JRender {
private List<JTask> source;
private String dateStart;
@@ -209,23 +245,29 @@
this.extDate = extDate;
}
}
-
+
private class JTask implements Comparable {
private String name;
private String desc;
private Values[] values;
private String status;
- public JTask(String name, String desc, Values[] values) {
+ private String wikittyId;
+ private float price;
+ private double estimatedDays;
+ public JTask(String name, String desc, String wikittyId,float price, double estimatedDays, Values[] values) {
this.name = name;
this.desc = desc;
this.values = values;
+ this.wikittyId = wikittyId;
+ this.price = price;
+ this.estimatedDays = estimatedDays;
}
@Override
public int compareTo(Object task) {
-
+
return values[0].compareTo(((JTask)task).values[0]);
}
-
+
}
private class Values implements Comparable{
private String from;
@@ -240,19 +282,19 @@
}
@Override
public int compareTo(Object o) {
-
+
return from.compareTo(((Values)o).from);
}
-
+
}
-
+
private class QuotationSorter<T> implements Comparator {
@Override
public int compare(Object q1, Object q2) {
-
+
return ((Quotation)q1).getBeginDate().compareTo(((Quotation)q2).getBeginDate());
}
-
+
}
}
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationCalculation.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationCalculation.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationCalculation.java 2013-06-28 14:53:52 UTC (rev 352)
@@ -0,0 +1,94 @@
+package org.chorem.webmotion.actions.project;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+
+import org.chorem.ChoremClient;
+import org.chorem.entities.Interval;
+import org.chorem.entities.Quotation;
+import org.chorem.entities.Task;
+import org.chorem.entities.Time;
+import org.nuiton.wikitty.query.WikittyQuery;
+import org.nuiton.wikitty.query.WikittyQueryMaker;
+import org.nuiton.wikitty.query.WikittyQueryResult;
+
+public class QuotationCalculation {
+
+ private Quotation q;
+ private ChoremClient client;
+ private static final int SEC_PER_HOUR = 3600;
+ private static final int WORKING_HOURS_PER_DAY = 7;
+
+ public QuotationCalculation(Quotation q, ChoremClient client) {
+ this.q = q;
+ this.client = client;
+ }
+ public double tjm() {
+ double amount = q.getAmount();
+ double nbDays = q.getEstimatedDays();
+
+ return amount/nbDays;
+
+ }
+
+ private double getSecondPeriod(Date start, Date end) {
+ return end.getTime()-start.getTime();
+ }
+
+ public double realDays() {
+ //test if quotation is finished
+ if(q.getExtensionNames().contains("Closed")) {
+ //TODO calcul grâce aux objets Time
+ WikittyQuery taskQuery = new WikittyQueryMaker()
+ .eq(Task.ELEMENT_FIELD_TASK_QUOTATION, q)
+ .end();
+
+ WikittyQueryResult<Task> result =
+ client.findAllByQuery(Task.class, taskQuery);
+ Collection<Time> times = new ArrayList<Time>();
+ for(Task t : result.getAll()) {
+ WikittyQuery timeQuery = new WikittyQueryMaker()
+ .eq(Time.ELEMENT_FIELD_TIME_TASK, q)
+ .end();
+ WikittyQueryResult timeResult = client.findAllByQuery(Time.class, timeQuery);
+ System.out.println("RESULT : " + timeResult);
+ times.addAll(timeResult.getAll());
+ }
+ System.out.println(times);
+ double totalTime = 0;
+ for(Time t : times) {
+ totalTime += getSecondPeriod(t.getBeginDate(), t.getEndDate());
+ }
+ return (totalTime / SEC_PER_HOUR) / WORKING_HOURS_PER_DAY;
+ }
+ else {
+ //nbDays + otherdays
+ WikittyQuery taskQuery = new WikittyQueryMaker()
+ .eq(Task.ELEMENT_FIELD_TASK_QUOTATION, q)
+ .end();
+
+ WikittyQueryResult<Task> result =
+ client.findAllByQuery(Task.class, taskQuery);
+
+ double totalDayExt = 0;
+ for(Task t : result.getAll()) {
+ totalDayExt += t.getDayExtension();
+ }
+ return q.getEstimatedDays() + totalDayExt;
+
+ }
+ }
+
+ public double deltaDays() {
+ return q.getEstimatedDays() - realDays();
+ }
+
+ public double realTjm() {
+ double amount = q.getAmount();
+ double nbDays = realDays();
+
+ return amount/nbDays;
+ }
+
+}
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2013-06-28 14:35:50 UTC (rev 351)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2013-06-28 14:53:52 UTC (rev 352)
@@ -69,6 +69,7 @@
* /sales/funnel/json/{method} action:sales.SalesAction.{method}
* /sales/funnel/json/{method}/{id} action:sales.SalesAction.{method}
* /project action:project.DashboardProjectAction.requestProject
+* /project/multi action:project.DashboardProjectAction.requestMultiProject
* /project/json/getExtension/{extensionName}/{id} action:project.QuotationStatusAction.getExtension
* /project/json/getGanttInfo/{id} action:project.DashboardProjectAction.getGanttInfo
* /crm/account/{id} action:crm.AccountAction.view
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2013-06-28 14:53:52 UTC (rev 352)
@@ -0,0 +1,97 @@
+<%--
+ #%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="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%>
+
+
+<link rel="stylesheet" href="<c:url value='/css/jquery.fn.gantt.css'/>" />
+<h1>${title}</h1>
+<form class="well form-inline" method="GET" id="projectSearch">
+
+ <div class="control-group">
+ <div class="controls" style="display: inline">
+<!--
+ <script>
+ $(function() {
+ $("#project_text")
+ .autocompleteByExtension(
+ {
+ source : "/chorem/wikitty-json/search?extension=Project",
+ minLength : 2,
+ select : function(event, ui) {
+ $("#project_text").val(
+ ui.item.label);
+ $("#project_hidden")
+ .val(ui.item.id);
+ $("#project_hidden").change()
+ return false;
+ }
+ });
+ });
+ </script>
+ -->
+ From : <input type="text" name="from" id="from" class="datepicker" />
+ to : <input type="text" name="to" id="to" class="datepicker" />
+ <input type="submit"/>
+ </div>
+ </div>
+
+</form>
+
+<table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>Client</th>
+ <th>Projet</th>
+ <th>Montant</th>
+ <th>NbJour</th>
+ <th>TJM</th>
+ <th>NbJourReel</th>
+ <th>delta jour</th>
+ <th>tjm reel</th>
+
+ </tr>
+ </thead>
+ <c:forEach var="q" items="${quotations}">
+ <tbody>
+ <tr>
+ <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.customer" label=""/></td>
+ <td><w:display wikitty="${q.wikitty}" fqfield="Quotation.project" label=""/>
+ <a href="<c:url value="/wikitty/edit/${q.wikittyId}"/>"><i
+ class="icon-pencil icon-black"></i></a>
+ </td>
+ <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></td>
+ <td class="number"><w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/></td>
+ <td class="number">${calculations[q].tjm()}</td>
+ <td class="number">${calculations[q].realDays()}</td>
+ <td class="number">${calculations[q].deltaDays()}</td>
+ <td class="number">${calculations[q].realTjm()}</td>
+ </tr>
+ </tbody>
+ </c:forEach>
+</table>
+
+
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-06-28 14:35:50 UTC (rev 351)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-06-28 14:53:52 UTC (rev 352)
@@ -102,6 +102,7 @@
<li><a href="<c:url value="/wikitty/Project/search"/>"><i class="icon-th-list icon-black"></i> All projects</a></li>
<li><a href="<c:url value="/wikitty/Project/edit/new"/>"><i class="icon-plus icon-black"></i> Add project</a></li>
<li><a href="<c:url value="/project"/>"><i class="icon-th-list icon-black"></i> Dashboard project</a></li>
+ <li><a href="<c:url value="/project/multi"/>"><i class="icon-th-list icon-black"></i> Dashboard multi-project</a></li>
<li class="divider"></li>
<li>Propale</li>
<li><a href="<c:url value="/wikitty/Quotation/search"/>"><i class="icon-th-list icon-black"></i> All quotations</a></li>
Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-28 14:35:50 UTC (rev 351)
+++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-28 14:53:52 UTC (rev 352)
@@ -775,7 +775,7 @@
minScale: "days",
itemsPerPage: 10,
onItemClick: function(data) {
- alert("Item clicked - show some details");
+ window.location ="wikitty/edit/" + this.source[0].wikittyId;
},
onAddClick: function(dt, rowId) {
alert("Empty space clicked - add an item!");
Modified: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2013-06-28 14:35:50 UTC (rev 351)
+++ trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2013-06-28 14:53:52 UTC (rev 352)
@@ -45,6 +45,7 @@
waitText: "Please wait...",
onItemClick: function (data) { return; },
onAddClick: function (data) { return; },
+ onTaskClick: function (data) { return; },
onRender: function() { return; },
scrollToToday: true,
dateStart:null,
@@ -334,10 +335,12 @@
mover : function (e) {
console.log("hint");
var hint;
+ var str;
if($(this).attr("over") == 'text')
- hint = $('<div class="fn-gantt-hint"/>').html($(this).text());
+ str = $(this).text();
else
- hint = $('<div class="fn-gantt-hint"/>').html($(this).attr("over"));
+ str = $(this).attr("over");
+ hint = $('<div class="fn-gantt-hint"/>').html(str);
$("body").append(hint);
hint.css("left", e.pageX);
hint.css("top", e.pageY);
@@ -995,7 +998,7 @@
// **Progress Bar**
// Return an element representing a progress of position within
// the entire chart
- createProgressBar: function (days, cls, desc, label, dataObj) {
+ createProgressBar: function (days, cls, desc, label,price, estimatedDays, dataObj) {
var cellWidth = tools.getCellSize();
var barMarg = tools.getProgressBarMargin() || 0;
@@ -1007,10 +1010,21 @@
.data("dataObj", dataObj);
//if (desc) {
- bar.mouseover(core.mover)
+ bar.mouseover(function (e) {
+ console.log("hint");
+ var hint;
+ var str;
+
+ hint = $('<div class="fn-gantt-hint"/>').html(label + " :<br/>"
+ + desc + "<br/>Price : " + price + "<br />Estimated days : " + estimatedDays);
+ $("body").append(hint);
+ hint.css("left", e.pageX);
+ hint.css("top", e.pageY);
+ hint.show();
+ })
.mouseout(core.mout)
.mousemove(core.mmove)
- .attr('over', 'text');
+ .attr('over', 'task');
//}
bar.click(function (e) {
e.stopPropagation();
@@ -1156,6 +1170,8 @@
day.customClass ? day.customClass : "",
entry.desc ? entry.desc : "",
day.label ? day.label : "",
+ entry.price ? entry.price : "",
+ entry.estimatedDays ? entry.estimatedDays : "",
day.dataObj ? day.dataObj : null
);
@@ -1199,6 +1215,8 @@
day.customClass ? day.customClass : "",
entry.desc ? entry.desc : "",
day.label ? day.label : "",
+ ntry.price ? entry.price : "",
+ entry.estimatedDays ? entry.estimatedDays : "",
day.dataObj ? day.dataObj : null
);
@@ -1239,6 +1257,8 @@
day.customClass ? day.customClass : "",
entry.desc ? entry.desc : "",
day.label ? day.label : "",
+ entry.price ? entry.price : "",
+ entry.estimatedDays ? entry.estimatedDays : "",
day.dataObj ? day.dataObj : null
);
@@ -1265,6 +1285,8 @@
day.customClass ? day.customClass : "",
entry.desc ? entry.desc : "",
day.label ? day.label : "",
+ entry.price ? entry.price : "",
+ entry.estimatedDays ? entry.estimatedDays : "",
day.dataObj ? day.dataObj : null
);
1
0
r351 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org June 28, 2013
by bpoussin＠users.chorem.org June 28, 2013
June 28, 2013
Author: bpoussin
Date: 2013-06-28 16:35:50 +0200 (Fri, 28 Jun 2013)
New Revision: 351
Url: http://chorem.org/projects/chorem/repository/revisions/351
Log:
le CA est hors taxe
Modified:
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-06-28 14:35:23 UTC (rev 350)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2013-06-28 14:35:50 UTC (rev 351)
@@ -49,7 +49,7 @@
</ul>
<ul>
- <li>Chiffre d'affaire TTC:
+ <li>Chiffre d'affaire HT:
<strong>
<a href='<c:url value="/wikitty/search?query=${annualDebtIncome.get('incomesQuery')} or ${annualDebtIncome.get('extraIncomesQuery')} %23limit=2147483647"/>'>
<f:formatNumber type="currency" value="${annualDebtIncome.get('incomes') + annualDebtIncome.get('extraIncomes')}"/>
@@ -60,7 +60,7 @@
<f:formatNumber type="currency" value="${pastAnnualDebtIncome.get('incomes') + pastAnnualDebtIncome.get('extraIncomes')}"/>
</a>
</strong>)
- <li>Dépenses:
+ <li>Dépenses TTC:
<strong>
<a href='<c:url value="/wikitty/search?query=${annualDebtIncome.get('debtsQuery')} %23limit=2147483647"/>'>
<f:formatNumber type="currency" value="${annualDebtIncome.get('debtsTTC')}"/>
1
0
r350 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by bpoussin＠users.chorem.org June 28, 2013
by bpoussin＠users.chorem.org June 28, 2013
June 28, 2013
Author: bpoussin
Date: 2013-06-28 16:35:23 +0200 (Fri, 28 Jun 2013)
New Revision: 350
Url: http://chorem.org/projects/chorem/repository/revisions/350
Log:
on ne prend pas en compte les proposition rejetee
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-06-28 10:20:50 UTC (rev 349)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-06-28 14:35:23 UTC (rev 350)
@@ -52,6 +52,7 @@
import org.chorem.entities.Invoice;
import org.chorem.entities.InvoiceStatus;
import org.chorem.entities.Quotation;
+import org.chorem.entities.Rejected;
import org.chorem.entities.Sent;
import org.chorem.entities.Started;
import org.chorem.entities.Task;
@@ -471,7 +472,7 @@
*/
protected Render quotationFilter(ChoremClient client,
Date start, Date end, String query,
- String statusStart, String statusEnd, String jspRender,
+ String statusStart, String statusEnd, boolean excludeRejected, String jspRender,
String title, boolean computeTask) {
if (start == null) {
@@ -491,6 +492,10 @@
.parse(query)
.exteq(statusStart);
+ if (excludeRejected) {
+ quotationQueryMaker = quotationQueryMaker.extne(Rejected.EXT_REJECTED);
+ }
+
if (statusEnd != null){
quotationQueryMaker = quotationQueryMaker.extne(statusEnd);
}
@@ -596,21 +601,21 @@
Date start, Date end, String query) {
String jsp = "dashboardQuotation.jsp";
String title = "Les propositions en attente de réponse";
- return quotationFilter(client, start, end, query, Quotation.EXT_QUOTATION, Accepted.EXT_ACCEPTED, jsp, title, false);
+ return quotationFilter(client, start, end, query, Quotation.EXT_QUOTATION, Accepted.EXT_ACCEPTED, true, jsp, title, false);
}
public Render projectOpen(ChoremClient client,
Date start, Date end, String query) {
String jsp = "dashboardProject.jsp";
String title = "Les projets en cours";
- return quotationFilter(client, start, end, query, Accepted.EXT_ACCEPTED, Warranty.EXT_WARRANTY, jsp, title, true);
+ return quotationFilter(client, start, end, query, Accepted.EXT_ACCEPTED, Warranty.EXT_WARRANTY, true, jsp, title, true);
}
public Render projectClosed(ChoremClient client,
Date start, Date end, String query) {
String jsp = "dashboardProject.jsp";
String title = "Les projets clos";
- return quotationFilter(client, start, end, query, Warranty.EXT_WARRANTY, null, jsp, title, true);
+ return quotationFilter(client, start, end, query, Warranty.EXT_WARRANTY, null, true, jsp, title, true);
}
static public class TaskInfo implements Cloneable {
@@ -808,7 +813,7 @@
Date start, Date end, String query) {
String jsp = "dashboardProfitability.jsp";
String title = "Profitability";
- return quotationFilter(client, start, end, query, Started.EXT_STARTED, null, jsp, title, true);
+ return quotationFilter(client, start, end, query, Started.EXT_STARTED, null, true, jsp, title, true);
}
/**
1
0
r349 - in trunk/chorem-entities/src/main: java/org/chorem xmi
by meynier＠users.chorem.org June 28, 2013
by meynier＠users.chorem.org June 28, 2013
June 28, 2013
Author: meynier
Date: 2013-06-28 12:20:50 +0200 (Fri, 28 Jun 2013)
New Revision: 349
Url: http://chorem.org/projects/chorem/repository/revisions/349
Log:
Changed Task.reestimatedEnd by Task.dayExtension
Modified:
trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
trunk/chorem-entities/src/main/xmi/chorem-model.properties
trunk/chorem-entities/src/main/xmi/chorem-model.zargo
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2013-06-27 14:07:10 UTC (rev 348)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2013-06-28 10:20:50 UTC (rev 349)
@@ -52,7 +52,7 @@
}
/**
- * Vide les objets qui porte une certaine extensions
+ * Vide les objets qui portent une certaine extension
* @param extensionName
*/
@ApplicationConfig.Action.Step(0)
Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties
===================================================================
--- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-06-27 14:07:10 UTC (rev 348)
+++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-06-28 10:20:50 UTC (rev 349)
@@ -306,15 +306,16 @@
#
# Task
#
-org.chorem.entities.Task.class.tagvalue.version=10.0
+org.chorem.entities.Task.class.tagvalue.version=11.0
org.chorem.entities.Task.class.tagvalue.toString=%Task.name|noname$s - %Task.quotation$s
org.chorem.entities.Task.class.tagvalue.sortOrder=Task.name
org.chorem.entities.Task.class.tagvalue.preload=Task.quotation
org.chorem.entities.Task.attribute.description.tagvalue.help=R\u00e9sum\u00e9 de ce qu'il devra \u00eatre fait durant cette t\u00e2che
org.chorem.entities.Task.attribute.description.tagvalue.subtype=text/rst
org.chorem.entities.Task.attribute.price.tagvalue.help=Montant HT de cette t\u00e2che
-org.chorem.entities.Task.attribute.reestimatedEnd.tagvalue.help=Date estim\u00e9e de fin de t\u00e2che
+#org.chorem.entities.Task.attribute.reestimatedEnd.tagvalue.help=Date estim\u00e9e de fin de t\u00e2che
org.chorem.entities.Task.attribute.estimatedDays.tagvalue.help=Le nombre de jours estim\u00e9s pour cette t\u00e2che
+org.chorem.entities.Task.attributes.dayExtension.tagvalue.help=Jours supplementaires estimes pour la tache
org.chorem.entities.Task.attribute.name.tagvalue.help=Nom de la t\u00e2che ou N\u00b0 dans le devis
org.chorem.entities.Task.attribute.status.tagvalue.help=\u00c9tat actuel de la t\u00e2che
org.chorem.entities.Task.attribute.status.tagvalue.allowed=SCHEDULED,STARTED,FINISHED,CLOSED
Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo
===================================================================
(Binary files differ)
1
0
r348 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/project resources webapp/WEB-INF/jsp webapp/css webapp/js
by meynier＠users.chorem.org June 27, 2013
by meynier＠users.chorem.org June 27, 2013
June 27, 2013
Author: meynier
Date: 2013-06-27 16:07:10 +0200 (Thu, 27 Jun 2013)
New Revision: 348
Url: http://chorem.org/projects/chorem/repository/revisions/348
Log:
Project dashboard : UI changes + filter for the quotations
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
trunk/chorem-webmotion/src/main/webapp/js/chorem.js
trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-06-26 09:30:51 UTC (rev 347)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-06-27 14:07:10 UTC (rev 348)
@@ -2,9 +2,13 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.TreeMap;
import org.apache.commons.logging.Log;
@@ -14,9 +18,12 @@
import org.chorem.ChoremUtil;
import org.debux.webmotion.server.call.Call;
import org.debux.webmotion.server.render.Render;
+import org.chorem.entities.Closed;
import org.chorem.entities.Quotation;
import org.chorem.entities.Project;
import org.chorem.entities.Task;
+import org.chorem.entities.TaskStatus;
+import org.nuiton.wikitty.entities.Wikitty;
import org.nuiton.wikitty.entities.WikittyExtension;
import org.nuiton.wikitty.query.WikittyQuery;
import org.nuiton.wikitty.query.WikittyQueryMaker;
@@ -32,14 +39,13 @@
/** to use log facility, just put in your code: log.info(\"...\"); */
static private Log log = LogFactory.getLog(DashboardProjectAction.class);
- public Render projectFilter(ChoremClient client, String id) {
+ public Render projectFilter(ChoremClient client, String id, String quotationFilter) {
WikittyQueryResult<Project> projectResult = null;
WikittyQueryResult<Quotation> quotationResult = null;
WikittyQueryResult<Task> taskResult = null;
HashMap<Quotation, List<Task>> taskMap = new HashMap<Quotation, List<Task>>();
- HashMap<Quotation, String> jSonTaskMap = new HashMap<Quotation, String>();
//HashMap<Quotation, String> extMap = new HashMap<Quotation, String>();
//Fetch the project form the name (if it has been requested)
@@ -53,10 +59,22 @@
//Fetch the quotations form the project (if there is one)
if(projectResult.size() != 0) {
for(Project project : projectResult.getAll()) {
- WikittyQuery quotationQuery = new WikittyQueryMaker()
- .eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project)
- .end();
+ WikittyQuery quotationQuery = null;
+ WikittyQueryMaker wqm = new WikittyQueryMaker();
+
+ if(quotationFilter.equals("Devis ouverts")) {
+ wqm.and()
+ .eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project)
+ .extne(Closed.EXT_CLOSED);
+ }
+ else {
+ wqm.eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project);
+ }
+
+ quotationQuery = wqm.end();
+
+ quotationQuery.addSortDescending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE);
quotationResult = client.findAllByQuery(Quotation.class, quotationQuery);
@@ -66,6 +84,7 @@
//Fetch the tasks form the quotations (if there are some)
if(quotationResult != null) {
+ String customClass = "";
for(Quotation quote : quotationResult.getAll()) {
WikittyQuery taskQuery = new WikittyQueryMaker()
.eq(Task.ELEMENT_FIELD_TASK_QUOTATION, quote)
@@ -73,22 +92,12 @@
taskResult = client.findAllByQuery(Task.class, taskQuery);
taskMap.put(quote, taskResult.getAll());
- List<JTask> lTask = new ArrayList<JTask>();
- for(Task t : taskResult.getAll()) {
- Values[] v = new Values[1];
- v[0] = new Values(t.getBeginDate(), t.getEndDate(), t.getName(), "ganttRed");
- JTask jt = new JTask(t.getName(), t.getDescription(), v);
-
- lTask.add(jt);
- }
- Gson g = new Gson();
- jSonTaskMap.put(quote, g.toJson(lTask));
+
}
}
}
- System.out.println(taskMap);
if(projectResult == null) {
return renderView("dashboardSingleProject.jsp",
@@ -102,51 +111,123 @@
else {
return renderView("dashboardSingleProject.jsp",
"title", "Tableau de bord projet", "projects", projectResult.getAll(),
- "quotations", quotationResult.getAll(), "taskMap", taskMap,"jSonTaskMap",jSonTaskMap, "extensions",
+ "quotations", quotationResult.getAll(), "taskMap", taskMap, "extensions",
Extensions.extensions);
}
}
- public Render requestProject(ChoremClient client, String project_id) {
- return projectFilter(client, project_id);
+ public Render requestProject(ChoremClient client, String project_id, String quotationFilter) {
+ return projectFilter(client, project_id, quotationFilter);
}
-
- /*
- private String getNextExtension(ChoremClient client,Quotation object) {
- Collection<String> extensions = object.getExtensionNames();
+ public Render getGanttInfo(ChoremClient client, String id) {
+ Wikitty wikitty = client.restore(id);
+ WikittyQuery quotationQuery = new WikittyQueryMaker()
+ .ideq(id)
+ .end();
+ Quotation quotation = client.findByQuery(Quotation.class, quotationQuery);
+
+
+
+ WikittyQuery taskQuery = new WikittyQueryMaker()
+ .eq(Task.ELEMENT_FIELD_TASK_QUOTATION, quotation)
+ .end();
+ WikittyQueryResult<Task> taskResult = client.findAllByQuery(Task.class, taskQuery);
+ String customClass = "";
+ List<JTask> lTask = new ArrayList<JTask>();
+ for(Task t : taskResult.getAll()) {
+
+ if(t.getStatus().equals("SCHEDULED")) {
+ customClass = "ganttBlue";
+ }
+ else if(t.getStatus().equals("STARTED")) {
+ customClass = "ganttGreen";
+ }
+ else if(t.getStatus().equals("FINISHED")) {
+ customClass = "ganttRed";
+ }
+ else if(t.getStatus().equals("CLOSED")) {
+ customClass = "ganttGrey";
+ }
+
+ Values[] v = null;
+ if(t.getReestimatedEnd() != null)
+ v= new Values[2];
+ else
+ v = new Values[1];
+ v[0] = new Values(t.getBeginDate(), t.getEndDate(), t.getName(), customClass);
+ if(t.getReestimatedEnd() != null)
+ v[1]= new Values(t.getEndDate(), t.getReestimatedEnd(), "Reestimated end", "ganttOrange");
+
+ JTask jt = new JTask(t.getName(), t.getDescription(), v);
+
+ lTask.add(jt);
+ }
- if(extensions.contains("Closed")) return null;
+ Collections.sort(lTask);
+ String dateStart = "/Date(" + quotation.getBeginDate().getTime() + ")/";
+ String dateEnd = "/Date(" + quotation.getEndDate().getTime() + ")/";
+
+ HashMap<String,String> dateMap = new HashMap<String,String>();
+ dateMap.put("sendingDate", "Draft");
+ dateMap.put("postedDate", "Sent");
+ dateMap.put("acceptedDate", "Accepted");
+ dateMap.put("startedDate", "Started");
+ dateMap.put("deliveryDate", "Delivered");
+ dateMap.put("rsvStart", "RSV");
+ dateMap.put("warrantyStart", "Warranty");
+ dateMap.put("closedDate", "Closed");
+ dateMap.put("rejectedDate", "Rejected");
+ dateMap.put("cancelledDate", "Cancelled");
- TreeMap<Integer, String> extMap = new TreeMap<Integer, String>();
-
-
-
- //reverse loop
- for(int i = exts.length-1; i>=0; i--) {
- if(extensions.contains(exts[i])) {
- WikittyExtension ret = client.restoreExtensionLastVersion(exts[i+1]);
- return ret;
+ Iterator i = dateMap.entrySet().iterator();
+ HashMap<String,String> extDate = new HashMap<String,String>();
+ while(i.hasNext()) {
+ Map.Entry<String, String> me = (Map.Entry<String, String>)i.next();
+ if(wikitty.hasExtension(me.getValue())) {
+ extDate.put(
+ me.getValue() + " " + me.getKey(),
+ "/Date(" + ((Date) (wikitty.getFieldAsObject(me.getValue(), me.getKey()))).getTime() +")/");
}
-
}
- return null;
- }*/
+ JRender data = new JRender(lTask, extDate, dateStart, dateEnd);
+ return renderJSON("data", data);
+ }
- private class JTask {
+
+ private class JRender {
+ private List<JTask> source;
+ private String dateStart;
+ private String dateEnd;
+ private HashMap<String,String> extDate;
+ public JRender(List<JTask> source,HashMap<String,String> extDate,String dateStart,String dateEnd) {
+ this.source = source;
+ this.dateStart = dateStart;
+ this.dateEnd = dateEnd;
+ this.extDate = extDate;
+ }
+ }
+
+ private class JTask implements Comparable {
private String name;
private String desc;
private Values[] values;
+ private String status;
public JTask(String name, String desc, Values[] values) {
this.name = name;
this.desc = desc;
this.values = values;
}
+ @Override
+ public int compareTo(Object task) {
+
+ return values[0].compareTo(((JTask)task).values[0]);
+ }
}
- private class Values{
+ private class Values implements Comparable{
private String from;
private String to;
private String label;
@@ -157,6 +238,21 @@
this.label = label;
this.customClass = customClass;
}
+ @Override
+ public int compareTo(Object o) {
+
+ return from.compareTo(((Values)o).from);
+ }
}
+
+ private class QuotationSorter<T> implements Comparator {
+
+ @Override
+ public int compare(Object q1, Object q2) {
+
+ return ((Quotation)q1).getBeginDate().compareTo(((Quotation)q2).getBeginDate());
+ }
+
+ }
}
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2013-06-26 09:30:51 UTC (rev 347)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2013-06-27 14:07:10 UTC (rev 348)
@@ -69,6 +69,7 @@
* /sales/funnel/json/{method} action:sales.SalesAction.{method}
* /sales/funnel/json/{method}/{id} action:sales.SalesAction.{method}
* /project action:project.DashboardProjectAction.requestProject
-* /project/json/{method}/{extensionName}/{id} action:project.QuotationStatusAction.{method}
+* /project/json/getExtension/{extensionName}/{id} action:project.QuotationStatusAction.getExtension
+* /project/json/getGanttInfo/{id} action:project.DashboardProjectAction.getGanttInfo
* /crm/account/{id} action:crm.AccountAction.view
* /crm/quotation/edit/{id} action:crm.QuotationAction.edit
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-06-26 09:30:51 UTC (rev 347)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-06-27 14:07:10 UTC (rev 348)
@@ -56,7 +56,14 @@
<input type="text" id="project_text" name="project_name"
value="${param.project_name}" placeholder="project name" /> <input
- type="hidden" id="project_hidden" name="project_id" value="" />
+ type="hidden" id="project_hidden" name="project_id"
+ value="${param.project_id}" /> <select class="filterBox"
+ name="quotationFilter" id="quotationFilter">
+ <option name="open">Devis ouverts</option>
+ <option name="all"
+ <c:if test='${param.quotationFilter=="Tous les devis" }'>selected</c:if>>Tous
+ les devis</option>
+ </select>
</div>
</div>
@@ -64,20 +71,38 @@
<c:choose>
<c:when test="${projects.size() >= 1}">
-
<c:forEach var="p" items="${projects}">
- <h2>${p.name}</h2>
+ <h2 style="display: inline;">${p.name}</h2>
+ <a href="<c:url value="/wikitty/edit/${param.project_id}"/>"><i
+ class="icon-pencil icon-black"></i><small>edit</small></a>
<p>${p.description}</p>
</c:forEach>
-<script>var ganttData = new Array();</script>
<c:forEach var="q" items="${quotations}">
+
+ <h3 style="display: inline;">
+ <w:display wikitty="${q.wikitty}" fqfield="Quotation.description"
+ label="" />
+ </h3>
+ <a href="<c:url value="/wikitty/edit/${q.wikittyId}"/>"><i
+ class="icon-pencil icon-black"></i><small>edit</small></a>
+ <p>
+ Du <w:display wikitty="${q.wikitty}" fqfield="Interval.beginDate"
+ label="" pattern="dd/MM/yyyy"/>
+ au <w:display wikitty="${q.wikitty}" fqfield="Interval.beginDate"
+ label="" pattern="dd/MM/yyyy" />
+ <br />Statut :
+ ${q.wikitty.extensionNames.toArray()[q.wikitty.extensionNames.size()
+ -1]}
+ </p>
+
+
+
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
- <th>Devis</th>
<th>Responsable Code Lutin</th>
<th>Responsable entreprise</th>
<th>Estimated days</th>
@@ -90,9 +115,8 @@
<tbody>
<tr>
+
<td><w:display wikitty="${q.wikitty}"
- fqfield="Quotation.description" label="" /></td>
- <td><w:display wikitty="${q.wikitty}"
fqfield="Quotation.supplier" label="" /></td>
<td><w:display wikitty="${q.wikitty}"
fqfield="Quotation.customer" label="" /></td>
@@ -108,48 +132,12 @@
</tbody>
</table>
+
+ <div class="gantt gantt-${q.wikittyId}" wikittyId = "${q.wikittyId}" data=''>
+ Pas de tâche</div>
+<!--
- <p>
- Début : ${q.beginDate}<br /> Fin :
- <w:display wikitty="${q.wikitty}" fqfield="Interval.endDate"
- label="" />
- </p>
- <a class="ganttinit" wikittyId="${q.wikittyId}" href="#">Afficher Gantt</a>
- <div class="gantt-${q.wikittyId}" data =''></div>
-
- <c:set var="script" value="ganttData['${q.wikittyId}'] = {src:${jSonTaskMap[q]},
- startDate:'/Date(${q.beginDate.time})/',
- endDate:'/Date(${q.endDate.time})/'
- "/>
-
- <%
- java.util.HashMap<String,String> dateMap = new java.util.HashMap<String,String>();
- dateMap.put("sendingDate", "Draft");
- dateMap.put("postedDate", "Sent");
- dateMap.put("acceptedDate", "Accepted");
- dateMap.put("startedDate", "Started");
- dateMap.put("deliveryDate", "Delivered");
- dateMap.put("rsvStart", "RSV");
- dateMap.put("warrantyStart", "Warranty");
- dateMap.put("closedDate", "Closed");
- dateMap.put("rejectedDate", "Rejected");
- dateMap.put("cancelledDate", "Cancelled");
- pageContext.setAttribute("dateMap", dateMap);
- %>
-
- <c:forEach items="${dateMap}" var="entry">
- <c:if test='${q.wikitty.hasExtension(entry.value)}'>
- <c:set var="script" value="${script},${entry.key} :'/Date(${q.wikitty.getFieldAsObject(entry.value, entry.key).time})/'"/>
- </c:if>
- </c:forEach>
-
- <c:set var="script" value="${script}};"/>
-
- <script>
- ${script}
- </script>
-
<p>Liste des tâches :</p>
<c:forEach items="${taskMap}" var="entry">
<c:if test="${entry.key.equals(q)}">
@@ -182,8 +170,8 @@
</select>
</p>
<div id="upgradeFields-${q.wikittyId}"></div>
+-->
-
</c:forEach>
</c:when>
Modified: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2013-06-26 09:30:51 UTC (rev 347)
+++ trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2013-06-27 14:07:10 UTC (rev 348)
@@ -248,7 +248,13 @@
color: #714715 !important;
}
+.fn-gantt .ganttBlue {
+ background-color: #88ccff;
+}
+.fn-gantt .ganttGrey {
+ background-color: #cccccc;
+}
/* === BOTTOM NAVIGATION === */
.fn-gantt .bottom {
Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-26 09:30:51 UTC (rev 347)
+++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-27 14:07:10 UTC (rev 348)
@@ -97,38 +97,38 @@
/*********** SALES FUNNEL FUNCTIONS**********************/
function leadToDraft(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $("#lead-wikittyId").val(id);
- $("#dialog-form-leadToDraft" ).data("oldQuotation", oldQuotation).dialog( "open" );
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#lead-wikittyId").val(id);
+ $("#dialog-form-leadToDraft" ).data("oldQuotation", oldQuotation).dialog( "open" );
};
function draftToSent(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $("#draft-wikittyId").val(id);
- $("#dialog-form-draftToSent" ).data("oldQuotation", oldQuotation).dialog( "open" );
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#draft-wikittyId").val(id);
+ $("#dialog-form-draftToSent" ).data("oldQuotation", oldQuotation).dialog( "open" );
};
function sentToAccepted(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $("#sent-wikittyId").val(id);
- $("#dialog-form-sentToAccepted" ).data("oldQuotation", oldQuotation).dialog( "open" );
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#sent-wikittyId").val(id);
+ $("#dialog-form-sentToAccepted" ).data("oldQuotation", oldQuotation).dialog( "open" );
};
function sentToRejected(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $("#rejected-wikittyId").val(id);
- $("#dialog-form-sentToRejected" ).data("oldQuotation", oldQuotation).dialog( "open" );
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#rejected-wikittyId").val(id);
+ $("#dialog-form-sentToRejected" ).data("oldQuotation", oldQuotation).dialog( "open" );
};
function toCancelled(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $("#cancelled-wikittyId").val(id);
- $("#dialog-form-toCancelled" ).data("oldQuotation", oldQuotation).dialog( "open" );
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#cancelled-wikittyId").val(id);
+ $("#dialog-form-toCancelled" ).data("oldQuotation", oldQuotation).dialog( "open" );
};
//ajout ble
@@ -270,447 +270,447 @@
// * SALES FUNNEL *
// ********************************************************************
-
- //Passage d'un lead -> draft
- $("a.lead").click(leadToDraft);
- $( "#dialog-form-leadToDraft" ).dialog({
- autoOpen: false,
- height: 300,
- width: 350,
- modal: true,
- buttons: {
- Ok: function() {
+ //Passage d'un lead -> draft
+ $("a.lead").click(leadToDraft);
- var reference = $("#reference").val();
- var sendingDate = $("#sendingDate").val();
- var id = $("#lead-wikittyId").val();
- var oldQuotation = $(this).data('oldQuotation');
- var allFields = $([]).add($("#reference")).add($("#sendingDate")).add($("#lead-wikittyId"))
+ $( "#dialog-form-leadToDraft" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- var dialog = $( this );
+ var reference = $("#reference").val();
+ var sendingDate = $("#sendingDate").val();
+ var id = $("#lead-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#reference")).add($("#sendingDate")).add($("#lead-wikittyId"))
- $.post(createUrl("/sales/funnel/json/answer/", id,"?sendingDate=", sendingDate, "&reference=",reference),
- function(data){
- //success
- var wikittyId = data.meta.id;
- var wikitty = data.data;
+ var dialog = $( this );
- var li = $("<li></li>").addClass("salesFunnelItem draft");
+ $.post(createUrl("/sales/funnel/json/answer/", id,"?sendingDate=", sendingDate, "&reference=",reference),
+ function(data){
+ //success
+ var wikittyId = data.meta.id;
+ var wikitty = data.data;
- //leftDiv
- var leftDiv = $("<div></div>").addClass("pull-left");
- var aIconEdit = $("<a></a>")
- .attr("href", createUrl("/wikitty/edit/", wikittyId));
- var iconEdit = $("<i></i>").addClass("icon-edit");
- aIconEdit.append(iconEdit);
- leftDiv.append(aIconEdit);
- var smallAccount = $("<small></small>");
- if (wikitty["Quotation.customer"]!=null){
- var customer = data.preloaded[wikitty["Quotation.customer"]];
- var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
- var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
- var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
- }
- var aAccount = $("<a></a>")
- .text(firstName + " " + lastName + " (" + company + ")")
- .attr("href",createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
- smallAccount.append(aAccount);
- leftDiv.append(smallAccount);
- var leftP = $("<p> - </p>");
- var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
+ var li = $("<li></li>").addClass("salesFunnelItem draft");
- if (wikitty["Quotation.project"]!=null) {
- var aProject = $("<a/>")
- .addClass("nameLink")
- .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
- .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
- }
- itemTitleSpan.append(aProject);
- var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
- leftP.append(descriptionSmall);
- leftP.prepend(itemTitleSpan);
- leftDiv.append(leftP);
+ //leftDiv
+ var leftDiv = $("<div></div>").addClass("pull-left");
+ var aIconEdit = $("<a></a>")
+ .attr("href", createUrl("/wikitty/edit/", wikittyId));
+ var iconEdit = $("<i></i>").addClass("icon-edit");
+ aIconEdit.append(iconEdit);
+ leftDiv.append(aIconEdit);
+ var smallAccount = $("<small></small>");
+ if (wikitty["Quotation.customer"]!=null){
+ var customer = data.preloaded[wikitty["Quotation.customer"]];
+ var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
+ var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
+ var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
+ }
+ var aAccount = $("<a></a>")
+ .text(firstName + " " + lastName + " (" + company + ")")
+ .attr("href",createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
+ smallAccount.append(aAccount);
+ leftDiv.append(smallAccount);
+ var leftP = $("<p> - </p>");
+ var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
- //button
- var aSend = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-success pull-right salesFunnelItemButton draft")
- .text("Envoyer")
- .click(draftToSent);
+ if (wikitty["Quotation.project"]!=null) {
+ var aProject = $("<a/>")
+ .addClass("nameLink")
+ .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
+ .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
+ }
+ itemTitleSpan.append(aProject);
+ var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
+ leftP.append(descriptionSmall);
+ leftP.prepend(itemTitleSpan);
+ leftDiv.append(leftP);
- var aCancelled = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-warning pull-right salesFunnelItemButton toCancelled")
- .text("Annuler")
- .click(toCancelled);
+ //button
+ var aSend = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-success pull-right salesFunnelItemButton draft")
+ .text("Envoyer")
+ .click(draftToSent);
- //rightDiv
- var rightDiv = $("<div>").addClass("pull-right");
- var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
- if (wikitty["Quotation.category"] != null) {
- var smallInfo = $("<small>")
- .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
- + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
- wikitty["Quotation.conversionHope"] + "%");
- }
- rightDiv.append(rightP);
- rightDiv.append(smallInfo);
+ var aCancelled = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-warning pull-right salesFunnelItemButton toCancelled")
+ .text("Annuler")
+ .click(toCancelled);
- //clear:both
- var clearBoth=$("<div style='clear:both;'/>")
+ //rightDiv
+ var rightDiv = $("<div>").addClass("pull-right");
+ var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
+ if (wikitty["Quotation.category"] != null) {
+ var smallInfo = $("<small>")
+ .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
+ + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
+ wikitty["Quotation.conversionHope"] + "%");
+ }
+ rightDiv.append(rightP);
+ rightDiv.append(smallInfo);
- li.append(leftDiv);
- li.append(aSend);
- li.append(aCancelled);
- li.append(rightDiv);
- li.append(clearBoth);
+ //clear:both
+ var clearBoth=$("<div style='clear:both;'/>")
- var drafts = $(".drafts");
- drafts.append(li);
- oldQuotation.slideUp();
+ li.append(leftDiv);
+ li.append(aSend);
+ li.append(aCancelled);
+ li.append(rightDiv);
+ li.append(clearBoth);
- //update draftAmount and draftAmountHope
- var draftAmount = parseInt($("#draftAmount").text()) + wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var draftAmountHope = parseInt($("#draftAmountHope").text()) + amountHope;
- $("#draftAmount").text(draftAmount);
- $("#draftAmountHope").text(draftAmountHope);
+ var drafts = $(".drafts");
+ drafts.append(li);
+ oldQuotation.slideUp();
- //update leadAmount and leadAmountHope
- var leadAmount = parseInt($("#leadAmount").text()) - wikitty["Quotation.amount"];
- var leadAmountHope = parseInt($("#leadAmountHope").text()) - amountHope;
- $("#leadAmount").text(leadAmount);
- $("#leadAmountHope").text(leadAmountHope);
+ //update draftAmount and draftAmountHope
+ var draftAmount = parseInt($("#draftAmount").text()) + wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var draftAmountHope = parseInt($("#draftAmountHope").text()) + amountHope;
+ $("#draftAmount").text(draftAmount);
+ $("#draftAmountHope").text(draftAmountHope);
- allFields.val("");
+ //update leadAmount and leadAmountHope
+ var leadAmount = parseInt($("#leadAmount").text()) - wikitty["Quotation.amount"];
+ var leadAmountHope = parseInt($("#leadAmountHope").text()) - amountHope;
+ $("#leadAmount").text(leadAmount);
+ $("#leadAmountHope").text(leadAmountHope);
- dialog.dialog( "close" );
+ allFields.val("");
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- dialog.dialog( "close" );
- });
- },
- Cancel: function() {
- $( this ).dialog( "close" );
- }
- },
- close: function() {
- },
- open: function(event, ui) {
- var date = new Date();
- $("#sendingDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
- }
- });
+ dialog.dialog( "close" );
- //Passage d'un draft -> sent
- $("a.draft").click(draftToSent);
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#sendingDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
- $( "#dialog-form-draftToSent" ).dialog({
- autoOpen: false,
- height: 300,
- width: 350,
- modal: true,
- buttons: {
- Ok: function() {
+ //Passage d'un draft -> sent
+ $("a.draft").click(draftToSent);
- var sendingDate = $("#sendDate").val();
- var id = $("#draft-wikittyId").val();
- var oldQuotation = $(this).data('oldQuotation');
- var allFields = $([]).add($("#sendDate")).add($("#draft-wikittyId"))
+ $( "#dialog-form-draftToSent" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- var dialog = $( this );
+ var sendingDate = $("#sendDate").val();
+ var id = $("#draft-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#sendDate")).add($("#draft-wikittyId"))
- $.post(createUrl("/sales/funnel/json/send/", id,"?sendingDate=", sendingDate),
- function(data){
- //success
+ var dialog = $( this );
- var wikittyId = data.meta.id;
- var wikitty = data.data;
+ $.post(createUrl("/sales/funnel/json/send/", id,"?sendingDate=", sendingDate),
+ function(data){
+ //success
- var li = $("<li></li>").addClass("salesFunnelItem draft");
+ var wikittyId = data.meta.id;
+ var wikitty = data.data;
- //leftDiv
- var leftDiv = $("<div></div>").addClass("pull-left");
- var aIconEdit = $("<a></a>")
- .attr("href",createUrl("/wikitty/edit/", wikittyId));
- var iconEdit = $("<i></i>").addClass("icon-edit");
- aIconEdit.append(iconEdit);
- leftDiv.append(aIconEdit);
- var smallAccount = $("<small></small>");
- if (wikitty["Quotation.customer"]!=null){
- var customer = data.preloaded[wikitty["Quotation.customer"]];
- var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
- var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
- var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
- }
- var aAccount = $("<a></a>")
- .text(firstName + " " + lastName + " (" + company + ")")
- .attr("href", createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
- smallAccount.append(aAccount);
- leftDiv.append(smallAccount);
- var leftP = $("<p> - </p>");
- var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
+ var li = $("<li></li>").addClass("salesFunnelItem draft");
- if (wikitty["Quotation.project"]!=null) {
- var aProject = $("<a/>")
- .addClass("nameLink")
- .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
- .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
- }
- itemTitleSpan.append(aProject);
- var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
- leftP.append(descriptionSmall);
- leftP.prepend(itemTitleSpan);
- leftDiv.append(leftP);
+ //leftDiv
+ var leftDiv = $("<div></div>").addClass("pull-left");
+ var aIconEdit = $("<a></a>")
+ .attr("href",createUrl("/wikitty/edit/", wikittyId));
+ var iconEdit = $("<i></i>").addClass("icon-edit");
+ aIconEdit.append(iconEdit);
+ leftDiv.append(aIconEdit);
+ var smallAccount = $("<small></small>");
+ if (wikitty["Quotation.customer"]!=null){
+ var customer = data.preloaded[wikitty["Quotation.customer"]];
+ var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
+ var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
+ var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
+ }
+ var aAccount = $("<a></a>")
+ .text(firstName + " " + lastName + " (" + company + ")")
+ .attr("href", createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
+ smallAccount.append(aAccount);
+ leftDiv.append(smallAccount);
+ var leftP = $("<p> - </p>");
+ var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
- //button
- var aAccepted = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-success pull-right salesFunnelItemButton sent toAccepted")
- .text("Accepté")
- .click(sentToAccepted);
- var aRejected = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-danger pull-right salesFunnelItemButton sent toRejected")
- .text("Rejeté")
- .click(sentToRejected);
- var aCancelled = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-warning pull-right salesFunnelItemButton sent toCancelled")
- .text("Annuler")
- .click(toCancelled);
+ if (wikitty["Quotation.project"]!=null) {
+ var aProject = $("<a/>")
+ .addClass("nameLink")
+ .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
+ .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
+ }
+ itemTitleSpan.append(aProject);
+ var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
+ leftP.append(descriptionSmall);
+ leftP.prepend(itemTitleSpan);
+ leftDiv.append(leftP);
- //rightDiv
- var rightDiv = $("<div>").addClass("pull-right");
- var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
- if (wikitty["Quotation.category"] != null) {
- var smallInfo = $("<small>")
- .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
- + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
- wikitty["Quotation.conversionHope"] + "%");
- }
- rightDiv.append(rightP);
- rightDiv.append(smallInfo);
+ //button
+ var aAccepted = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-success pull-right salesFunnelItemButton sent toAccepted")
+ .text("Accepté")
+ .click(sentToAccepted);
+ var aRejected = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-danger pull-right salesFunnelItemButton sent toRejected")
+ .text("Rejeté")
+ .click(sentToRejected);
+ var aCancelled = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-warning pull-right salesFunnelItemButton sent toCancelled")
+ .text("Annuler")
+ .click(toCancelled);
- //clear:both
- var clearBoth=$("<div style='clear:both;'/>")
+ //rightDiv
+ var rightDiv = $("<div>").addClass("pull-right");
+ var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
+ if (wikitty["Quotation.category"] != null) {
+ var smallInfo = $("<small>")
+ .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
+ + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
+ wikitty["Quotation.conversionHope"] + "%");
+ }
+ rightDiv.append(rightP);
+ rightDiv.append(smallInfo);
- li.append(leftDiv);
- li.append(aAccepted);
- li.append(aRejected);
- li.append(aCancelled);
- li.append(rightDiv);
- li.append(clearBoth);
+ //clear:both
+ var clearBoth=$("<div style='clear:both;'/>")
- var sents = $(".sents");
- sents.append(li);
- oldQuotation.slideUp();
+ li.append(leftDiv);
+ li.append(aAccepted);
+ li.append(aRejected);
+ li.append(aCancelled);
+ li.append(rightDiv);
+ li.append(clearBoth);
- //update draftAmount and draftAmountHope
- var draftAmount = parseInt($("#draftAmount").text()) - wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var draftAmountHope = parseInt($("#draftAmountHope").text()) - amountHope;
- $("#draftAmount").text(draftAmount);
- $("#draftAmountHope").text(draftAmountHope);
+ var sents = $(".sents");
+ sents.append(li);
+ oldQuotation.slideUp();
- //update sentAmount and sentAmountHope
- var sentAmount = parseInt($("#sentAmount").text()) + wikitty["Quotation.amount"];
- var sentAmountHope = parseInt($("#sentAmountHope").text()) + amountHope;
- $("#sentAmount").text(sentAmount);
- $("#sentAmountHope").text(sentAmountHope);
+ //update draftAmount and draftAmountHope
+ var draftAmount = parseInt($("#draftAmount").text()) - wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var draftAmountHope = parseInt($("#draftAmountHope").text()) - amountHope;
+ $("#draftAmount").text(draftAmount);
+ $("#draftAmountHope").text(draftAmountHope);
- allFields.val("");
+ //update sentAmount and sentAmountHope
+ var sentAmount = parseInt($("#sentAmount").text()) + wikitty["Quotation.amount"];
+ var sentAmountHope = parseInt($("#sentAmountHope").text()) + amountHope;
+ $("#sentAmount").text(sentAmount);
+ $("#sentAmountHope").text(sentAmountHope);
- dialog.dialog( "close" );
+ allFields.val("");
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- dialog.dialog( "close" );
- });
+ dialog.dialog( "close" );
- },
- Cancel: function() {
- $( this ).dialog( "close" );
- }
- },
- close: function() {
- },
- open: function(event, ui) {
- var date = new Date();
- $("#sendDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
- }
- });
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
- //Passage d'un sent vers accepted
- $("a.toAccepted").click(sentToAccepted);
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#sendDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
- $( "#dialog-form-sentToAccepted" ).dialog({
- autoOpen: false,
- height: 300,
- width: 350,
- modal: true,
- buttons: {
- Ok: function() {
+ //Passage d'un sent vers accepted
+ $("a.toAccepted").click(sentToAccepted);
- var acceptedDate = $("#acceptedDate").val();
- var id = $("#sent-wikittyId").val();
- var oldQuotation = $(this).data('oldQuotation');
- var allFields = $([]).add($("#acceptedDate")).add($("#sent-wikittyId"))
+ $( "#dialog-form-sentToAccepted" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- var dialog = $( this );
+ var acceptedDate = $("#acceptedDate").val();
+ var id = $("#sent-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#acceptedDate")).add($("#sent-wikittyId"))
- $.post(createUrl("/sales/funnel/json/accept/", id,"?acceptedDate=", acceptedDate),
- function(data){
- //success
- oldQuotation.slideUp();
+ var dialog = $( this );
- var wikitty = data.data;
+ $.post(createUrl("/sales/funnel/json/accept/", id,"?acceptedDate=", acceptedDate),
+ function(data){
+ //success
+ oldQuotation.slideUp();
- //update sentAmount and sentAmountHope
- var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
- $("#sentAmount").text(sentAmount);
- $("#sentAmountHope").text(sentAmountHope);
+ var wikitty = data.data;
- allFields.val("");
+ //update sentAmount and sentAmountHope
+ var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
+ $("#sentAmount").text(sentAmount);
+ $("#sentAmountHope").text(sentAmountHope);
- dialog.dialog( "close" );
+ allFields.val("");
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- dialog.dialog( "close" );
- });
+ dialog.dialog( "close" );
- },
- Cancel: function() {
- $( this ).dialog( "close" );
- }
- },
- close: function() {
- },
- open: function(event, ui) {
- var date = new Date();
- $("#acceptedDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
- }
- });
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
- //Passage d'un sent vers rejected
- $("a.toRejected").click(sentToRejected);
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#acceptedDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
- $( "#dialog-form-sentToRejected" ).dialog({
- autoOpen: false,
- height: 300,
- width: 350,
- modal: true,
- buttons: {
- Ok: function() {
+ //Passage d'un sent vers rejected
+ $("a.toRejected").click(sentToRejected);
- var rejectedDate = $("#rejectedDate").val();
- var id = $("#rejected-wikittyId").val();
- var oldQuotation = $(this).data('oldQuotation');
- var allFields = $([]).add($("#rejectedDate")).add($("#rejected-wikittyId"))
+ $( "#dialog-form-sentToRejected" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- var dialog = $( this );
+ var rejectedDate = $("#rejectedDate").val();
+ var id = $("#rejected-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#rejectedDate")).add($("#rejected-wikittyId"))
- $.post(createUrl("/sales/funnel/json/reject/", id,"?rejectedDate=", rejectedDate),
- function(data){
- //success
- oldQuotation.slideUp();
+ var dialog = $( this );
- var wikitty = data.data;
+ $.post(createUrl("/sales/funnel/json/reject/", id,"?rejectedDate=", rejectedDate),
+ function(data){
+ //success
+ oldQuotation.slideUp();
- //update sentAmount and sentAmountHope
- var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
- $("#sentAmount").text(sentAmount);
- $("#sentAmountHope").text(sentAmountHope);
+ var wikitty = data.data;
- allFields.val("");
+ //update sentAmount and sentAmountHope
+ var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
+ $("#sentAmount").text(sentAmount);
+ $("#sentAmountHope").text(sentAmountHope);
- dialog.dialog( "close" );
+ allFields.val("");
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- dialog.dialog( "close" );
- });
+ dialog.dialog( "close" );
- },
- Cancel: function() {
- $( this ).dialog( "close" );
- }
- },
- close: function() {
- },
- open: function(event, ui) {
- var date = new Date();
- $("#rejectedDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
- }
- });
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
- //Passage vers cancelled
- $("a.toCancelled").click(toCancelled);
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#rejectedDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
- $( "#dialog-form-toCancelled" ).dialog({
- autoOpen: false,
- height: 300,
- width: 350,
- modal: true,
- buttons: {
- Ok: function() {
+ //Passage vers cancelled
+ $("a.toCancelled").click(toCancelled);
- var cancelledDate = $("#cancelledDate").val();
- var reason = $("#cancelledReason").val();
- var id = $("#cancelled-wikittyId").val();
- var oldQuotation = $(this).data('oldQuotation');
- var allFields = $([]).add($("#cancelledDate")).add($("#cancelled-wikittyId")).add($("#cancelledReason"));
+ $( "#dialog-form-toCancelled" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- var dialog = $( this );
+ var cancelledDate = $("#cancelledDate").val();
+ var reason = $("#cancelledReason").val();
+ var id = $("#cancelled-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#cancelledDate")).add($("#cancelled-wikittyId")).add($("#cancelledReason"));
- $.post(createUrl("/sales/funnel/json/cancel/", id,"?cancelledDate=", cancelledDate,"&reason=",reason),
- function(data){
- //success
- oldQuotation.slideUp();
+ var dialog = $( this );
- var wikitty = data.data;
+ $.post(createUrl("/sales/funnel/json/cancel/", id,"?cancelledDate=", cancelledDate,"&reason=",reason),
+ function(data){
+ //success
+ oldQuotation.slideUp();
- //TODO JC20130527 update amounts
- //update sentAmount and sentAmountHope
- //var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
- //var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- //var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
- //$("#sentAmount").text(sentAmount);
- //$("#sentAmountHope").text(sentAmountHope);
+ var wikitty = data.data;
- allFields.val("");
- dialog.dialog( "close" );
+ //TODO JC20130527 update amounts
+ //update sentAmount and sentAmountHope
+ //var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
+ //var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ //var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
+ //$("#sentAmount").text(sentAmount);
+ //$("#sentAmountHope").text(sentAmountHope);
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- dialog.dialog( "close" );
- });
+ allFields.val("");
+ dialog.dialog( "close" );
- },
- Cancel: function() {
- $( this ).dialog( "close" );
- }
- },
- close: function() {
- },
- open: function(event, ui) {
- var date = new Date();
- $("#cancelledDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
- }
- });
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#cancelledDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
+
// ********************************************************************
// * PROJECT DASHBOARD *
// ********************************************************************
@@ -724,87 +724,82 @@
function displayFields() {
var id = $(this).attr('wikittyId');
-
+ $("#upgradeFields-" + id).slideUp();
if(this.selectedIndex == 0) {
$("#upgradeFields-" + id).text("");
}
else
{
- $("#upgradeFields-" + id ).text("Loading fields for " + this.item(this.selectedIndex).label + "...");
+
var extensionName = this.item(this.selectedIndex).label;
-
$.get(createUrl("/project/json/getExtension/", extensionName, "/" + $(this).attr('wikittyId')),
function(data){
- //success
- var $jData = $(data);
-
-
- $("#upgradeFields-" + id).html($jData[0].outerHTML);//.innerHTML);
- initFields();
+ //success
+ var $jData = $(data);
+
+ $("#upgradeFields-" + id).html($jData[0].outerHTML);//.innerHTML);
+ initFields();
+ $("#upgradeFields-" + id).slideDown();
+
});
}
}
$("a.upgrade").click(upgradeQuotation);
$("select.extBox").change(displayFields);
+
$("#project_hidden").change(function() {
$("#projectSearch").submit();
});
- function initgantt() {
-
- var id = $(this).attr('wikittyId');
-
-
- "use strict";
-
-
-
- $(".gantt-"+id).gantt({
- source: ganttData[id]['src'],
- dateStart: ganttData[id]['startDate'],
- dateEnd:ganttData[id]['endDate'],
- extDate : {
- "Draft sent" : ganttData[id]['sendingDate'],
- "Sent" : ganttData[id]['postedDate'],
- "Accepted" : ganttData[id]['acceptedDate'],
- "Started" : ganttData[id]['startedDate'],
- "Delivered" : ganttData[id]['deliveryDate'],
- "RSV started" : ganttData[id]['rsvStart'],
- "Warranty Started" : ganttData[id]['warrantyStart'],
- "Closed" : ganttData[id]['closedDate'],
- "Rejected" : ganttData[id]['rejectedDate'],
- "Cancelled" : ganttData[id]['cancelledDate']
- },
- draftSent:ganttData[id]['draftSent'],
- navigate: "scroll",
- scale: "days",
- maxScale: "months",
- minScale: "days",
- itemsPerPage: 10,
- onItemClick: function(data) {
- alert("Item clicked - show some details");
- },
- onAddClick: function(dt, rowId) {
- alert("Empty space clicked - add an item!");
- },
- onRender: function() {
- if (window.console && typeof console.log === "function") {
- console.log("chart rendered");
+ $("#quotationFilter").change(function() {
+ if($("#project_hidden").val() != "")
+ $("#projectSearch").submit();
+ });
+ function initgantt(id) {
+ "use strict";
+ $.get(createUrl("/project/json/getGanttInfo/",id),
+ function(ret){
+ var data = ret['data'];
+ console.log(data);
+ if(data['source'].length != 0) {
+ $(".gantt-"+id).gantt({
+ source: data['source'],
+ dateStart: data['dateStart'],
+ dateEnd:data['dateEnd'],
+ extDate : data['extDate'],
+ navigate: "scroll",
+ scale: "days",
+ maxScale: "months",
+ minScale: "days",
+ itemsPerPage: 10,
+ onItemClick: function(data) {
+ alert("Item clicked - show some details");
+ },
+ onAddClick: function(dt, rowId) {
+ alert("Empty space clicked - add an item!");
+ },
+ onRender: function() {
+ if (window.console && typeof console.log === "function") {
+ console.log("chart rendered");
+
+ }
}
- }
- });
-
-
-
-
- prettyPrint();
- }
+ });
+ }
+ });
- $("a.ganttinit").click(initgantt);
-
+ }
+ for(var i = 0; i < $('.gantt').length; i++) {
+ var div = $('.gantt')[i];
+ console.log(div);
+ initgantt(div.attributes.wikittyid.nodeValue);
+ }
+
+
+
});
\ No newline at end of file
Modified: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2013-06-26 09:30:51 UTC (rev 347)
+++ trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2013-06-27 14:07:10 UTC (rev 348)
@@ -1027,24 +1027,88 @@
var cd = Date.parse(new Date());
cd = (Math.floor(cd / 36400000) * 36400000);
$(element).find(':findweek("' + cd + '")').removeClass('wd').addClass('today');
+
+ var str = "";
+
+ var start = $(element).find(':findweek("' + Date.parse(tools.dateDeserialize(settings.dateStart)) + '")');
+ if(start.attr('over') != null)
+ str = start.attr("over") + "<br />";
+ str += "Project start";
+ start.removeClass('wd').addClass('begin').attr('over',str);
+ str="";
+ var end = $(element).find(':findweek("' + Date.parse(tools.dateDeserialize(settings.dateEnd)) + '")');
+ if(end.attr('over') != null)
+ str = end.attr("over") + "<br />";
+ str += "Project end";
+ end.removeClass('wd').addClass('end').attr('over',str);
+
+ for(var key in settings.extDate) {
+ if(settings.extDate[key] != undefined) {
+ str="";
+ var event = $(element).find(':findweek("' + Date.parse(tools.dateDeserialize(settings.extDate[key])) + '")');
+ if(event.attr('over') != null)
+ str = event.attr("over") + "<br />";
+ str += key;
+ event.removeClass('wd').addClass('event').attr('over',str);
+ }
+ }
break;
case "months":
$(element).find(':findmonth("' + new Date().getTime() + '")').removeClass('wd').addClass('today');
+
+ var str = "";
+
+ var start = $(element).find(':findmonth("' + Date.parse(tools.dateDeserialize(settings.dateStart)) + '")');
+ if(start.attr('over') != null)
+ str = start.attr("over") + "<br />";
+ str += "Project start";
+ start.removeClass('wd').addClass('begin').attr('over',str);
+ str="";
+ var end = $(element).find(':findmonth("' + Date.parse(tools.dateDeserialize(settings.dateEnd)) + '")');
+ if(end.attr('over') != null)
+ str = end.attr("over") + "<br />";
+ str += "Project end";
+ end.removeClass('wd').addClass('end').attr('over',str);
+
+ for(var key in settings.extDate) {
+
+ if(settings.extDate[key] != undefined) {
+ str="";
+ var event = $(element).find(':findmonth("' + Date.parse(tools.dateDeserialize(settings.extDate[key])) + '")');
+ if(event.attr('over') != null)
+ str = event.attr("over") + "<br />";
+ str += key;
+ event.removeClass('wd').addClass('event').attr('over',str);
+ }
+ }
break;
default:
var cd = Date.parse(new Date());
cd = (Math.floor(cd / 36400000) * 36400000);
$(element).find(':findday("' + cd + '")').removeClass('wd').addClass('today');
- var bd = Date.parse(tools.dateDeserialize(settings.dateStart));
- //bd = (Math.floor(bd / 36400000) * 36400000);
- $(element).find(':findday("' + bd + '")').removeClass('wd').addClass('begin').attr('over',"Project start");
+ var str = "";
- $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.dateEnd)) + '")').removeClass('wd').addClass('end').attr('over',"Project end");
- console.log(settings.extDate);
+ var start = $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.dateStart)) + '")');
+ if(start.attr('over') != null)
+ str = start.attr("over") + "<br />";
+ str += "Project start";
+ start.removeClass('wd').addClass('begin').attr('over',str);
+ str="";
+ var end = $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.dateEnd)) + '")');
+ if(end.attr('over') != null)
+ str = end.attr("over") + "<br />";
+ str += "Project end";
+ end.removeClass('wd').addClass('end').attr('over',str);
+
for(var key in settings.extDate) {
- console.log("passe");
- if(settings.extDate[key] != undefined)
- $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.extDate[key])) + '")').removeClass('wd').addClass('event').attr('over',key);
+ if(settings.extDate[key] != undefined) {
+ str="";
+ var event = $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.extDate[key])) + '")');
+ if(event.attr('over') != null)
+ str = event.attr("over") + "<br />";
+ str += key;
+ event.removeClass('wd').addClass('event').attr('over',str);
+ }
}
break;
}
1
0
r347 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/project resources webapp/WEB-INF/jsp webapp/css webapp/img webapp/img/jquery.fn.gantt webapp/js
by meynier＠users.chorem.org June 26, 2013
by meynier＠users.chorem.org June 26, 2013
June 26, 2013
Author: meynier
Date: 2013-06-26 11:30:51 +0200 (Wed, 26 Jun 2013)
New Revision: 347
Url: http://chorem.org/projects/chorem/repository/revisions/347
Log:
Added gantt diagram in project dashboard with modified jquery.fn.gantt library
Added:
trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png
trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
Removed:
trunk/chorem-webmotion/src/main/webapp/js/jQueryGantt/
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/Extensions.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
trunk/chorem-webmotion/src/main/webapp/js/chorem.js
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-06-25 09:55:33 UTC (rev 346)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-06-26 09:30:51 UTC (rev 347)
@@ -1,6 +1,8 @@
package org.chorem.webmotion.actions.project;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.TreeMap;
@@ -19,6 +21,7 @@
import org.nuiton.wikitty.query.WikittyQuery;
import org.nuiton.wikitty.query.WikittyQueryMaker;
import org.nuiton.wikitty.query.WikittyQueryResult;
+import com.google.gson.*;
/**
*
* @author meynier
@@ -35,6 +38,8 @@
WikittyQueryResult<Quotation> quotationResult = null;
WikittyQueryResult<Task> taskResult = null;
HashMap<Quotation, List<Task>> taskMap = new HashMap<Quotation, List<Task>>();
+
+ HashMap<Quotation, String> jSonTaskMap = new HashMap<Quotation, String>();
//HashMap<Quotation, String> extMap = new HashMap<Quotation, String>();
//Fetch the project form the name (if it has been requested)
@@ -68,8 +73,16 @@
taskResult = client.findAllByQuery(Task.class, taskQuery);
taskMap.put(quote, taskResult.getAll());
-
-
+ List<JTask> lTask = new ArrayList<JTask>();
+ for(Task t : taskResult.getAll()) {
+ Values[] v = new Values[1];
+ v[0] = new Values(t.getBeginDate(), t.getEndDate(), t.getName(), "ganttRed");
+ JTask jt = new JTask(t.getName(), t.getDescription(), v);
+
+ lTask.add(jt);
+ }
+ Gson g = new Gson();
+ jSonTaskMap.put(quote, g.toJson(lTask));
}
}
@@ -89,7 +102,7 @@
else {
return renderView("dashboardSingleProject.jsp",
"title", "Tableau de bord projet", "projects", projectResult.getAll(),
- "quotations", quotationResult.getAll(), "taskMap", taskMap, "extensions",
+ "quotations", quotationResult.getAll(), "taskMap", taskMap,"jSonTaskMap",jSonTaskMap, "extensions",
Extensions.extensions);
}
}
@@ -121,4 +134,29 @@
return null;
}*/
+
+ private class JTask {
+ private String name;
+ private String desc;
+ private Values[] values;
+ public JTask(String name, String desc, Values[] values) {
+ this.name = name;
+ this.desc = desc;
+ this.values = values;
+ }
+
+ }
+ private class Values{
+ private String from;
+ private String to;
+ private String label;
+ private String customClass;
+ public Values(Date from, Date to, String label, String customClass) {
+ this.from = "/Date(" + from.getTime() + ")/";
+ this.to = "/Date(" + to.getTime() + ")/";
+ this.label = label;
+ this.customClass = customClass;
+ }
+
+ }
}
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/Extensions.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/Extensions.java 2013-06-25 09:55:33 UTC (rev 346)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/Extensions.java 2013-06-26 09:30:51 UTC (rev 347)
@@ -11,6 +11,7 @@
"Delivered",
"RSV",
"Warranty",
- "Closed"
+ "Closed",
+ "Cancelled"
};
}
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2013-06-25 09:55:33 UTC (rev 346)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2013-06-26 09:30:51 UTC (rev 347)
@@ -69,7 +69,7 @@
c.add(extensionName);
Wikitty wikitty = client.restore(id);
List<WikittyExtension> extensions = client.restoreExtensionAndDependenciesLastVesion(c);
-
+ System.out.println(extensions);
extensions.removeAll(wikitty.getExtensions());
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2013-06-25 09:55:33 UTC (rev 346)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2013-06-26 09:30:51 UTC (rev 347)
@@ -10,6 +10,7 @@
* /wikitty-json/* DecoratorFilter.decorate wmDecoratorNo=true
* /fragment/* DecoratorFilter.decorate wmDecoratorNo=true
* /sales/funnel/json/* DecoratorFilter.decorate wmDecoratorNo=true
+* /project/json/* DecoratorFilter.decorate wmDecoratorNo=true
GET /* DecoratorFilter.decorate
* /* AuthenticationFilter.check
#####
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-06-25 09:55:33 UTC (rev 346)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-06-26 09:30:51 UTC (rev 347)
@@ -26,6 +26,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%>
+
+<link rel="stylesheet" href="<c:url value='/css/jquery.fn.gantt.css'/>" />
<h1>${title}</h1>
<form class="well form-inline" method="GET" id="projectSearch">
@@ -70,7 +72,7 @@
-
+<script>var ganttData = new Array();</script>
<c:forEach var="q" items="${quotations}">
<table class="table table-striped table-bordered table-condensed">
<thead>
@@ -104,9 +106,6 @@
fqfield="Quotation.amount" label="" /></td>
</tr>
</tbody>
-
-
-
</table>
@@ -116,9 +115,43 @@
<w:display wikitty="${q.wikitty}" fqfield="Interval.endDate"
label="" />
</p>
+ <a class="ganttinit" wikittyId="${q.wikittyId}" href="#">Afficher Gantt</a>
+ <div class="gantt-${q.wikittyId}" data =''></div>
+
+ <c:set var="script" value="ganttData['${q.wikittyId}'] = {src:${jSonTaskMap[q]},
+ startDate:'/Date(${q.beginDate.time})/',
+ endDate:'/Date(${q.endDate.time})/'
+ "/>
+
+ <%
+ java.util.HashMap<String,String> dateMap = new java.util.HashMap<String,String>();
+ dateMap.put("sendingDate", "Draft");
+ dateMap.put("postedDate", "Sent");
+ dateMap.put("acceptedDate", "Accepted");
+ dateMap.put("startedDate", "Started");
+ dateMap.put("deliveryDate", "Delivered");
+ dateMap.put("rsvStart", "RSV");
+ dateMap.put("warrantyStart", "Warranty");
+ dateMap.put("closedDate", "Closed");
+ dateMap.put("rejectedDate", "Rejected");
+ dateMap.put("cancelledDate", "Cancelled");
+ pageContext.setAttribute("dateMap", dateMap);
+ %>
+
+ <c:forEach items="${dateMap}" var="entry">
+ <c:if test='${q.wikitty.hasExtension(entry.value)}'>
+ <c:set var="script" value="${script},${entry.key} :'/Date(${q.wikitty.getFieldAsObject(entry.value, entry.key).time})/'"/>
+ </c:if>
+ </c:forEach>
+
+ <c:set var="script" value="${script}};"/>
+
+ <script>
+ ${script}
+ </script>
+
<p>Liste des tâches :</p>
<c:forEach items="${taskMap}" var="entry">
-
<c:if test="${entry.key.equals(q)}">
<ul>
<c:forEach items="${entry.value}" var="task">
@@ -133,53 +166,24 @@
</c:forEach>
<p>
- <select class="extBox" name="extList" wikittyId="${q.wikittyId}">
- <option>Transformer en...</option>
- <c:forEach items="${extensions}" var="ext">
-
- <c:set var="contains" value="false" />
- <c:forEach var="item" items="${q.extensionNames}">
- <c:if test="${item eq ext}">
- <c:set var="contains" value="true" />
+ <select class="extBox" name="extList" wikittyId="${q.wikittyId}">
+ <option>Transformer en...</option>
+ <c:forEach items="${extensions}" var="ext">
+ <c:set var="contains" value="false" />
+ <c:forEach var="item" items="${q.extensionNames}">
+ <c:if test="${item eq ext}">
+ <c:set var="contains" value="true" />
+ </c:if>
+ </c:forEach>
+ <c:if test="${contains == false}">
+ <option>${ext}</option>
</c:if>
</c:forEach>
-
- <c:if test="${contains == false}">
- <option>${ext}</option>
- </c:if>
-
- </c:forEach>
- </select>
+ </select>
</p>
- <div id="upgradeFields-${q.wikittyId}">
+ <div id="upgradeFields-${q.wikittyId}"></div>
+
- </div>
-
- <!--
-
- <form class="form-horizontal" method="post"
- accept-charset="ISO-8859-15"
- action="<c:url value="/wikitty/upgrade"/>"
- enctype="multipart/form-data">
- <input type="hidden" name="id" value="${q.wikittyId}">
- <c:if test="${extMap[q] != null}">
- <fieldset>
- <input type="hidden" name="extension" value="${extMap[q].name}">
- <c:forEach items="${extMap[q].fieldNames}" var="field">
- ${field}
- <div class="control-group">
- <label class="control-label">${fieldName}</label>
- <div class="controls">
- <w:input wikitty="${q.wikitty}"
- fqfield="${extMap[q].name}.${field}" extension="${extMap[q]}" />
- </div>
- </div>
- </c:forEach>
- <input type="submit" value="Tranformer en ${extMap[q].name}" />
- </fieldset>
- </c:if>
- </form>
- -->
</c:forEach>
</c:when>
@@ -197,9 +201,9 @@
+<script src="<c:url value='/js/jquery.fn.gantt.js'/>"></script>
-
Added: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2013-06-26 09:30:51 UTC (rev 347)
@@ -0,0 +1,440 @@
+.gantt, .gantt2 {
+ width: 100%;
+ margin: 20px auto;
+ border: 14px solid #ddd;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.gantt:after {
+ content: ".";
+ visibility: hidden;
+ display: block;
+ height: 0;
+ clear: both;
+}
+
+.fn-gantt {
+ width: 100%;
+}
+
+.fn-gantt .fn-content {
+ overflow: hidden;
+ position: relative;
+ width: 100%;
+}
+
+
+
+
+/* === LEFT PANEL === */
+
+.fn-gantt .leftPanel {
+ float: left;
+ width: 225px;
+ overflow: hidden;
+ border-right: 1px solid #DDD;
+ position: relative;
+ z-index: 20;
+}
+
+.fn-gantt .row {
+ float: left;
+ height: 24px;
+ line-height: 24px;
+ margin-left: -24px;
+}
+
+.fn-gantt .leftPanel .fn-label {
+ display: inline-block;
+ margin: 0 0 0 5px;
+ color: #484A4D;
+ width: 110px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.fn-gantt .leftPanel .row0 {
+ border-top: 1px solid #DDD;
+}
+.fn-gantt .leftPanel .name, .fn-gantt .leftPanel .desc {
+ float: left;
+ height: 23px;
+ margin: 0;
+ border-bottom: 1px solid #DDD;
+ background-color: #f6f6f6;
+}
+
+.fn-gantt .leftPanel .name {
+ width: 110px;
+ font-weight: bold;
+}
+
+.fn-gantt .leftPanel .desc {
+ width: 115px;
+}
+
+.fn-gantt .leftPanel .fn-wide, .fn-gantt .leftPanel .fn-wide .fn-label {
+ width: 225px;
+}
+
+.fn-gantt .spacer {
+ margin: -2px 0 1px 0;
+ border-bottom: none;
+ background-color: #f6f6f6;
+}
+
+
+
+
+/* === RIGHT PANEL === */
+
+.fn-gantt .rightPanel {
+ overflow: hidden;
+}
+
+.fn-gantt .dataPanel {
+ margin-left: 0px;
+ border-right: 1px solid #DDD;
+ background-image: url(../img/jquery.fn.gantt/grid.png);
+ background-repeat: repeat;
+ background-position: 24px 24px;
+}
+.fn-gantt .day, .fn-gantt .date {
+ overflow: visible;
+ width: 24px;
+ line-height: 24px;
+ text-align: center;
+ border-left: 1px solid #DDD;
+ border-bottom: 1px solid #DDD;
+ margin: -1px 0 0 -1px;
+ font-size: 11px;
+ color: #484a4d;
+ text-shadow: 0 1px 0 rgba(255,255,255,0.75);
+ text-align: center;
+}
+
+.fn-gantt .holiday {
+ background-color: #ffd263;
+ height: 23px;
+ margin: 0 0 -1px -1px;
+}
+
+
+
+.fn-gantt .sa, .fn-gantt .sn, .fn-gantt .wd {
+ height: 23px;
+ margin: 0 0 0 -1px;
+ text-align: center;
+}
+
+.fn-gantt .sa, .fn-gantt .sn {
+ color: #939496;
+ background-color: #f5f5f5;
+ text-align: center;
+}
+
+.fn-gantt .wd {
+ background-color: #f6f6f6;
+ text-align: center;
+}
+
+.fn-gantt .today {
+ background-color: #fff8da;
+ height: 23px;
+ margin: 0 0 -1px -1px;
+ font-weight: bold;
+ text-align: center;
+}
+
+.fn-gantt .begin, .gn-gantt .end, .fn-gantt .event {
+ height: 23px;
+ margin: 0 0 -1px -1px;
+ font-weight: bold;
+ text-align: center;
+
+}
+
+.fn-gantt .begin {
+ background-color: #55cc11;
+}
+.fn-gantt .end {
+ background-color: #cc5511;
+}
+
+.fn-gantt .event {
+ background-color: #55aaee;
+}
+
+
+.fn-gantt .rightPanel .month, .fn-gantt .rightPanel .year {
+ float: left;
+ overflow: hidden;
+ border-left: 1px solid #DDD;
+ border-bottom: 1px solid #DDD;
+ height: 23px;
+ margin: 0 0 0 -1px;
+ background-color: #f6f6f6;
+ font-weight: bold;
+ font-size: 11px;
+ color: #484a4d;
+ text-shadow: 0 1px 0 rgba(255,255,255,0.75);
+ text-align: center;
+}
+
+.fn-gantt-hint {
+ border: 5px solid #edc332;
+ background-color: #fff5d4;
+ padding: 10px;
+ position: absolute;
+ display: none;
+ z-index: 20;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+
+.fn-gantt .bar {
+ background-color: #D0E4FD;
+ height: 18px;
+ margin: 4px 3px 3px 3px;
+ position: absolute;
+ z-index: 10;
+ text-align: center;
+ -webkit-box-shadow: 0 0 1px rgba(0,0,0,0.25) inset;
+ -moz-box-shadow: 0 0 1px rgba(0,0,0,0.25) inset;
+ box-shadow: 0 0 1px rgba(0,0,0,0.25) inset;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+.fn-gantt .bar .fn-label {
+ line-height: 18px;
+ font-weight: bold;
+ white-space: nowrap;
+ width: 100%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ text-shadow: 0 1px 0 rgba(255,255,255,0.4);
+ color: #414B57 !important;
+ text-align: center;
+ font-size: 11px;
+}
+
+.fn-gantt .ganttRed {
+ background-color: #F9C4E1;
+}
+.fn-gantt .ganttRed .fn-label {
+ color: #78436D !important;
+}
+
+.fn-gantt .ganttGreen {
+ background-color: #D8EDA3;
+}
+.fn-gantt .ganttGreen .fn-label {
+ color: #778461 !important;
+}
+
+.fn-gantt .ganttOrange {
+ background-color: #FCD29A;
+}
+.fn-gantt .ganttOrange .fn-label {
+ color: #714715 !important;
+}
+
+
+/* === BOTTOM NAVIGATION === */
+
+.fn-gantt .bottom {
+ clear: both;
+ background-color: #f6f6f6;
+ width: 100%;
+}
+.fn-gantt .navigate {
+ border-top: 1px solid #DDD;
+ padding: 10px 0 10px 225px;
+}
+
+.fn-gantt .navigate .nav-slider {
+ height: 20px;
+ display: inline-block;
+}
+
+.fn-gantt .navigate .nav-slider-left, .fn-gantt .navigate .nav-slider-right {
+ text-align: center;
+ height: 20px;
+ display: inline-block;
+}
+
+.fn-gantt .navigate .nav-slider-left {
+ float: left;
+}
+
+.fn-gantt .navigate .nav-slider-right {
+ float: right;
+}
+
+.fn-gantt .navigate .nav-slider-content {
+ text-align: left;
+ width: 160px;
+ height: 20px;
+ display: inline-block;
+ margin: 0 10px;
+}
+
+.fn-gantt .navigate .nav-slider-bar, .fn-gantt .navigate .nav-slider-button {
+ position: absolute;
+ display: block;
+}
+
+.fn-gantt .navigate .nav-slider-bar {
+ width: 155px;
+ height: 6px;
+ background-color: #838688;
+ margin: 8px 0 0 0;
+ -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.6) inset;
+ -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.6) inset;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.6) inset;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+.fn-gantt .navigate .nav-slider-button {
+ width: 17px;
+ height: 60px;
+ background: url(../img/jquery.fn.gantt/slider_handle.png) center center no-repeat;
+ left: 0px;
+ top: 0px;
+ margin: -26px 0 0 0;
+ cursor: pointer;
+}
+
+.fn-gantt .navigate .page-number {
+ display: inline-block;
+ font-size: 10px;
+ height: 20px;
+}
+
+.fn-gantt .navigate .page-number span {
+ color: #666666;
+ margin: 0 6px;
+ height: 20px;
+ line-height: 20px;
+ display: inline-block;
+}
+
+.fn-gantt .navigate a:link, .fn-gantt .navigate a:visited, .fn-gantt .navigate a:active {
+ text-decoration: none;
+}
+
+.fn-gantt .nav-link {
+ margin: 0 3px 0 0;
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ font-size: 0px;
+ background: #595959 url(../img/jquery.fn.gantt/icon_sprite.png) !important;
+ border: 1px solid #454546;
+ cursor: pointer;
+ vertical-align: top;
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.1) inset, 0 1px 1px rgba(0,0,0,0.2);
+ -moz-box-shadow: 0 1px 0 rgba(255,255,255,0.1) inset, 0 1px 1px rgba(0,0,0,0.2);
+ box-shadow: 0 1px 0 rgba(255,255,255,0.1) inset, 0 1px 1px rgba(0,0,0,0.2);
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.fn-gantt .nav-link:active {
+ -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.25) inset, 0 1px 0 #FFF;
+ -moz-box-shadow: 0 1px 1px rgba(0,0,0,0.25) inset, 0 1px 0 #FFF;
+ box-shadow: 0 1px 1px rgba(0,0,0,0.25) inset, 0 1px 0 #FFF;
+}
+
+.fn-gantt .navigate .nav-page-back {
+ background-position: 1px 0 !important;
+ margin: 0;
+}
+
+.fn-gantt .navigate .nav-page-next {
+ background-position: 1px -16px !important;
+ margin-right: 15px;
+}
+
+.fn-gantt .navigate .nav-slider .nav-page-next {
+ margin-right: 5px;
+}
+
+.fn-gantt .navigate .nav-begin {
+ background-position: 1px -112px !important;
+}
+
+.fn-gantt .navigate .nav-prev-week {
+ background-position: 1px -128px !important;
+}
+
+.fn-gantt .navigate .nav-prev-day {
+ background-position: 1px -48px !important;
+}
+
+.fn-gantt .navigate .nav-next-day {
+ background-position: 1px -64px !important;
+}
+
+.fn-gantt .navigate .nav-next-week {
+ background-position: 1px -160px !important;
+}
+
+.fn-gantt .navigate .nav-end {
+ background-position: 1px -144px !important;
+}
+
+.fn-gantt .navigate .nav-zoomOut {
+ background-position: 1px -96px !important;
+}
+
+.fn-gantt .navigate .nav-zoomIn {
+ background-position: 1px -80px !important;
+ margin-left: 15px;
+}
+
+.fn-gantt .navigate .nav-now {
+ background-position: 1px -32px !important;
+}
+
+.fn-gantt .navigate .nav-slider .nav-now {
+ margin-right: 5px;
+}
+
+.fn-gantt-loader {
+ background-image: url(../img/jquery.fn.gantt/loader_bg.png);
+ z-index: 30;
+}
+
+.fn-gantt-loader-spinner {
+ width: 100px;
+ height: 20px;
+ position: absolute;
+ margin-left: 50%;
+ margin-top: 50%;
+ text-align: center;
+}
+.fn-gantt-loader-spinner span {
+ color: #fff;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+.row:after {
+ clear: both;
+}
+
Added: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png
===================================================================
(Binary files differ)
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png
===================================================================
(Binary files differ)
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png
===================================================================
(Binary files differ)
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-25 09:55:33 UTC (rev 346)
+++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-26 09:30:51 UTC (rev 347)
@@ -724,6 +724,7 @@
function displayFields() {
var id = $(this).attr('wikittyId');
+
if(this.selectedIndex == 0) {
$("#upgradeFields-" + id).text("");
}
@@ -732,25 +733,78 @@
$("#upgradeFields-" + id ).text("Loading fields for " + this.item(this.selectedIndex).label + "...");
var extensionName = this.item(this.selectedIndex).label;
+
$.get(createUrl("/project/json/getExtension/", extensionName, "/" + $(this).attr('wikittyId')),
function(data){
- //success
- var $jData = $(data);
-
+ //success
+ var $jData = $(data);
+
+
+ $("#upgradeFields-" + id).html($jData[0].outerHTML);//.innerHTML);
+ initFields();
- $("#upgradeFields-" + id).html($jData.html());//.innerHTML);
- initFields();
-
-
-
-
});
}
}
-$("a.upgrade").click(upgradeQuotation);
-$("select.extBox").change(displayFields);
-$("#project_hidden").change(function() {
- $("#projectSearch").submit();
-});
+ $("a.upgrade").click(upgradeQuotation);
+ $("select.extBox").change(displayFields);
+ $("#project_hidden").change(function() {
+ $("#projectSearch").submit();
+ });
+ function initgantt() {
+
+ var id = $(this).attr('wikittyId');
+
+
+ "use strict";
+
+
+
+ $(".gantt-"+id).gantt({
+ source: ganttData[id]['src'],
+ dateStart: ganttData[id]['startDate'],
+ dateEnd:ganttData[id]['endDate'],
+ extDate : {
+ "Draft sent" : ganttData[id]['sendingDate'],
+ "Sent" : ganttData[id]['postedDate'],
+ "Accepted" : ganttData[id]['acceptedDate'],
+ "Started" : ganttData[id]['startedDate'],
+ "Delivered" : ganttData[id]['deliveryDate'],
+ "RSV started" : ganttData[id]['rsvStart'],
+ "Warranty Started" : ganttData[id]['warrantyStart'],
+ "Closed" : ganttData[id]['closedDate'],
+ "Rejected" : ganttData[id]['rejectedDate'],
+ "Cancelled" : ganttData[id]['cancelledDate']
+ },
+ draftSent:ganttData[id]['draftSent'],
+ navigate: "scroll",
+ scale: "days",
+ maxScale: "months",
+ minScale: "days",
+ itemsPerPage: 10,
+ onItemClick: function(data) {
+ alert("Item clicked - show some details");
+ },
+ onAddClick: function(dt, rowId) {
+ alert("Empty space clicked - add an item!");
+ },
+ onRender: function() {
+ if (window.console && typeof console.log === "function") {
+ console.log("chart rendered");
+ }
+ }
+ });
+
+
+
+
+ prettyPrint();
+
+ }
+
+ $("a.ganttinit").click(initgantt);
+
+
+
});
\ No newline at end of file
Added: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2013-06-26 09:30:51 UTC (rev 347)
@@ -0,0 +1,1807 @@
+// jQuery Gantt Chart
+// ==================
+
+// Basic usage:
+
+// $(".selector").gantt({
+// source: "ajax/data.json",
+// scale: "weeks",
+// minScale: "weeks",
+// maxScale: "months",
+// onItemClick: function(data) {
+// alert("Item clicked - show some details");
+// },
+// onAddClick: function(dt, rowId) {
+// alert("Empty space clicked - add an item!");
+// },
+// onRender: function() {
+// console.log("chart rendered");
+// }
+// });
+
+//
+/*jshint shadow:true, unused:false, laxbreak:true, evil:true*/
+/*globals jQuery, alert*/
+(function ($) {
+
+ "use strict";
+
+ $.fn.gantt = function (options) {
+
+ var cookieKey = "jquery.fn.gantt";
+ var scales = ["hours", "days", "weeks", "months"];
+ //Default settings
+ var settings = {
+ source: null,
+ itemsPerPage: 7,
+ months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+ dow: ["S", "M", "T", "W", "T", "F", "S"],
+ startPos: new Date(),
+ navigate: "buttons",
+ scale: "days",
+ useCookie: false,
+ maxScale: "months",
+ minScale: "hours",
+ waitText: "Please wait...",
+ onItemClick: function (data) { return; },
+ onAddClick: function (data) { return; },
+ onRender: function() { return; },
+ scrollToToday: true,
+ dateStart:null,
+ dateEnd: null,
+ extDate: null
+
+
+ };
+
+ // custom selector `:findday` used to match on specified day in ms.
+ //
+ // The selector is passed a date in ms and elements are added to the
+ // selection filter if the element date matches, as determined by the
+ // id attribute containing a parsable date in ms.
+ $.extend($.expr[":"], {
+ findday: function (a, i, m) {
+ var cd = new Date(parseInt(m[3], 10));
+ var id = $(a).attr("id");
+ id = id ? id : "";
+ var si = id.indexOf("-") + 1;
+ var ed = new Date(parseInt(id.substring(si, id.length), 10));
+ cd = new Date(cd.getFullYear(), cd.getMonth(), cd.getDate());
+ ed = new Date(ed.getFullYear(), ed.getMonth(), ed.getDate());
+ return cd.getTime() === ed.getTime();
+ }
+ });
+ // custom selector `:findweek` used to match on specified week in ms.
+ $.extend($.expr[":"], {
+ findweek: function (a, i, m) {
+ var cd = new Date(parseInt(m[3], 10));
+ var id = $(a).attr("id");
+ id = id ? id : "";
+ var si = id.indexOf("-") + 1;
+ cd = cd.getFullYear() + "-" + cd.getDayForWeek().getWeekOfYear();
+ var ed = id.substring(si, id.length);
+ return cd === ed;
+ }
+ });
+ // custom selector `:findmonth` used to match on specified month in ms.
+ $.extend($.expr[":"], {
+ findmonth: function (a, i, m) {
+ var cd = new Date(parseInt(m[3], 10));
+ cd = cd.getFullYear() + "-" + cd.getMonth();
+ var id = $(a).attr("id");
+ id = id ? id : "";
+ var si = id.indexOf("-") + 1;
+ var ed = id.substring(si, id.length);
+ return cd === ed;
+ }
+ });
+
+ // Date prototype helpers
+ // ======================
+
+ // `getWeekId` returns a string in the form of 'dh-YYYY-WW', where WW is
+ // the week # for the year.
+ // It is used to add an id to the week divs
+ Date.prototype.getWeekId = function () {
+ var y = this.getFullYear();
+ var w = this.getDayForWeek().getWeekOfYear();
+ var m = this.getMonth();
+ if (m === 11 && w === 1) {
+ y++;
+ }
+ return 'dh-' + y + "-" + w;
+ };
+
+ // `getRepDate` returns the seconds since the epoch for a given date
+ // depending on the active scale
+ Date.prototype.genRepDate = function () {
+ switch (settings.scale) {
+ case "hours":
+ return this.getTime();
+ case "weeks":
+ return this.getDayForWeek().getTime();
+ case "months":
+ return new Date(this.getFullYear(), this.getMonth(), 1).getTime();
+ default:
+ return this.getTime();
+ }
+ };
+
+ // `getDayOfYear` returns the day number for the year
+ Date.prototype.getDayOfYear = function () {
+ var fd = new Date(this.getFullYear(), 0, 0);
+ var sd = new Date(this.getFullYear(), this.getMonth(), this.getDate());
+ return Math.ceil((sd - fd) / 86400000);
+ };
+
+ // `getWeekOfYear` returns the week number for the year
+ Date.prototype.getWeekOfYear = function () {
+ var ys = new Date(this.getFullYear(), 0, 1);
+ var sd = new Date(this.getFullYear(), this.getMonth(), this.getDate());
+ if (ys.getDay() > 3) {
+ ys = new Date(sd.getFullYear(), 0, (7 - ys.getDay()));
+ }
+ var daysCount = sd.getDayOfYear() - ys.getDayOfYear();
+ return Math.ceil(daysCount / 7);
+
+ };
+
+ // `getDaysInMonth` returns the number of days in a month
+ Date.prototype.getDaysInMonth = function () {
+ return 32 - new Date(this.getFullYear(), this.getMonth(), 32).getDate();
+ };
+
+ // `hasWeek` returns `true` if the date resides on a week boundary
+ // **????????????????? Don't know if this is true**
+ Date.prototype.hasWeek = function () {
+ var df = new Date(this.valueOf());
+ df.setDate(df.getDate() - df.getDay());
+ var dt = new Date(this.valueOf());
+ dt.setDate(dt.getDate() + (6 - dt.getDay()));
+
+ if (df.getMonth() === dt.getMonth()) {
+ return true;
+ } else {
+ return (df.getMonth() === this.getMonth() && dt.getDate() < 4) || (df.getMonth() !== this.getMonth() && dt.getDate() >= 4);
+ }
+ };
+
+ // `getDayForWeek` returns the Date object for the starting date of
+ // the week # for the year
+ Date.prototype.getDayForWeek = function () {
+ var df = new Date(this.valueOf());
+ df.setDate(df.getDate() - df.getDay());
+ var dt = new Date(this.valueOf());
+ dt.setDate(dt.getDate() + (6 - dt.getDay()));
+ if ((df.getMonth() === dt.getMonth()) || (df.getMonth() !== dt.getMonth() && dt.getDate() >= 4)) {
+ return new Date(dt.setDate(dt.getDate() - 3));
+ } else {
+ return new Date(df.setDate(df.getDate() + 3));
+ }
+ };
+
+
+ // Grid management
+ // ===============
+
+ // Core object is responsible for navigation and rendering
+ var core = {
+ // Return the element whose topmost point lies under the given point
+ // Normalizes for IE
+ elementFromPoint: function (x, y) {
+
+ if ($.browser.msie) {
+ x -= $(document).scrollLeft();
+ y -= $(document).scrollTop();
+ } else {
+ x -= window.pageXOffset;
+ y -= window.pageYOffset;
+ }
+
+ return document.elementFromPoint(x, y);
+ },
+
+ // **Create the chart**
+ create: function (element) {
+
+ // Initialize data with a json object or fetch via an xhr
+ // request depending on `settings.source`
+ if (typeof settings.source !== "string") {
+ element.data = settings.source;
+ core.init(element);
+ } else {
+ $.getJSON(settings.source, function (jsData) {
+ element.data = jsData;
+ core.init(element);
+ });
+ }
+ },
+
+ // **Setup the initial view**
+ // Here we calculate the number of rows, pages and visible start
+ // and end dates once the data is ready
+ init: function (element) {
+ element.rowsNum = element.data.length;
+ element.pageCount = Math.ceil(element.rowsNum / settings.itemsPerPage);
+ element.rowsOnLastPage = element.rowsNum - (Math.floor(element.rowsNum / settings.itemsPerPage) * settings.itemsPerPage);
+
+ var settingsDateStart = tools.dateDeserialize(settings.dateStart);
+ var settingsDateEnd = tools.dateDeserialize(settings.dateEnd);
+
+ if(settingsDateStart == null || settingsDateStart>tools.getMinDate(element)) {
+ element.dateStart = tools.getMinDate(element);
+ }
+ else {
+ element.dateStart = settingsDateStart;
+ }
+ if(settingsDateEnd == null || settingsDateEnd<tools.getMaxDate(element)) {
+ element.dateEnd = tools.getMaxDate(element);
+ }
+ else {
+ element.dateEnd = settingsDateEnd;
+ }
+ console.log("date begin: " + element.dateStart);
+
+ /* core.render(element); */
+ core.waitToggle(element, true, function () { core.render(element); });
+ },
+
+ // **Render the grid**
+ render: function (element) {
+ var content = $('<div class="fn-content"/>');
+ var $leftPanel = core.leftPanel(element);
+ content.append($leftPanel);
+ var $rightPanel = core.rightPanel(element, $leftPanel);
+ var mLeft, hPos;
+
+ content.append($rightPanel);
+ content.append(core.navigation(element));
+
+ var $dataPanel = $rightPanel.find(".dataPanel");
+
+ element.gantt = $('<div class="fn-gantt" />').append(content);
+
+ $(element).html(element.gantt);
+
+ element.scrollNavigation.panelMargin = parseInt($dataPanel.css("margin-left").replace("px", ""), 10);
+ element.scrollNavigation.panelMaxPos = ($dataPanel.width() - $rightPanel.width());
+
+ element.scrollNavigation.canScroll = ($dataPanel.width() > $rightPanel.width());
+
+ core.markNow(element);
+ core.fillData(element, $dataPanel, $leftPanel);
+
+ // Set a cookie to record current position in the view
+ if (settings.useCookie) {
+ var sc = $.cookie(this.cookieKey + "ScrollPos");
+ if (sc) {
+ element.hPosition = sc;
+ }
+ }
+
+ //Apply mouseover
+ content.find('.begin').mouseover(core.mover).mouseout(core.mout).mousemove(core.mmove);
+ content.find('.end').mouseover(core.mover).mouseout(core.mout).mousemove(core.mmove);
+ content.find('.event').mouseover(core.mover).mouseout(core.mout).mousemove(core.mmove);
+
+
+ // Scroll the grid to today's date
+ if (settings.scrollToToday) {
+ var startPos = Math.round((settings.startPos / 1000 - element.dateStart / 1000) / 86400) - 2;
+ if ((startPos > 0 && element.hPosition !== 0)) {
+ if (element.scaleOldWidth) {
+ mLeft = ($dataPanel.width() - $rightPanel.width());
+ hPos = mLeft * element.hPosition / element.scaleOldWidth;
+ hPos = hPos > 0 ? 0 : hPos;
+ $dataPanel.css({ "margin-left": hPos + "px" });
+ element.scrollNavigation.panelMargin = hPos;
+ element.hPosition = hPos;
+ element.scaleOldWidth = null;
+ } else {
+ $dataPanel.css({ "margin-left": element.hPosition + "px" });
+ element.scrollNavigation.panelMargin = element.hPosition;
+ }
+ core.repositionLabel(element);
+ } else {
+ core.repositionLabel(element);
+ }
+ // or, scroll the grid to the left most date in the panel
+ } else {
+ if ((element.hPosition !== 0)) {
+ if (element.scaleOldWidth) {
+ mLeft = ($dataPanel.width() - $rightPanel.width());
+ hPos = mLeft * element.hPosition / element.scaleOldWidth;
+ hPos = hPos > 0 ? 0 : hPos;
+ $dataPanel.css({ "margin-left": hPos + "px" });
+ element.scrollNavigation.panelMargin = hPos;
+ element.hPosition = hPos;
+ element.scaleOldWidth = null;
+ } else {
+ $dataPanel.css({ "margin-left": element.hPosition + "px" });
+ element.scrollNavigation.panelMargin = element.hPosition;
+ }
+ core.repositionLabel(element);
+ } else {
+ core.repositionLabel(element);
+ }
+ }
+
+ $dataPanel.css({ height: $leftPanel.height() });
+ core.waitToggle(element, false);
+ settings.onRender();
+ },
+
+ mover : function (e) {
+ console.log("hint");
+ var hint;
+ if($(this).attr("over") == 'text')
+ hint = $('<div class="fn-gantt-hint"/>').html($(this).text());
+ else
+ hint = $('<div class="fn-gantt-hint"/>').html($(this).attr("over"));
+ $("body").append(hint);
+ hint.css("left", e.pageX);
+ hint.css("top", e.pageY);
+ hint.show();
+ },
+ mout : function () {
+ $(".fn-gantt-hint").remove();
+ },
+ mmove : function (e) {
+ $(".fn-gantt-hint").css("left", e.pageX);
+ $(".fn-gantt-hint").css("top", e.pageY + 15);
+ },
+
+
+
+
+ // Create and return the left panel with labels
+ leftPanel: function (element) {
+ /* Left panel */
+ var ganttLeftPanel = $('<div class="leftPanel"/>')
+ .append($('<div class="row spacer"/>')
+ .css("height", tools.getCellSize() * element.headerRows + "px")
+ .css("width", "100%"));
+
+ var entries = [];
+ $.each(element.data, function (i, entry) {
+ if (i >= element.pageNum * settings.itemsPerPage && i < (element.pageNum * settings.itemsPerPage + settings.itemsPerPage)) {
+
+ entries.push('<div class="row name row' + i + (entry.desc ? '' : ' fn-wide') + '" id="rowheader' + i + '" offset="' + i % settings.itemsPerPage * tools.getCellSize() + '">');
+ entries.push('<span class="fn-label' + (entry.cssClass ? ' ' + entry.cssClass : '') + '">' + entry.name + '</span>');
+ entries.push('</div>');
+
+ if (entry.desc) {
+ entries.push('<div class="row desc row' + i + ' " id="RowdId_' + i + '" data-id="' + entry.id + '">');
+
+ entries.push('<span class="fn-label' + (entry.cssClass ? ' ' + entry.cssClass : '') + '">' + entry.desc + '</span>');
+
+ entries.push('</div>');
+ }
+
+
+ }
+ });
+ ganttLeftPanel.append(entries.join(""));
+ ganttLeftPanel.find('.row:not(.spacer)').mouseover(core.mover)
+ .mouseout(core.mout)
+ .mousemove(core.mmove)
+ .attr('over', 'text');
+
+ return ganttLeftPanel;
+ },
+
+ // Create and return the data panel element
+ dataPanel: function (element, width) {
+ var dataPanel = $('<div class="dataPanel" style="width: ' + width + 'px;"/>');
+
+ // Handle mousewheel events for scrolling the data panel
+ var mousewheelevt = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel";
+ if (document.attachEvent) {
+ element.attachEvent("on" + mousewheelevt, function (e) { core.wheelScroll(element, e); });
+ } else if (document.addEventListener) {
+ element.addEventListener(mousewheelevt, function (e) { core.wheelScroll(element, e); }, false);
+ }
+
+ // Handle click events and dispatch to registered `onAddClick`
+ // function
+ dataPanel.click(function (e) {
+
+ e.stopPropagation();
+ var corrX, corrY;
+ var leftpanel = $(element).find(".fn-gantt .leftPanel");
+ var datapanel = $(element).find(".fn-gantt .dataPanel");
+ switch (settings.scale) {
+ case "weeks":
+ corrY = tools.getCellSize() * 2;
+ break;
+ case "months":
+ corrY = tools.getCellSize();
+ break;
+ case "hours":
+ corrY = tools.getCellSize() * 4;
+ break;
+ case "days":
+ corrY = tools.getCellSize() * 3;
+ break;
+ default:
+ corrY = tools.getCellSize() * 2;
+ break;
+ }
+
+ /* Adjust, so get middle of elm
+ corrY -= Math.floor(tools.getCellSize() / 2);
+ */
+
+ // Find column where click occurred
+ var col = core.elementFromPoint(e.pageX, datapanel.offset().top + corrY);
+ // Was the label clicked directly?
+ if (col.className === "fn-label") {
+ col = $(col.parentNode);
+ } else {
+ col = $(col);
+ }
+
+ var dt = col.attr("repdate");
+ // Find row where click occurred
+ var row = core.elementFromPoint(leftpanel.offset().left + leftpanel.width() - 10, e.pageY);
+ // Was the lable clicked directly?
+ if (row.className.indexOf("fn-label") === 0) {
+ row = $(row.parentNode);
+ } else {
+ row = $(row);
+ }
+ var rowId = row.data().id;
+
+ // Dispatch user registered function with the DateTime in ms
+ // and the id if the clicked object is a row
+ settings.onAddClick(dt, rowId);
+ });
+ return dataPanel;
+ },
+
+ // Creates and return the right panel containing the year/week/day
+ // header
+ rightPanel: function (element, leftPanel) {
+
+ var range = null;
+ // Days of the week have a class of one of
+ // `sn` (Saturday), `sa` (Sunday), or `wd` (Weekday)
+ var dowClass = [" sn", " wd", " wd", " wd", " wd", " wd", " sa"];
+ var gridDowClass = [" sn", "", "", "", "", "", " sa"];
+
+ var yearArr = ['<div class="row"/>'];
+ var daysInYear = 0;
+
+ var monthArr = ['<div class="row"/>'];
+ var daysInMonth = 0;
+
+ var dayArr = [];
+
+ var hoursInDay = 0;
+
+ var dowArr = [];
+
+ var horArr = [];
+
+
+ var today = new Date();
+ today = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+ var holidays = settings.holidays ? settings.holidays.join() : '';
+
+ // Setup the headings based on the chosen `settings.scale`
+ switch (settings.scale) {
+ // **Hours**
+ case "hours":
+
+ range = tools.parseTimeRange(element.dateStart, element.dateEnd, element.scaleStep);
+
+ var year = range[0].getFullYear();
+ var month = range[0].getMonth();
+ var day = range[0];
+
+ for (var i = 0; i < range.length; i++) {
+ var rday = range[i];
+
+ // Fill years
+ var rfy = rday.getFullYear();
+ if (rfy !== year) {
+ yearArr.push(
+ ('<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear
+ + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>'));
+
+ year = rfy;
+ daysInYear = 0;
+ }
+ daysInYear++;
+
+
+ // Fill months
+ var rm = rday.getMonth();
+ if (rm !== month) {
+ monthArr.push(
+ ('<div class="row header month" style="width: '
+ + tools.getCellSize() * daysInMonth + 'px"><div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>'));
+
+ month = rm;
+ daysInMonth = 0;
+ }
+ daysInMonth++;
+
+
+ // Fill days & hours
+
+ var rgetDay = rday.getDay();
+ var getDay = day.getDay();
+ var day_class = dowClass[rgetDay];
+ var getTime = day.getTime();
+ if (holidays.indexOf((new Date(rday.getFullYear(), rday.getMonth(), rday.getDate())).getTime()) > -1) {
+ day_class = "holiday";
+ }
+ if (rgetDay !== getDay) {
+
+ var day_class2 = (today - day === 0) ? ' today' : (holidays.indexOf(getTime) > -1) ? "holiday" : dowClass[getDay];
+
+ dayArr.push('<div class="row date ' + day_class2 + '" '
+ + ' style="width: ' + tools.getCellSize() * hoursInDay + 'px;"> '
+ + ' <div class="fn-label">' + day.getDate() + '</div></div>');
+ dowArr.push('<div class="row day ' + day_class2 + '" '
+ + ' style="width: ' + tools.getCellSize() * hoursInDay + 'px;"> '
+ + ' <div class="fn-label">' + settings.dow[getDay] + '</div></div>');
+
+ day = rday;
+ hoursInDay = 0;
+ }
+ hoursInDay++;
+
+ horArr.push('<div class="row day '
+ + day_class
+ + '" id="dh-'
+ + rday.getTime()
+ + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.genRepDate() + '"> '
+ + rday.getHours()
+ + '</div>');
+ }
+
+
+ // Last year
+ yearArr.push(
+ '<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>');
+
+ // Last month
+ monthArr.push(
+ '<div class="row header month" style="width: '
+ + tools.getCellSize() * daysInMonth + 'px"><div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>');
+
+ var day_class = dowClass[day.getDay()];
+
+ if (holidays.indexOf((new Date(day.getFullYear(), day.getMonth(), day.getDate())).getTime()) > -1) {
+ day_class = "holiday";
+ }
+
+ dayArr.push('<div class="row date ' + day_class + '" '
+ + ' style="width: ' + tools.getCellSize() * hoursInDay + 'px;"> '
+ + ' <div class="fn-label">' + day.getDate() + '</div></div>');
+
+ dowArr.push('<div class="row day ' + day_class + '" '
+ + ' style="width: ' + tools.getCellSize() * hoursInDay + 'px;"> '
+ + ' <div class="fn-label">' + settings.dow[day.getDay()] + '</div></div>');
+
+ var dataPanel = core.dataPanel(element, range.length * tools.getCellSize());
+
+
+ // Append panel elements
+ dataPanel.append(yearArr.join(""));
+ dataPanel.append(monthArr.join(""));
+ dataPanel.append($('<div class="row"/>').html(dayArr.join("")));
+ dataPanel.append($('<div class="row"/>').html(dowArr.join("")));
+ dataPanel.append($('<div class="row"/>').html(horArr.join("")));
+
+ break;
+
+ // **Weeks**
+ case "weeks":
+ range = tools.parseWeeksRange(element.dateStart, element.dateEnd);
+ yearArr = ['<div class="row"/>'];
+ monthArr = ['<div class="row"/>'];
+ var year = range[0].getFullYear();
+ var month = range[0].getMonth();
+ var day = range[0];
+
+ for (var i = 0; i < range.length; i++) {
+ var rday = range[i];
+
+ // Fill years
+ if (rday.getFullYear() !== year) {
+ yearArr.push(
+ ('<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear
+ + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>'));
+ year = rday.getFullYear();
+ daysInYear = 0;
+ }
+ daysInYear++;
+
+ // Fill months
+ if (rday.getMonth() !== month) {
+ monthArr.push(
+ ('<div class="row header month" style="width:'
+ + tools.getCellSize() * daysInMonth
+ + 'px;"><div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>'));
+ month = rday.getMonth();
+ daysInMonth = 0;
+ }
+ daysInMonth++;
+
+ // Fill weeks
+ dayArr.push('<div class="row day wd" '
+ + ' id="' + rday.getWeekId() + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.genRepDate() + '"> '
+ + ' <div class="fn-label">' + rday.getWeekOfYear() + '</div></div>');
+ }
+
+
+ // Last year
+ yearArr.push(
+ '<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>');
+
+ // Last month
+ monthArr.push(
+ '<div class="row header month" style="width: '
+ + tools.getCellSize() * daysInMonth + 'px"><div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>');
+
+ var dataPanel = core.dataPanel(element, range.length * tools.getCellSize());
+
+ dataPanel.append(yearArr.join("") + monthArr.join("") + dayArr.join("") + (dowArr.join("")));
+
+ break;
+
+ // **Months**
+ case 'months':
+ range = tools.parseMonthsRange(element.dateStart, element.dateEnd);
+
+ var year = range[0].getFullYear();
+ var month = range[0].getMonth();
+ var day = range[0];
+
+ for (var i = 0; i < range.length; i++) {
+ var rday = range[i];
+
+ // Fill years
+ if (rday.getFullYear() !== year) {
+ yearArr.push(
+ ('<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear
+ + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>'));
+ year = rday.getFullYear();
+ daysInYear = 0;
+ }
+ daysInYear++;
+ monthArr.push('<div class="row day wd" id="dh-' + tools.genId(rday.getTime()) + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.genRepDate() + '">' + (1 + rday.getMonth()) + '</div>');
+ }
+
+
+ // Last year
+ yearArr.push(
+ '<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>');
+
+ // Last month
+ monthArr.push(
+ '<div class="row header month" style="width: '
+ + tools.getCellSize() * daysInMonth + 'px">"<div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>');
+
+ var dataPanel = core.dataPanel(element, range.length * tools.getCellSize());
+
+ // Append panel elements
+ dataPanel.append(yearArr.join(""));
+ dataPanel.append(monthArr.join(""));
+ dataPanel.append($('<div class="row"/>').html(dayArr.join("")));
+ dataPanel.append($('<div class="row"/>').html(dowArr.join("")));
+
+ break;
+
+ // **Days (default)**
+ default:
+ range = tools.parseDateRange(element.dateStart, element.dateEnd);
+
+ var dateBefore = ktkGetNextDate(range[0], -1);
+ var year = dateBefore.getFullYear();
+ var month = dateBefore.getMonth();
+ var day = dateBefore;
+
+ dayArr.push('<div class="row date"></div>');
+ dowArr.push('<div class="row day"></div>')
+ for (var i = 0; i < range.length; i++) {
+ var rday = range[i];
+
+ // Fill years
+ if (rday.getFullYear() !== year) {
+ yearArr.push(
+ ('<div class="row header year" style="width:'
+ + tools.getCellSize() * daysInYear
+ + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>'));
+ year = rday.getFullYear();
+ daysInYear = 0;
+ }
+ daysInYear++;
+
+ // Fill months
+ if (rday.getMonth() !== month) {
+ monthArr.push(
+ ('<div class="row header month" style="width:'
+ + tools.getCellSize() * daysInMonth
+ + 'px;"><div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>'));
+ month = rday.getMonth();
+ daysInMonth = 0;
+ }
+ daysInMonth++;
+
+ var getDay = rday.getDay();
+ var day_class = dowClass[getDay];
+ if (holidays.indexOf((new Date(rday.getFullYear(), rday.getMonth(), rday.getDate())).getTime()) > -1) {
+ day_class = "holiday";
+ }
+
+ dayArr.push('<div class="row date ' + day_class + '" '
+ + ' id="dh-' + tools.genId(rday.getTime()) + '" offset="' + i * tools.getCellSize() + '" repdate="' + rday.genRepDate() + '"> '
+ + ' <div class="fn-label">' + rday.getDate() + '</div></div>');
+ dowArr.push('<div class="row day ' + day_class + '" '
+ + ' id="dw-' + tools.genId(rday.getTime()) + '" repdate="' + rday.genRepDate() + '"> '
+ + ' <div class="fn-label">' + settings.dow[getDay] + '</div></div>');
+ } //for
+
+
+
+ // Last year
+ yearArr.push(
+ '<div class="row header year" style="width: '
+ + tools.getCellSize() * daysInYear + 'px;"><div class="fn-label">'
+ + year
+ + '</div></div>');
+
+ // Last month
+ monthArr.push(
+ '<div class="row header month" style="width: '
+ + tools.getCellSize() * daysInMonth + 'px"><div class="fn-label">'
+ + settings.months[month]
+ + '</div></div>');
+
+ var dataPanel = core.dataPanel(element, range.length * tools.getCellSize());
+
+
+ // Append panel elements
+
+ dataPanel.append(yearArr.join(""));
+ dataPanel.append(monthArr.join(""));
+ dataPanel.append($('<div class="row"/>').html(dayArr.join("")));
+ dataPanel.append($('<div class="row"/>').html(dowArr.join("")));
+
+
+ break;
+ }
+ var ret = $('<div class="rightPanel"></div>').append(dataPanel);
+
+
+
+ return ret;
+ },
+
+ // **Navigation**
+ navigation: function (element) {
+ var ganttNavigate = null;
+ // Scrolling navigation is provided by setting
+ // `settings.navigate='scroll'`
+ if (settings.navigate === "scroll") {
+ ganttNavigate = $('<div class="navigate" />')
+ .append($('<div class="nav-slider" />')
+ .append($('<div class="nav-slider-left" />')
+ .append($('<span role="button" class="nav-link nav-page-back"/>')
+ .html('<')
+ .click(function () {
+ core.navigatePage(element, -1);
+ }))
+ .append($('<div class="page-number"/>')
+ .append($('<span/>')
+ .html(element.pageNum + 1 + ' of ' + element.pageCount)))
+ .append($('<span role="button" class="nav-link nav-page-next"/>')
+ .html('>')
+ .click(function () {
+ core.navigatePage(element, 1);
+ }))
+ .append($('<span role="button" class="nav-link nav-now"/>')
+ .html('●')
+ .click(function () {
+ core.navigateTo(element, 'now');
+ }))
+ .append($('<span role="button" class="nav-link nav-prev-week"/>')
+ .html('<<')
+ .click(function () {
+ if (settings.scale === 'hours') {
+ core.navigateTo(element, tools.getCellSize() * 8);
+ } else if (settings.scale === 'days') {
+ core.navigateTo(element, tools.getCellSize() * 30);
+ } else if (settings.scale === 'weeks') {
+ core.navigateTo(element, tools.getCellSize() * 12);
+ } else if (settings.scale === 'months') {
+ core.navigateTo(element, tools.getCellSize() * 6);
+ }
+ }))
+ .append($('<span role="button" class="nav-link nav-prev-day"/>')
+ .html('<')
+ .click(function () {
+ if (settings.scale === 'hours') {
+ core.navigateTo(element, tools.getCellSize() * 4);
+ } else if (settings.scale === 'days') {
+ core.navigateTo(element, tools.getCellSize() * 7);
+ } else if (settings.scale === 'weeks') {
+ core.navigateTo(element, tools.getCellSize() * 4);
+ } else if (settings.scale === 'months') {
+ core.navigateTo(element, tools.getCellSize() * 3);
+ }
+ })))
+ .append($('<div class="nav-slider-content" />')
+ .append($('<div class="nav-slider-bar" />')
+ .append($('<a class="nav-slider-button" />')
+ )
+ .mousedown(function (e) {
+ if (e.preventDefault) {
+ e.preventDefault();
+ }
+ element.scrollNavigation.scrollerMouseDown = true;
+ core.sliderScroll(element, e);
+ })
+ .mousemove(function (e) {
+ if (element.scrollNavigation.scrollerMouseDown) {
+ core.sliderScroll(element, e);
+ }
+ })
+ )
+ )
+ .append($('<div class="nav-slider-right" />')
+ .append($('<span role="button" class="nav-link nav-next-day"/>')
+ .html('>')
+ .click(function () {
+ if (settings.scale === 'hours') {
+ core.navigateTo(element, tools.getCellSize() * -4);
+ } else if (settings.scale === 'days') {
+ core.navigateTo(element, tools.getCellSize() * -7);
+ } else if (settings.scale === 'weeks') {
+ core.navigateTo(element, tools.getCellSize() * -4);
+ } else if (settings.scale === 'months') {
+ core.navigateTo(element, tools.getCellSize() * -3);
+ }
+ }))
+ .append($('<span role="button" class="nav-link nav-next-week"/>')
+ .html('>>')
+ .click(function () {
+ if (settings.scale === 'hours') {
+ core.navigateTo(element, tools.getCellSize() * -8);
+ } else if (settings.scale === 'days') {
+ core.navigateTo(element, tools.getCellSize() * -30);
+ } else if (settings.scale === 'weeks') {
+ core.navigateTo(element, tools.getCellSize() * -12);
+ } else if (settings.scale === 'months') {
+ core.navigateTo(element, tools.getCellSize() * -6);
+ }
+ }))
+ .append($('<span role="button" class="nav-link nav-zoomIn"/>')
+ .html('+')
+ .click(function () {
+ core.zoomInOut(element, -1);
+ }))
+ .append($('<span role="button" class="nav-link nav-zoomOut"/>')
+ .html('-')
+ .click(function () {
+ core.zoomInOut(element, 1);
+ }))
+ )
+ );
+ $(document).mouseup(function () {
+ element.scrollNavigation.scrollerMouseDown = false;
+ });
+ // Button navigation is provided by setting `settings.navigation='buttons'`
+ } else {
+ ganttNavigate = $('<div class="navigate" />')
+ .append($('<span role="button" class="nav-link nav-page-back"/>')
+ .html('<')
+ .click(function () {
+ core.navigatePage(element, -1);
+ }))
+ .append($('<div class="page-number"/>')
+ .append($('<span/>')
+ .html(element.pageNum + 1 + ' of ' + element.pageCount)))
+ .append($('<span role="button" class="nav-link nav-page-next"/>')
+ .html('>')
+ .click(function () {
+ core.navigatePage(element, 1);
+ }))
+ .append($('<span role="button" class="nav-link nav-begin"/>')
+ .html('|<')
+ .click(function () {
+ core.navigateTo(element, 'begin');
+ }))
+ .append($('<span role="button" class="nav-link nav-prev-week"/>')
+ .html('<<')
+ .click(function () {
+ core.navigateTo(element, tools.getCellSize() * 7);
+ }))
+ .append($('<span role="button" class="nav-link nav-prev-day"/>')
+ .html('<')
+ .click(function () {
+ core.navigateTo(element, tools.getCellSize());
+ }))
+ .append($('<span role="button" class="nav-link nav-now"/>')
+ .html('●')
+ .click(function () {
+ core.navigateTo(element, 'now');
+ }))
+ .append($('<span role="button" class="nav-link nav-next-day"/>')
+ .html('>')
+ .click(function () {
+ core.navigateTo(element, tools.getCellSize() * -1);
+ }))
+ .append($('<span role="button" class="nav-link nav-next-week"/>')
+ .html('>>')
+ .click(function () {
+ core.navigateTo(element, tools.getCellSize() * -7);
+ }))
+ .append($('<span role="button" class="nav-link nav-end"/>')
+ .html('>|')
+ .click(function () {
+ core.navigateTo(element, 'end');
+ }))
+ .append($('<span role="button" class="nav-link nav-zoomIn"/>')
+ .html('+')
+ .click(function () {
+ core.zoomInOut(element, -1);
+ }))
+ .append($('<span role="button" class="nav-link nav-zoomOut"/>')
+ .html('-')
+ .click(function () {
+ core.zoomInOut(element, 1);
+ }));
+ }
+ return $('<div class="bottom"/>').append(ganttNavigate);
+ },
+
+ // **Progress Bar**
+ // Return an element representing a progress of position within
+ // the entire chart
+ createProgressBar: function (days, cls, desc, label, dataObj) {
+
+ var cellWidth = tools.getCellSize();
+ var barMarg = tools.getProgressBarMargin() || 0;
+ var bar = $('<div class="bar"><div class="fn-label">' + label + '</div></div>')
+ .addClass(cls)
+ .css({
+ width: ((cellWidth * days) - barMarg) + 5
+ })
+ .data("dataObj", dataObj);
+
+ //if (desc) {
+ bar.mouseover(core.mover)
+ .mouseout(core.mout)
+ .mousemove(core.mmove)
+ .attr('over', 'text');
+ //}
+ bar.click(function (e) {
+ e.stopPropagation();
+ settings.onItemClick($(this).data("dataObj"));
+ });
+ return bar;
+ },
+
+ // Remove the `wd` (weekday) class and add `today` class to the
+ // current day/week/month (depending on the current scale)
+ markNow: function (element) {
+ switch (settings.scale) {
+ case "weeks":
+ var cd = Date.parse(new Date());
+ cd = (Math.floor(cd / 36400000) * 36400000);
+ $(element).find(':findweek("' + cd + '")').removeClass('wd').addClass('today');
+ break;
+ case "months":
+ $(element).find(':findmonth("' + new Date().getTime() + '")').removeClass('wd').addClass('today');
+ break;
+ default:
+ var cd = Date.parse(new Date());
+ cd = (Math.floor(cd / 36400000) * 36400000);
+ $(element).find(':findday("' + cd + '")').removeClass('wd').addClass('today');
+ var bd = Date.parse(tools.dateDeserialize(settings.dateStart));
+ //bd = (Math.floor(bd / 36400000) * 36400000);
+ $(element).find(':findday("' + bd + '")').removeClass('wd').addClass('begin').attr('over',"Project start");
+
+ $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.dateEnd)) + '")').removeClass('wd').addClass('end').attr('over',"Project end");
+ console.log(settings.extDate);
+ for(var key in settings.extDate) {
+ console.log("passe");
+ if(settings.extDate[key] != undefined)
+ $(element).find(':findday("' + Date.parse(tools.dateDeserialize(settings.extDate[key])) + '")').removeClass('wd').addClass('event').attr('over',key);
+ }
+ break;
+ }
+ },
+
+ // **Fill the Chart**
+ // Parse the data and fill the data panel
+ fillData: function (element, datapanel, leftpanel) {
+ var invertColor = function (colStr) {
+ try {
+ colStr = colStr.replace("rgb(", "").replace(")", "");
+ var rgbArr = colStr.split(",");
+ var R = parseInt(rgbArr[0], 10);
+ var G = parseInt(rgbArr[1], 10);
+ var B = parseInt(rgbArr[2], 10);
+ var gray = Math.round((255 - (0.299 * R + 0.587 * G + 0.114 * B)) * 0.9, 1);
+ return "rgb(" + gray + ", " + gray + ", " + gray + ")";
+ } catch (err) {
+ return "";
+ }
+ };
+ // Loop through the values of each data element and set a row
+ $.each(element.data, function (i, entry) {
+ if (i >= element.pageNum * settings.itemsPerPage && i < (element.pageNum * settings.itemsPerPage + settings.itemsPerPage)) {
+
+ $.each(entry.values, function (j, day) {
+ var _bar = null;
+
+
+ switch (settings.scale) {
+ // **Hourly data**
+ case "hours":
+ var dFrom = tools.genId(tools.dateDeserialize(day.from).getTime(), element.scaleStep);
+ var from = $(element).find('#dh-' + dFrom);
+
+ var dTo = tools.genId(tools.dateDeserialize(day.to).getTime(), element.scaleStep);
+ var to = $(element).find('#dh-' + dTo);
+
+ var cFrom = from.attr("offset");
+ var cTo = to.attr("offset");
+ var dl = Math.floor((cTo - cFrom) / tools.getCellSize()) + 1;
+
+ _bar = core.createProgressBar(
+ dl,
+ day.customClass ? day.customClass : "",
+ entry.desc ? entry.desc : "",
+ day.label ? day.label : "",
+ day.dataObj ? day.dataObj : null
+ );
+
+ // find row
+ var topEl = $(element).find("#rowheader" + i);
+
+ var top = tools.getCellSize() * 5 + 2 + parseInt(topEl.attr("offset"), 10);
+ _bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });
+
+ datapanel.append(_bar);
+ break;
+
+ // **Weekly data**
+ case "weeks":
+ var dtFrom = tools.dateDeserialize(day.from);
+ var dtTo = tools.dateDeserialize(day.to);
+
+ if (dtFrom.getDate() <= 3 && dtFrom.getMonth() === 0) {
+ dtFrom.setDate(dtFrom.getDate() + 4);
+ }
+
+ if (dtFrom.getDate() <= 3 && dtFrom.getMonth() === 0) {
+ dtFrom.setDate(dtFrom.getDate() + 4);
+ }
+
+ if (dtTo.getDate() <= 3 && dtTo.getMonth() === 0) {
+ dtTo.setDate(dtTo.getDate() + 4);
+ }
+
+ var from = $(element).find("#" + dtFrom.getWeekId());
+
+ var cFrom = from.attr("offset");
+
+ var to = $(element).find("#" + dtTo.getWeekId());
+ var cTo = to.attr("offset");
+
+ var dl = Math.round((cTo - cFrom) / tools.getCellSize()) + 1;
+
+ _bar = core.createProgressBar(
+ dl,
+ day.customClass ? day.customClass : "",
+ entry.desc ? entry.desc : "",
+ day.label ? day.label : "",
+ day.dataObj ? day.dataObj : null
+ );
+
+ // find row
+ var topEl = $(element).find("#rowheader" + i);
+
+ var top = tools.getCellSize() * 3 + 2 + parseInt(topEl.attr("offset"), 10);
+ _bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });
+
+ datapanel.append(_bar);
+ break;
+
+ // **Monthly data**
+ case "months":
+ var dtFrom = tools.dateDeserialize(day.from);
+ var dtTo = tools.dateDeserialize(day.to);
+
+ if (dtFrom.getDate() <= 3 && dtFrom.getMonth() === 0) {
+ dtFrom.setDate(dtFrom.getDate() + 4);
+ }
+
+ if (dtFrom.getDate() <= 3 && dtFrom.getMonth() === 0) {
+ dtFrom.setDate(dtFrom.getDate() + 4);
+ }
+
+ if (dtTo.getDate() <= 3 && dtTo.getMonth() === 0) {
+ dtTo.setDate(dtTo.getDate() + 4);
+ }
+
+ var from = $(element).find("#dh-" + tools.genId(dtFrom.getTime()));
+ var cFrom = from.attr("offset");
+ var to = $(element).find("#dh-" + tools.genId(dtTo.getTime()));
+ var cTo = to.attr("offset");
+ var dl = Math.round((cTo - cFrom) / tools.getCellSize()) + 1;
+
+ _bar = core.createProgressBar(
+ dl,
+ day.customClass ? day.customClass : "",
+ entry.desc ? entry.desc : "",
+ day.label ? day.label : "",
+ day.dataObj ? day.dataObj : null
+ );
+
+ // find row
+ var topEl = $(element).find("#rowheader" + i);
+
+ var top = tools.getCellSize() * 2 + 2 + parseInt(topEl.attr("offset"), 10);
+ _bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });
+
+ datapanel.append(_bar);
+ break;
+
+ // **Days**
+ default:
+ var dFrom = tools.genId(tools.dateDeserialize(day.from).getTime());
+ var dTo = tools.genId(tools.dateDeserialize(day.to).getTime());
+
+ var from = $(element).find("#dh-" + dFrom);
+ var cFrom = from.attr("offset");
+
+ var dl = Math.floor(((dTo / 1000) - (dFrom / 1000)) / 86400) + 1;
+ _bar = core.createProgressBar(
+ dl,
+ day.customClass ? day.customClass : "",
+ entry.desc ? entry.desc : "",
+ day.label ? day.label : "",
+ day.dataObj ? day.dataObj : null
+ );
+
+ // find row
+ var topEl = $(element).find("#rowheader" + i);
+
+ var top = tools.getCellSize() * 4 + 2 + parseInt(topEl.attr("offset"), 10);
+ _bar.css({ 'margin-top': top, 'margin-left': Math.floor(cFrom) });
+
+ datapanel.append(_bar);
+
+ break;
+ }
+ var $l = _bar.find(".fn-label");
+ if ($l && _bar.length) {
+ var gray = invertColor(_bar[0].style.backgroundColor);
+ $l.css("color", gray);
+ } else if ($l) {
+ $l.css("color", "");
+ }
+ });
+
+ }
+ });
+ },
+ // **Navigation**
+ navigateTo: function (element, val) {
+ var $rightPanel = $(element).find(".fn-gantt .rightPanel");
+ var $dataPanel = $rightPanel.find(".dataPanel");
+ $dataPanel.click = function () {
+ alert(arguments.join(""));
+ };
+ var rightPanelWidth = $rightPanel.width();
+ var dataPanelWidth = $dataPanel.width();
+
+ switch (val) {
+ case "begin":
+ $dataPanel.animate({
+ "margin-left": "0px"
+ }, "fast", function () { core.repositionLabel(element); });
+ element.scrollNavigation.panelMargin = 0;
+ break;
+ case "end":
+ var mLeft = dataPanelWidth - rightPanelWidth;
+ element.scrollNavigation.panelMargin = mLeft * -1;
+ $dataPanel.animate({
+ "margin-left": "-" + mLeft + "px"
+ }, "fast", function () { core.repositionLabel(element); });
+ break;
+ case "now":
+ if (!element.scrollNavigation.canScroll || !$dataPanel.find(".today").length) {
+ return false;
+ }
+ var max_left = (dataPanelWidth - rightPanelWidth) * -1;
+ var cur_marg = $dataPanel.css("margin-left").replace("px", "");
+ var val = $dataPanel.find(".today").offset().left - $dataPanel.offset().left;
+ val *= -1;
+ if (val > 0) {
+ val = 0;
+ } else if (val < max_left) {
+ val = max_left;
+ }
+ $dataPanel.animate({
+ "margin-left": val + "px"
+ }, "fast", core.repositionLabel(element));
+ element.scrollNavigation.panelMargin = val;
+ break;
+ default:
+ var max_left = (dataPanelWidth - rightPanelWidth) * -1;
+ var cur_marg = $dataPanel.css("margin-left").replace("px", "");
+ var val = parseInt(cur_marg, 10) + val;
+ if (val <= 0 && val >= max_left) {
+ $dataPanel.animate({
+ "margin-left": val + "px"
+ }, "fast", core.repositionLabel(element));
+ }
+ element.scrollNavigation.panelMargin = val;
+ break;
+ }
+ },
+
+ // Navigate to a specific page
+ navigatePage: function (element, val) {
+ if ((element.pageNum + val) >= 0 && (element.pageNum + val) < Math.ceil(element.rowsNum / settings.itemsPerPage)) {
+ core.waitToggle(element, true, function () {
+ element.pageNum += val;
+ element.hPosition = $(".fn-gantt .dataPanel").css("margin-left").replace("px", "");
+ element.scaleOldWidth = false;
+ core.init(element);
+ });
+ }
+ },
+
+ // Change zoom level
+ zoomInOut: function (element, val) {
+ core.waitToggle(element, true, function () {
+
+ var zoomIn = (val < 0);
+
+ var scaleSt = element.scaleStep + val * 3;
+ scaleSt = scaleSt <= 1 ? 1 : scaleSt === 4 ? 3 : scaleSt;
+ var scale = settings.scale;
+ var headerRows = element.headerRows;
+ if (settings.scale === "hours" && scaleSt >= 13) {
+ scale = "days";
+ headerRows = 4;
+ scaleSt = 13;
+ } else if (settings.scale === "days" && zoomIn) {
+ scale = "hours";
+ headerRows = 5;
+ scaleSt = 12;
+ } else if (settings.scale === "days" && !zoomIn) {
+ scale = "weeks";
+ headerRows = 3;
+ scaleSt = 13;
+ } else if (settings.scale === "weeks" && !zoomIn) {
+ scale = "months";
+ headerRows = 2;
+ scaleSt = 14;
+ } else if (settings.scale === "weeks" && zoomIn) {
+ scale = "days";
+ headerRows = 4;
+ scaleSt = 13;
+ } else if (settings.scale === "months" && zoomIn) {
+ scale = "weeks";
+ headerRows = 3;
+ scaleSt = 13;
+ }
+
+ if ((zoomIn && $.inArray(scale, scales) < $.inArray(settings.minScale, scales))
+ || (!zoomIn && $.inArray(scale, scales) > $.inArray(settings.maxScale, scales))) {
+ core.init(element);
+ return;
+ }
+ element.scaleStep = scaleSt;
+ settings.scale = scale;
+ element.headerRows = headerRows;
+ var $rightPanel = $(element).find(".fn-gantt .rightPanel");
+ var $dataPanel = $rightPanel.find(".dataPanel");
+ element.hPosition = $dataPanel.css("margin-left").replace("px", "");
+ element.scaleOldWidth = ($dataPanel.width() - $rightPanel.width());
+
+ if (settings.useCookie) {
+ $.cookie(this.cookieKey + "CurrentScale", settings.scale);
+ // reset scrollPos
+ $.cookie(this.cookieKey + "ScrollPos", null);
+ }
+ core.init(element);
+ });
+ },
+
+ // Move chart via mouseclick
+ mouseScroll: function (element, e) {
+ var $dataPanel = $(element).find(".fn-gantt .dataPanel");
+ $dataPanel.css("cursor", "move");
+ var bPos = $dataPanel.offset();
+ var mPos = element.scrollNavigation.mouseX === null ? e.pageX : element.scrollNavigation.mouseX;
+ var delta = e.pageX - mPos;
+ element.scrollNavigation.mouseX = e.pageX;
+
+ core.scrollPanel(element, delta);
+
+ clearTimeout(element.scrollNavigation.repositionDelay);
+ element.scrollNavigation.repositionDelay = setTimeout(core.repositionLabel, 50, element);
+ },
+
+ // Move chart via mousewheel
+ wheelScroll: function (element, e) {
+ var delta = e.detail ? e.detail * (-50) : e.wheelDelta / 120 * 50;
+
+ core.scrollPanel(element, delta);
+
+ clearTimeout(element.scrollNavigation.repositionDelay);
+ element.scrollNavigation.repositionDelay = setTimeout(core.repositionLabel, 50, element);
+
+ if (e.preventDefault) {
+ e.preventDefault();
+ } else {
+ return false;
+ }
+ },
+
+ // Move chart via slider control
+ sliderScroll: function (element, e) {
+ var $sliderBar = $(element).find(".nav-slider-bar");
+ var $sliderBarBtn = $sliderBar.find(".nav-slider-button");
+ var $rightPanel = $(element).find(".fn-gantt .rightPanel");
+ var $dataPanel = $rightPanel.find(".dataPanel");
+
+ var bPos = $sliderBar.offset();
+ var bWidth = $sliderBar.width();
+ var wButton = $sliderBarBtn.width();
+
+ var pos, mLeft;
+
+ if ((e.pageX >= bPos.left) && (e.pageX <= bPos.left + bWidth)) {
+ pos = e.pageX - bPos.left;
+ pos = pos - wButton / 2;
+ $sliderBarBtn.css("left", pos);
+
+ mLeft = $dataPanel.width() - $rightPanel.width();
+
+ var pPos = pos * mLeft / bWidth * -1;
+ if (pPos >= 0) {
+ $dataPanel.css("margin-left", "0px");
+ element.scrollNavigation.panelMargin = 0;
+ } else if (pos >= bWidth - (wButton * 1)) {
+ $dataPanel.css("margin-left", mLeft * -1 + "px");
+ element.scrollNavigation.panelMargin = mLeft * -1;
+ } else {
+ $dataPanel.css("margin-left", pPos + "px");
+ element.scrollNavigation.panelMargin = pPos;
+ }
+ clearTimeout(element.scrollNavigation.repositionDelay);
+ element.scrollNavigation.repositionDelay = setTimeout(core.repositionLabel, 5, element);
+ }
+ },
+
+ // Update scroll panel margins
+ scrollPanel: function (element, delta) {
+ if (!element.scrollNavigation.canScroll) {
+ return false;
+ }
+ var _panelMargin = parseInt(element.scrollNavigation.panelMargin, 10) + delta;
+ if (_panelMargin > 0) {
+ element.scrollNavigation.panelMargin = 0;
+ $(element).find(".fn-gantt .dataPanel").css("margin-left", element.scrollNavigation.panelMargin + "px");
+ } else if (_panelMargin < element.scrollNavigation.panelMaxPos * -1) {
+ element.scrollNavigation.panelMargin = element.scrollNavigation.panelMaxPos * -1;
+ $(element).find(".fn-gantt .dataPanel").css("margin-left", element.scrollNavigation.panelMargin + "px");
+ } else {
+ element.scrollNavigation.panelMargin = _panelMargin;
+ $(element).find(".fn-gantt .dataPanel").css("margin-left", element.scrollNavigation.panelMargin + "px");
+ }
+ core.synchronizeScroller(element);
+ },
+
+ // Synchronize scroller
+ synchronizeScroller: function (element) {
+ if (settings.navigate === "scroll") {
+ var $rightPanel = $(element).find(".fn-gantt .rightPanel");
+ var $dataPanel = $rightPanel.find(".dataPanel");
+ var $sliderBar = $(element).find(".nav-slider-bar");
+ var $sliderBtn = $sliderBar.find(".nav-slider-button");
+
+ var bWidth = $sliderBar.width();
+ var wButton = $sliderBtn.width();
+
+ var mLeft = $dataPanel.width() - $rightPanel.width();
+ var hPos = 0;
+ if ($dataPanel.css("margin-left")) {
+ hPos = $dataPanel.css("margin-left").replace("px", "");
+ }
+ var pos = hPos * bWidth / mLeft - $sliderBtn.width() * 0.25;
+ pos = pos > 0 ? 0 : (pos * -1 >= bWidth - (wButton * 0.75)) ? (bWidth - (wButton * 1.25)) * -1 : pos;
+ $sliderBtn.css("left", pos * -1);
+ }
+ },
+
+ // Reposition data labels
+ repositionLabel: function (element) {
+ setTimeout(function () {
+ var $dataPanel;
+ if (!element) {
+ $dataPanel = $(".fn-gantt .rightPanel .dataPanel");
+ } else {
+ var $rightPanel = $(element).find(".fn-gantt .rightPanel");
+ $dataPanel = $rightPanel.find(".dataPanel");
+ }
+
+ if (settings.useCookie) {
+ $.cookie(this.cookieKey + "ScrollPos", $dataPanel.css("margin-left").replace("px", ""));
+ }
+ }, 500);
+ },
+
+ // waitToggle
+ waitToggle: function (element, show, fn) {
+ if (show) {
+ var eo = $(element).offset();
+ var ew = $(element).outerWidth();
+ var eh = $(element).outerHeight();
+
+ if (!element.loader) {
+ element.loader = $('<div class="fn-gantt-loader" style="position: absolute; top: ' + eo.top + 'px; left: ' + eo.left + 'px; width: ' + ew + 'px; height: ' + eh + 'px;">'
+ + '<div class="fn-gantt-loader-spinner"><span>' + settings.waitText + '</span></div></div>');
+ }
+ $("body").append(element.loader);
+ setTimeout(fn, 100);
+
+ } else {
+ if (element.loader) {
+ element.loader.remove();
+ }
+ element.loader = null;
+ }
+ }
+ };
+
+ // Utility functions
+ // =================
+ var tools = {
+
+ // Return the maximum available date in data depending on the scale
+ getMaxDate: function (element) {
+ var maxDate = null;
+
+ $.each(element.data, function (i, entry) {
+ $.each(entry.values, function (i, date) {
+ maxDate = maxDate < tools.dateDeserialize(date.to) ? tools.dateDeserialize(date.to) : maxDate;
+ });
+ });
+
+ switch (settings.scale) {
+ case "hours":
+ maxDate.setHours(Math.ceil((maxDate.getHours()) / element.scaleStep) * element.scaleStep);
+ maxDate.setHours(maxDate.getHours() + element.scaleStep * 3);
+ break;
+ case "weeks":
+ var bd = new Date(maxDate.getTime());
+ var bd = new Date(bd.setDate(bd.getDate() + 3 * 7));
+ var md = Math.floor(bd.getDate() / 7) * 7;
+ maxDate = new Date(bd.getFullYear(), bd.getMonth(), md === 0 ? 4 : md - 3);
+ break;
+ case "months":
+ var bd = new Date(maxDate.getFullYear(), maxDate.getMonth(), 1);
+ bd.setMonth(bd.getMonth() + 2);
+ maxDate = new Date(bd.getFullYear(), bd.getMonth(), 1);
+ break;
+ default:
+ maxDate.setHours(0);
+ maxDate.setDate(maxDate.getDate() + 3);
+ break;
+ }
+ return maxDate;
+ },
+
+ // Return the minimum available date in data depending on the scale
+ getMinDate: function (element) {
+ var minDate = null;
+
+ $.each(element.data, function (i, entry) {
+ $.each(entry.values, function (i, date) {
+ minDate = minDate > tools.dateDeserialize(date.from) || minDate === null ? tools.dateDeserialize(date.from) : minDate;
+ });
+ });
+ switch (settings.scale) {
+ case "hours":
+ minDate.setHours(Math.floor((minDate.getHours()) / element.scaleStep) * element.scaleStep);
+ minDate.setHours(minDate.getHours() - element.scaleStep * 3);
+ break;
+ case "weeks":
+ var bd = new Date(minDate.getTime());
+ var bd = new Date(bd.setDate(bd.getDate() - 3 * 7));
+ var md = Math.floor(bd.getDate() / 7) * 7;
+ minDate = new Date(bd.getFullYear(), bd.getMonth(), md === 0 ? 4 : md - 3);
+ break;
+ case "months":
+ var bd = new Date(minDate.getFullYear(), minDate.getMonth(), 1);
+ bd.setMonth(bd.getMonth() - 3);
+ minDate = new Date(bd.getFullYear(), bd.getMonth(), 1);
+ break;
+ default:
+ minDate.setHours(0);
+ minDate.setDate(minDate.getDate() - 3);
+ break;
+ }
+ return minDate;
+ },
+
+ // Return an array of Date objects between `from` and `to`
+ parseDateRange: function (from, to) {
+ var current = new Date(from.getTime());
+ var end = new Date(to.getTime());
+ var ret = [];
+ var i = 0;
+ do {
+ ret[i++] = new Date(current.getTime());
+ current.setDate(current.getDate() + 1);
+ } while (current.getTime() <= to.getTime());
+ return ret;
+
+ },
+
+ // Return an array of Date objects between `from` and `to`,
+ // scaled hourly
+ parseTimeRange: function (from, to, scaleStep) {
+ var current = new Date(from);
+ var end = new Date(to);
+ var ret = [];
+ var i = 0;
+ for(;;) {
+ var dayStartTime = new Date(current);
+ dayStartTime.setHours(Math.floor((current.getHours()) / scaleStep) * scaleStep);
+
+ if (ret[i] && dayStartTime.getDay() !== ret[i].getDay()) {
+ // If mark-cursor jumped to next day, make sure it starts at 0 hours
+ dayStartTime.setHours(0);
+ }
+ ret[i] = dayStartTime;
+
+ // Note that we use ">" because we want to include the end-time point.
+ if(current.getTime() > to.getTime()) break;
+
+ /* BUG-2: current is moved backwards producing a dead-lock! (crashes chrome/IE/firefox)
+ * SEE: https://github.com/taitems/jQuery.Gantt/issues/62
+ if (current.getDay() !== ret[i].getDay()) {
+ current.setHours(0);
+ }
+ */
+
+ current = ktkGetNextDate(current, scaleStep);
+
+ i++;
+ };
+
+ return ret;
+ },
+
+ // Return an array of Date objects between a range of weeks
+ // between `from` and `to`
+ parseWeeksRange: function (from, to) {
+
+ var current = new Date(from);
+ var end = new Date(to);
+
+ var ret = [];
+ var i = 0;
+ do {
+ if (current.getDay() === 0) {
+ ret[i++] = current.getDayForWeek();
+ }
+ current.setDate(current.getDate() + 1);
+ } while (current.getTime() <= to.getTime());
+
+ return ret;
+ },
+
+
+ // Return an array of Date objects between a range of months
+ // between `from` and `to`
+ parseMonthsRange: function (from, to) {
+
+ var current = new Date(from);
+ var end = new Date(to);
+
+ var ret = [];
+ var i = 0;
+ do {
+ ret[i++] = new Date(current.getFullYear(), current.getMonth(), 1);
+ current.setMonth(current.getMonth() + 1);
+ } while (current.getTime() <= to.getTime());
+
+ return ret;
+ },
+
+ // Deserialize a date from a string
+ dateDeserialize: function (dateStr) {
+
+ return eval("new" + dateStr.replace(/\//g, " "));
+ //var date = eval("new" + dateStr.replace(/\//g, " "));
+ //return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes());
+ },
+
+ // Generate an id for a date
+ genId: function (ticks) {
+ var t = new Date(ticks);
+ switch (settings.scale) {
+ case "hours":
+ var hour = t.getHours();
+ if (arguments.length >= 2) {
+ hour = (Math.floor((t.getHours()) / arguments[1]) * arguments[1]);
+ }
+ return (new Date(t.getFullYear(), t.getMonth(), t.getDate(), hour)).getTime();
+ case "weeks":
+ var y = t.getFullYear();
+ var w = t.getDayForWeek().getWeekOfYear();
+ var m = t.getMonth();
+ if (m === 11 && w === 1) {
+ y++;
+ }
+ return y + "-" + w;
+ case "months":
+ return t.getFullYear() + "-" + t.getMonth();
+ default:
+ return (new Date(t.getFullYear(), t.getMonth(), t.getDate())).getTime();
+ }
+ },
+
+ // Get the current cell size
+ _getCellSize: null,
+ getCellSize: function () {
+ if (!tools._getCellSize) {
+ $("body").append(
+ $('<div style="display: none; position: absolute;" class="fn-gantt" id="measureCellWidth"><div class="row"></div></div>')
+ );
+ tools._getCellSize = $("#measureCellWidth .row").height();
+ $("#measureCellWidth").empty().remove();
+ }
+ return tools._getCellSize;
+ },
+
+ // Get the current size of the rigth panel
+ getRightPanelSize: function () {
+ $("body").append(
+ $('<div style="display: none; position: absolute;" class="fn-gantt" id="measureCellWidth"><div class="rightPanel"></div></div>')
+ );
+ var ret = $("#measureCellWidth .rightPanel").height();
+ $("#measureCellWidth").empty().remove();
+ return ret;
+ },
+
+ // Get the current page height
+ getPageHeight: function (element) {
+ return element.pageNum + 1 === element.pageCount ? element.rowsOnLastPage * tools.getCellSize() : settings.itemsPerPage * tools.getCellSize();
+ },
+
+ // Get the current margin size of the progress bar
+ _getProgressBarMargin: null,
+ getProgressBarMargin: function () {
+ if (!tools._getProgressBarMargin) {
+ $("body").append(
+ $('<div style="display: none; position: absolute;" id="measureBarWidth" ><div class="fn-gantt"><div class="rightPanel"><div class="dataPanel"><div class="row day"><div class="bar" /></div></div></div></div></div>')
+ );
+ tools._getProgressBarMargin = parseInt($("#measureBarWidth .fn-gantt .rightPanel .day .bar").css("margin-left").replace("px", ""), 10);
+ tools._getProgressBarMargin += parseInt($("#measureBarWidth .fn-gantt .rightPanel .day .bar").css("margin-right").replace("px", ""), 10);
+ $("#measureBarWidth").empty().remove();
+ }
+ return tools._getProgressBarMargin;
+ }
+ };
+
+
+ this.each(function () {
+ /**
+ * Extend options with default values
+ */
+ if (options) {
+ $.extend(settings, options);
+ }
+
+ this.data = null; // Received data
+ this.pageNum = 0; // Current page number
+ this.pageCount = 0; // Available pages count
+ this.rowsOnLastPage = 0; // How many rows on last page
+ this.rowsNum = 0; // Number of total rows
+ this.hPosition = 0; // Current position on diagram (Horizontal)
+ this.dateStart = null;
+ this.dateEnd = null;
+ this.scrollClicked = false;
+ this.scaleOldWidth = null;
+ this.headerRows = null;
+
+ // Update cookie with current scale
+ if (settings.useCookie) {
+ var sc = $.cookie(this.cookieKey + "CurrentScale");
+ if (sc) {
+ settings.scale = $.cookie(this.cookieKey + "CurrentScale");
+ } else {
+ $.cookie(this.cookieKey + "CurrentScale", settings.scale);
+ }
+ }
+
+ switch (settings.scale) {
+ //case "hours": this.headerRows = 5; this.scaleStep = 8; break;
+ case "hours": this.headerRows = 5; this.scaleStep = 1; break;
+ case "weeks": this.headerRows = 3; this.scaleStep = 13; break;
+ case "months": this.headerRows = 2; this.scaleStep = 14; break;
+ default: this.headerRows = 4; this.scaleStep = 13; break;
+ }
+
+ this.scrollNavigation = {
+ panelMouseDown: false,
+ scrollerMouseDown: false,
+ mouseX: null,
+ panelMargin: 0,
+ repositionDelay: 0,
+ panelMaxPos: 0,
+ canScroll: true
+ };
+
+ this.gantt = null;
+ this.loader = null;
+
+ core.create(this);
+
+ });
+
+ };
+})(jQuery);
+
+function ktkGetNextDate(currentDate, scaleStep) {
+ for(var minIncrements = 1;; minIncrements++) {
+ var nextDate = new Date(currentDate);
+ nextDate.setHours(currentDate.getHours() + scaleStep * minIncrements);
+
+ if(nextDate.getTime() != currentDate.getTime()) {
+ return nextDate;
+ }
+
+ // If code reaches here, it's because current didn't really increment (invalid local time) because of daylight-saving adjustments
+ // => retry adding 2, 3, 4 hours, and so on (until nextDate > current)
+ }
+}
1
0
June 25, 2013
See <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
Changes:
[Jean Couteau] #refs #931 : Add a Cancelled extension.
- Quotation can now get the Cancelled extension in sales funnel.
- Quotation status change in Sales funnel now gets a popup to precise values
- Still needs to update sales funnel amounts when using cancelled extension
------------------------------------------
[...truncated 342 lines...]
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 5; columnNumber: 17; The element type "link" must be terminated by the matching end-tag "</link>".
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] editQuotation.jsp~:4:1: Element type "link" must be followed by either attribute specifications, ">" or "/>".
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 1; Element type "link" must be followed by either attribute specifications, ">" or "/>".
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 1; Element type "link" must be followed by either attribute specifications, ">" or "/>".
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] salesReport.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
[Fatal Error] salesPerAccountReport.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] sales.jsp~:2:43: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 2; columnNumber: 43; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 2; columnNumber: 43; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] dashboardVacationByEmployee.jsp~:5:63: The prefix "c" for element "c:forEach" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 5; columnNumber: 63; The prefix "c" for element "c:forEach" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 5; columnNumber: 63; The prefix "c" for element "c:forEach" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] hr.jsp~:9:71: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 9; columnNumber: 71; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 9; columnNumber: 71; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] salesPerProjectReport.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] account.jsp~:3:74: The element type "link" must be terminated by the matching end-tag "</link>".
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 3; columnNumber: 74; The element type "link" must be terminated by the matching end-tag "</link>".
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 3; columnNumber: 74; The element type "link" must be terminated by the matching end-tag "</link>".
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] accountSalesReport.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] acceptedQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[Fatal Error] sentQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[Fatal Error] report.jsp~:5:40: The prefix "c" for element "c:if" is not bound.
[Fatal Error] dashboardProfitability.jsp~:21:46: The prefix "c" for element "c:forEach" is not bound.
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[Fatal Error] index.jsp~:6:50: The prefix "jsp" for element "jsp:include" is not bound.
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 21; columnNumber: 46; The prefix "c" for element "c:forEach" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 21; columnNumber: 46; The prefix "c" for element "c:forEach" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 5; columnNumber: 40; The prefix "c" for element "c:if" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 5; columnNumber: 40; The prefix "c" for element "c:if" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 6; columnNumber: 50; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…;> lineNumber: 6; columnNumber: 50; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:get (get) @ chorem-webmotion ---
[INFO] Copying chorem-webmotion.properties to <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO] Copying chorem-webmotion.properties to <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:gen (gen-and-make-bundle) @ chorem-webmotion ---
[INFO] Copying chorem-webmotion_fr_FR.properties to <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO] Copying chorem-webmotion_en_GB.properties to <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ chorem-webmotion ---
Downloading: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/3.1…
Downloading: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/wik…
[INFO] collected 2 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO] collected 2 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:bundle (gen-and-make-bundle) @ chorem-webmotion ---
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ chorem-webmotion ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 4 resources
[INFO] Copying 3 resources
[INFO]
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ chorem-webmotion ---
[INFO] Compiling 34 source files to <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[34,26] error: cannot find symbol
[ERROR] symbol: class Cancelled
location: package org.chorem.entities
<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[114,8] error: cannot find symbol
[ERROR] symbol: class Cancelled
location: class SalesAction
<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[114,45] error: cannot find symbol
[ERROR] symbol: class Cancelled
location: class SalesAction
<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[28,23] error: cannot find symbol
[ERROR] symbol: variable Cancelled
location: class FunnelAction
<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[46,23] error: cannot find symbol
[ERROR] symbol: variable Cancelled
location: class FunnelAction
<http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[65,23] error: cannot find symbol
[INFO] 6 errors
[INFO] -------------------------------------------------------------
1
2
See <http://ci.nuiton.org/jenkins/job/chorem/141/changes>
Changes:
[Jean Couteau] #refs #931 : Add a Cancelled extension.
- Quotation can now get the Cancelled extension in sales funnel.
- Quotation status change in Sales funnel now gets a popup to precise values
- Still needs to update sales funnel amounts when using cancelled extension
------------------------------------------
[...truncated 806 lines...]
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] dashboardVacationByEmployee.jsp~:5:63: The prefix "c" for element "c:forEach" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 5; columnNumber: 63; The prefix "c" for element "c:forEach" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 5; columnNumber: 63; The prefix "c" for element "c:forEach" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] hr.jsp~:9:71: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 9; columnNumber: 71; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 9; columnNumber: 71; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] salesPerProjectReport.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] account.jsp~:3:74: The element type "link" must be terminated by the matching end-tag "</link>".
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 3; columnNumber: 74; The element type "link" must be terminated by the matching end-tag "</link>".
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 3; columnNumber: 74; The element type "link" must be terminated by the matching end-tag "</link>".
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] accountSalesReport.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[Fatal Error] acceptedQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[Fatal Error] sentQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound.
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[Fatal Error] report.jsp~:5:40: The prefix "c" for element "c:if" is not bound.
[Fatal Error] dashboardProfitability.jsp~:21:46: The prefix "c" for element "c:forEach" is not bound.
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
[Fatal Error] index.jsp~:6:50: The prefix "jsp" for element "jsp:include" is not bound.
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 4; columnNumber: 37; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 21; columnNumber: 46; The prefix "c" for element "c:forEach" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 21; columnNumber: 46; The prefix "c" for element "c:forEach" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
[ERROR] could not parse file <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 5; columnNumber: 40; The prefix "c" for element "c:if" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 5; columnNumber: 40; The prefix "c" for element "c:if" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
org.nuiton.i18n.plugin.parser.ParserException: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 6; columnNumber: 50; The prefix "jsp" for element "jsp:include" is not bound.
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:400)
at org.nuiton.i18n.plugin.parser.ParserExecutor$ParserTask.run(ParserExecutor.java:219)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.xml.sax.SAXParseException; systemId: file://<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…;> lineNumber: 6; columnNumber: 50; The prefix "jsp" for element "jsp:include" is not bound.
at com.sun.org.apache.xerces.internal.parsers.DOMParser.parse(DOMParser.java:251)
at com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderImpl.parse(DocumentBuilderImpl.java:300)
at javax.xml.parsers.DocumentBuilder.parse(DocumentBuilder.java:177)
at org.nuiton.i18n.plugin.parser.impl.AbstractParserXmlMojo$XmlFileParser.parseFile(AbstractParserXmlMojo.java:387)
... 4 more
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:get (get) @ chorem-webmotion ---
[INFO] Copying chorem-webmotion.properties to <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/ge…>
[INFO] Copying chorem-webmotion.properties to <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/ge…>
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:gen (gen-and-make-bundle) @ chorem-webmotion ---
[INFO] Copying chorem-webmotion_fr_FR.properties to <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
[INFO] Copying chorem-webmotion_en_GB.properties to <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/src/main/…>
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ chorem-webmotion ---
Downloading: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/3.1…
Downloading: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/wik…
[INFO] collected 2 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…>
[INFO] collected 2 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/i1…>
[INFO]
[INFO] --- maven-i18n-plugin:2.3.1:bundle (gen-and-make-bundle) @ chorem-webmotion ---
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ chorem-webmotion ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 4 resources
[INFO] Copying 3 resources
[INFO]
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ chorem-webmotion ---
[INFO] Compiling 34 source files to <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/cl…>
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[34,26] error: cannot find symbol
[ERROR] symbol: class Cancelled
location: package org.chorem.entities
<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[114,8] error: cannot find symbol
[ERROR] symbol: class Cancelled
location: class SalesAction
<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[114,45] error: cannot find symbol
[ERROR] symbol: class Cancelled
location: class SalesAction
<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[28,23] error: cannot find symbol
[ERROR] symbol: variable Cancelled
location: class FunnelAction
<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[46,23] error: cannot find symbol
[ERROR] symbol: variable Cancelled
location: class FunnelAction
<http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[65,23] error: cannot find symbol
[INFO] 6 errors
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] chorem ............................................ SUCCESS [3.161s]
[INFO] Chorem entities ................................... SUCCESS [11.602s]
[INFO] Chorem webmotion .................................. FAILURE [5.508s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 20.950s
[INFO] Finished at: Fri Jun 21 22:46:16 CEST 2013
[INFO] Final Memory: 37M/289M
[INFO] ------------------------------------------------------------------------
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
Waiting for Jenkins to finish collecting data
mavenExecutionResult exceptions not empty
message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project chorem-webmotion: Compilation failure
cause : Compilation failure
Stack trace :
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project chorem-webmotion: Compilation failure
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239)
at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:100)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:66)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:326)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
at java.util.concurrent.FutureTask.run(FutureTask.java:166)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure
at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729)
at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209)
... 27 more
Sending e-mails to: chorem-commits(a)list.chorem.org
channel stopped
1
2
Author: jcouteau
Date: 2013-06-25 11:55:33 +0200 (Tue, 25 Jun 2013)
New Revision: 346
Url: http://chorem.org/projects/chorem/repository/revisions/346
Log:
refs #931 : Commit model
Modified:
trunk/chorem-entities/src/main/xmi/chorem-model.properties
trunk/chorem-entities/src/main/xmi/chorem-model.zargo
Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties
===================================================================
--- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-06-21 20:02:35 UTC (rev 345)
+++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-06-25 09:55:33 UTC (rev 346)
@@ -35,6 +35,13 @@
org.chorem.entities.Attachment.attribute.content.tagvalue.help=Le fichier \u00e0 importer
org.chorem.entities.Attachment.attribute.contentUrl.tagvalue.help=Si on ne souhaite pas importer le fichier, on peut indiquer ici sont URL (ex: http://commun.codelutin.home/Clients/...)
#
+# Cancelled
+#
+org.chorem.entities.Cancelled.class.tagvalue.version=1.0
+org.chorem.entities.Cancelled.class.tagvalue.toString=%Quotation.description|nologin$s
+org.chorem.entities.Cancelled.class.tagvalue.sortOrder=Cancelled.cancelledDate
+
+#
# category
#
org.chorem.entities.Category.class.tagvalue.version=5.0
Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo
===================================================================
(Binary files differ)
1
0
r345 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/sales webapp/WEB-INF/jsp/salesReports webapp/js
by jcouteau＠users.chorem.org June 21, 2013
by jcouteau＠users.chorem.org June 21, 2013
June 21, 2013
Author: jcouteau
Date: 2013-06-21 22:02:35 +0200 (Fri, 21 Jun 2013)
New Revision: 345
Url: http://chorem.org/projects/chorem/repository/revisions/345
Log:
#refs #931 : Add a Cancelled extension.
- Quotation can now get the Cancelled extension in sales funnel.
- Quotation status change in Sales funnel now gets a popup to precise values
- Still needs to update sales funnel amounts when using cancelled extension
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
trunk/chorem-webmotion/src/main/webapp/js/chorem.js
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2013-06-20 14:35:02 UTC (rev 344)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2013-06-21 20:02:35 UTC (rev 345)
@@ -1,11 +1,7 @@
package org.chorem.webmotion.actions.sales;
import org.chorem.ChoremClient;
-import org.chorem.entities.Accepted;
-import org.chorem.entities.Draft;
-import org.chorem.entities.Quotation;
-import org.chorem.entities.Rejected;
-import org.chorem.entities.Sent;
+import org.chorem.entities.*;
import org.debux.webmotion.server.WebMotionController;
import org.debux.webmotion.server.render.Render;
import org.nuiton.wikitty.query.WikittyQuery;
@@ -29,6 +25,7 @@
WikittyQuery leadQuotationQuery = new WikittyQueryMaker().and()
.exteq(Quotation.EXT_QUOTATION)
.extne(Draft.EXT_DRAFT)
+ .extne(Cancelled.EXT_CANCELLED)
.end().setLimit(WikittyQuery.MAX);
WikittyQueryResult<Quotation> leads =
@@ -46,6 +43,7 @@
WikittyQuery draftQuotationQuery = new WikittyQueryMaker().and()
.exteq(Draft.EXT_DRAFT)
.extne(Sent.EXT_SENT)
+ .extne(Cancelled.EXT_CANCELLED)
.end().setLimit(WikittyQuery.MAX);
WikittyQueryResult<Quotation> drafts =
@@ -64,6 +62,7 @@
.exteq(Sent.EXT_SENT)
.extne(Accepted.EXT_ACCEPTED)
.extne(Rejected.EXT_REJECTED)
+ .extne(Cancelled.EXT_CANCELLED)
.end().setLimit(WikittyQuery.MAX);
WikittyQueryResult<Quotation> sents =
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2013-06-20 14:35:02 UTC (rev 344)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2013-06-21 20:02:35 UTC (rev 345)
@@ -23,16 +23,21 @@
* #L%
*/
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.chorem.ChoremClient;
import org.chorem.entities.Accepted;
import org.chorem.entities.Draft;
import org.chorem.entities.Rejected;
import org.chorem.entities.Sent;
import org.chorem.entities.Started;
+import org.chorem.entities.Cancelled;
import org.chorem.webmotion.render.RenderWikittyJson;
import org.debux.webmotion.server.WebMotionController;
import org.debux.webmotion.server.render.Render;
+import org.nuiton.wikitty.WikittyUtil;
+import java.text.ParseException;
import java.util.Date;
/**
@@ -45,23 +50,40 @@
*/
public class SalesAction extends WebMotionController {
- public Render send(ChoremClient client, String id) {
+ static private Log log = LogFactory.getLog(SalesAction.class);
+
+ public Render send(ChoremClient client, String id, String sendingDate) {
Sent sent = client.restore(Sent.class, id);
- sent.setPostedDate(new Date());
+ try {
+ sent.setPostedDate(WikittyUtil.parseDate(sendingDate));
+ } catch (ParseException e) {
+ log.debug("Could not parse date : " + sendingDate);
+ getContext().addInfoMessage("message", "Warning: Could not parse date " + sendingDate);
+ }
sent = client.store(sent);
return new RenderWikittyJson(sent);
}
- public Render accept(ChoremClient client, String id) {
+ public Render accept(ChoremClient client, String id, String acceptedDate) {
Accepted accepted = client.restore(Accepted.class, id);
- accepted.setAcceptedDate(new Date());
+ try {
+ accepted.setAcceptedDate(WikittyUtil.parseDate(acceptedDate));
+ } catch (ParseException e) {
+ log.debug("Could not parse date : " + acceptedDate);
+ getContext().addInfoMessage("message", "Warning: Could not parse date " + acceptedDate);
+ }
client.store(accepted);
return new RenderWikittyJson(accepted);
}
- public Render reject(ChoremClient client, String id) {
+ public Render reject(ChoremClient client, String id, String rejectedDate) {
Rejected rejected = client.restore(Rejected.class, id);
- rejected.setRejectedDate(new Date());
+ try {
+ rejected.setRejectedDate(WikittyUtil.parseDate(rejectedDate));
+ } catch (ParseException e) {
+ log.debug("Could not parse date : " + rejectedDate);
+ getContext().addInfoMessage("message", "Warning: Could not parse date " + rejectedDate);
+ }
client.store(rejected);
return new RenderWikittyJson(rejected);
}
@@ -73,9 +95,31 @@
return new RenderWikittyJson(started);
}
- public Render answer(ChoremClient client, String id) {
+ public Render answer(ChoremClient client, String id, String sendingDate,
+ String reference) {
Draft draft = client.restore(Draft.class, id,".*");
+ try {
+ draft.setSendingDate(WikittyUtil.parseDate(sendingDate));
+ } catch (ParseException e) {
+ log.debug("Could not parse date : " + sendingDate);
+ getContext().addInfoMessage("message", "Warning: Could not parse date " + sendingDate);
+ }
+ draft.setReference(reference);
draft = client.store(draft);
return new RenderWikittyJson(draft);
}
+
+ public Render cancel(ChoremClient client, String id, String cancelledDate,
+ String reason) {
+ Cancelled cancelled = client.restore(Cancelled.class, id, ".*");
+ try {
+ cancelled.setCancelledDate(WikittyUtil.parseDate(cancelledDate));
+ } catch (ParseException e) {
+ log.debug("Could not parse date : " + cancelledDate);
+ getContext().addInfoMessage("message", "Warning: Could not parse date " + cancelledDate);
+ }
+ cancelled.setReason(reason);
+ cancelled = client.store(cancelled);
+ return new RenderWikittyJson(cancelled);
+ }
}
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2013-06-20 14:35:02 UTC (rev 344)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2013-06-21 20:02:35 UTC (rev 345)
@@ -72,6 +72,7 @@
</p>
</div>
<a class="btn btn-success pull-right salesFunnelItemButton lead" wikittyId="${q.wikittyId}">Répondre</a>
+ <a class="btn btn-warning pull-right salesFunnelItemButton toCancelled" wikittyId="${q.wikittyId}">Annuler</a>
<div class="pull-right salesFunnelItemPrice">
<p class="salesFunnelItemTitle">
<w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/>
@@ -99,6 +100,7 @@
<p><span class="salesFunnelItemTitle"><a class="name-link" href="<c:url value="/wikitty/Project/view/${q.project}"/>"><w:display wikitty="${q.wikitty}" fqfield="Quotation.project" label=""/></a></span> - <small><w:display wikitty="${q.wikitty}" fqfield="Quotation.description" label=""/></small></p>
</div>
<a class="btn btn-success pull-right salesFunnelItemButton draft" wikittyId="${q.wikittyId}">Envoyer</a>
+ <a class="btn btn-warning pull-right salesFunnelItemButton toCancelled" wikittyId="${q.wikittyId}">Annuler</a>
<div class="pull-right salesFunnelItemPrice">
<p class="salesFunnelItemTitle"><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></p>
<small><w:display wikitty="${q.wikitty}" fqfield="Quotation.category" label=""/> - <w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/>j - <w:display wikitty="${q.wikitty}" fqfield="Quotation.conversionHope" label=""/></small>
@@ -122,6 +124,7 @@
</div>
<a class="btn btn-success pull-right salesFunnelItemButton sent toAccepted" wikittyId="${q.wikittyId}">Accepté</a>
<a class="btn btn-danger pull-right salesFunnelItemButton sent toRejected" wikittyId="${q.wikittyId}">Rejeté</a>
+ <a class="btn btn-warning pull-right salesFunnelItemButton toCancelled" wikittyId="${q.wikittyId}">Annuler</a>
<div class="pull-right salesFunnelItemPrice">
<p class="salesFunnelItemTitle"><w:display wikitty="${q.wikitty}" fqfield="Quotation.amount" label=""/></p>
<small><w:display wikitty="${q.wikitty}" fqfield="Quotation.category" label=""/> - <w:display wikitty="${q.wikitty}" fqfield="Quotation.estimatedDays" label=""/>j - <w:display wikitty="${q.wikitty}" fqfield="Quotation.conversionHope" label=""/></small>
@@ -132,6 +135,60 @@
</ul>
</div>
+ <div id="dialog-form-leadToDraft" title="Proposition commerciale à envoyer">
+ <form>
+ <fieldset>
+ <label for="sendingDate">Date d'envoi</label>
+ <input type="text" name="sendingDate" id="sendingDate" class="datepicker" />
+ <label for="reference">Référence</label>
+ <input type="text" name="reference" id="reference" value="" class="text ui-widget-content ui-corner-all" />
+ <input type="hidden" name="id" id="lead-wikittyId"/>
+ </fieldset>
+ </form>
+ </div>
+
+ <div id="dialog-form-draftToSent" title="Proposition commerciale envoyée">
+ <form>
+ <fieldset>
+ <label for="sendDate">Date d'envoi</label>
+ <input type="text" name="sendDate" id="sendDate" class="datepicker" />
+ <input type="hidden" name="id" id="draft-wikittyId"/>
+ </fieldset>
+ </form>
+ </div>
+
+ <div id="dialog-form-sentToAccepted" title="Proposition commerciale acceptée">
+ <form>
+ <fieldset>
+ <label for="acceptedDate">Date d'acceptation</label>
+ <input type="text" name="acceptedDate" id="acceptedDate" class="datepicker" />
+ <input type="hidden" name="id" id="sent-wikittyId"/>
+ </fieldset>
+ </form>
+ </div>
+
+ <div id="dialog-form-sentToRejected" title="Proposition commerciale refusée">
+ <form>
+ <fieldset>
+ <label for="rejectedDate">Date de refus</label>
+ <input type="text" name="rejectedDate" id="rejectedDate" class="datepicker" />
+ <input type="hidden" name="id" id="rejected-wikittyId"/>
+ </fieldset>
+ </form>
+ </div>
+
+ <div id="dialog-form-toCancelled" title="Proposition commerciale annulée">
+ <form>
+ <fieldset>
+ <label for="cancelledDate">Date d'annulation</label>
+ <input type="text" name="cancelledDate" id="cancelledDate" class="datepicker" />
+ <label for="cancelledReason">Raison</label>
+ <input type="text" name="cancelledReason" id="cancelledReason" value="" class="text ui-widget-content ui-corner-all" />
+ <input type="hidden" name="id" id="cancelled-wikittyId"/>
+ </fieldset>
+ </form>
+ </div>
+
</div>
</div>
Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-20 14:35:02 UTC (rev 344)
+++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-06-21 20:02:35 UTC (rev 345)
@@ -93,6 +93,44 @@
});
}
});
+
+
+/*********** SALES FUNNEL FUNCTIONS**********************/
+function leadToDraft(){
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#lead-wikittyId").val(id);
+ $("#dialog-form-leadToDraft" ).data("oldQuotation", oldQuotation).dialog( "open" );
+};
+
+function draftToSent(){
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#draft-wikittyId").val(id);
+ $("#dialog-form-draftToSent" ).data("oldQuotation", oldQuotation).dialog( "open" );
+};
+
+function sentToAccepted(){
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#sent-wikittyId").val(id);
+ $("#dialog-form-sentToAccepted" ).data("oldQuotation", oldQuotation).dialog( "open" );
+};
+
+function sentToRejected(){
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#rejected-wikittyId").val(id);
+ $("#dialog-form-sentToRejected" ).data("oldQuotation", oldQuotation).dialog( "open" );
+};
+
+function toCancelled(){
+ var id = $(this).attr('wikittyId');
+ var oldQuotation = $(this).parent();
+ $("#cancelled-wikittyId").val(id);
+ $("#dialog-form-toCancelled" ).data("oldQuotation", oldQuotation).dialog( "open" );
+};
+
//ajout ble
//clic sur les cases à cocher half-day d'une vacation (VacationRequest)
@@ -106,7 +144,6 @@
dt.val(dtVal);
}
-
$(document).ready(function() {
$('.beginDateTR :checkbox').change(function(){
var dtetim = $(this).parent().parent().children('.beginDateTD').children('input');
@@ -233,260 +270,447 @@
// * SALES FUNNEL *
// ********************************************************************
- function leadToDraft() {
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $.get(createUrl("/sales/funnel/json/answer/", id),
- function(data){
- //success
- var wikittyId = data.meta.id;
- var wikitty = data.data;
+
+ //Passage d'un lead -> draft
+ $("a.lead").click(leadToDraft);
- var li = $("<li></li>").addClass("salesFunnelItem draft");
+ $( "#dialog-form-leadToDraft" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- //leftDiv
- var leftDiv = $("<div></div>").addClass("pull-left");
- var aIconEdit = $("<a></a>")
- .attr("href", createUrl("/wikitty/edit/", wikittyId));
- var iconEdit = $("<i></i>").addClass("icon-edit");
- aIconEdit.append(iconEdit);
- leftDiv.append(aIconEdit);
- var smallAccount = $("<small></small>");
- if (wikitty["Quotation.customer"]!=null){
- var customer = data.preloaded[wikitty["Quotation.customer"]];
- var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
- var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
- var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
- }
- var aAccount = $("<a></a>")
- .text(firstName + " " + lastName + " (" + company + ")")
- .attr("href",createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
- smallAccount.append(aAccount);
- leftDiv.append(smallAccount);
- var leftP = $("<p> - </p>");
- var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
+ var reference = $("#reference").val();
+ var sendingDate = $("#sendingDate").val();
+ var id = $("#lead-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#reference")).add($("#sendingDate")).add($("#lead-wikittyId"))
- if (wikitty["Quotation.project"]!=null) {
- var aProject = $("<a/>")
- .addClass("nameLink")
- .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
- .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
- }
- itemTitleSpan.append(aProject);
- var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
- leftP.append(descriptionSmall);
- leftP.prepend(itemTitleSpan);
- leftDiv.append(leftP);
+ var dialog = $( this );
- //button
- var aSend = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-success pull-right salesFunnelItemButton draft")
- .text("Envoyer")
- .click(draftToSent);
+ $.post(createUrl("/sales/funnel/json/answer/", id,"?sendingDate=", sendingDate, "&reference=",reference),
+ function(data){
+ //success
+ var wikittyId = data.meta.id;
+ var wikitty = data.data;
- //rightDiv
- var rightDiv = $("<div>").addClass("pull-right");
- var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
- if (wikitty["Quotation.category"] != null) {
- var smallInfo = $("<small>")
- .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
- + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
- wikitty["Quotation.conversionHope"] + "%");
- }
- rightDiv.append(rightP);
- rightDiv.append(smallInfo);
+ var li = $("<li></li>").addClass("salesFunnelItem draft");
- //clear:both
- var clearBoth=$("<div style='clear:both;'/>")
+ //leftDiv
+ var leftDiv = $("<div></div>").addClass("pull-left");
+ var aIconEdit = $("<a></a>")
+ .attr("href", createUrl("/wikitty/edit/", wikittyId));
+ var iconEdit = $("<i></i>").addClass("icon-edit");
+ aIconEdit.append(iconEdit);
+ leftDiv.append(aIconEdit);
+ var smallAccount = $("<small></small>");
+ if (wikitty["Quotation.customer"]!=null){
+ var customer = data.preloaded[wikitty["Quotation.customer"]];
+ var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
+ var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
+ var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
+ }
+ var aAccount = $("<a></a>")
+ .text(firstName + " " + lastName + " (" + company + ")")
+ .attr("href",createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
+ smallAccount.append(aAccount);
+ leftDiv.append(smallAccount);
+ var leftP = $("<p> - </p>");
+ var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
- li.append(leftDiv);
- li.append(aSend);
- li.append(rightDiv);
- li.append(clearBoth);
+ if (wikitty["Quotation.project"]!=null) {
+ var aProject = $("<a/>")
+ .addClass("nameLink")
+ .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
+ .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
+ }
+ itemTitleSpan.append(aProject);
+ var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
+ leftP.append(descriptionSmall);
+ leftP.prepend(itemTitleSpan);
+ leftDiv.append(leftP);
- var drafts = $(".drafts");
- drafts.append(li);
- oldQuotation.slideUp();
+ //button
+ var aSend = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-success pull-right salesFunnelItemButton draft")
+ .text("Envoyer")
+ .click(draftToSent);
- //update draftAmount and draftAmountHope
- var draftAmount = parseInt($("#draftAmount").text()) + wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var draftAmountHope = parseInt($("#draftAmountHope").text()) + amountHope;
- $("#draftAmount").text(draftAmount);
- $("#draftAmountHope").text(draftAmountHope);
+ var aCancelled = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-warning pull-right salesFunnelItemButton toCancelled")
+ .text("Annuler")
+ .click(toCancelled);
- //update leadAmount and leadAmountHope
- var leadAmount = parseInt($("#leadAmount").text()) - wikitty["Quotation.amount"];
- var leadAmountHope = parseInt($("#leadAmountHope").text()) - amountHope;
- $("#leadAmount").text(leadAmount);
- $("#leadAmountHope").text(leadAmountHope);
+ //rightDiv
+ var rightDiv = $("<div>").addClass("pull-right");
+ var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
+ if (wikitty["Quotation.category"] != null) {
+ var smallInfo = $("<small>")
+ .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
+ + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
+ wikitty["Quotation.conversionHope"] + "%");
+ }
+ rightDiv.append(rightP);
+ rightDiv.append(smallInfo);
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- });
- }
+ //clear:both
+ var clearBoth=$("<div style='clear:both;'/>")
- function draftToSent() {
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $.get(createUrl("/sales/funnel/json/send/", id),
- function(data){
- //success
+ li.append(leftDiv);
+ li.append(aSend);
+ li.append(aCancelled);
+ li.append(rightDiv);
+ li.append(clearBoth);
- var wikittyId = data.meta.id;
- var wikitty = data.data;
+ var drafts = $(".drafts");
+ drafts.append(li);
+ oldQuotation.slideUp();
- var li = $("<li></li>").addClass("salesFunnelItem draft");
+ //update draftAmount and draftAmountHope
+ var draftAmount = parseInt($("#draftAmount").text()) + wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var draftAmountHope = parseInt($("#draftAmountHope").text()) + amountHope;
+ $("#draftAmount").text(draftAmount);
+ $("#draftAmountHope").text(draftAmountHope);
- //leftDiv
- var leftDiv = $("<div></div>").addClass("pull-left");
- var aIconEdit = $("<a></a>")
- .attr("href",createUrl("/wikitty/edit/", wikittyId));
- var iconEdit = $("<i></i>").addClass("icon-edit");
- aIconEdit.append(iconEdit);
- leftDiv.append(aIconEdit);
- var smallAccount = $("<small></small>");
- if (wikitty["Quotation.customer"]!=null){
- var customer = data.preloaded[wikitty["Quotation.customer"]];
- var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
- var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
- var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
- }
- var aAccount = $("<a></a>")
- .text(firstName + " " + lastName + " (" + company + ")")
- .attr("href", createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
- smallAccount.append(aAccount);
- leftDiv.append(smallAccount);
- var leftP = $("<p> - </p>");
- var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
+ //update leadAmount and leadAmountHope
+ var leadAmount = parseInt($("#leadAmount").text()) - wikitty["Quotation.amount"];
+ var leadAmountHope = parseInt($("#leadAmountHope").text()) - amountHope;
+ $("#leadAmount").text(leadAmount);
+ $("#leadAmountHope").text(leadAmountHope);
- if (wikitty["Quotation.project"]!=null) {
- var aProject = $("<a/>")
- .addClass("nameLink")
- .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
- .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
- }
- itemTitleSpan.append(aProject);
- var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
- leftP.append(descriptionSmall);
- leftP.prepend(itemTitleSpan);
- leftDiv.append(leftP);
+ allFields.val("");
- //button
- var aAccepted = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-success pull-right salesFunnelItemButton sent toAccepted")
- .text("Accepté")
- .click(sentToAccepted);
- var aRejected = $('<a/>')
- .attr('wikittyId', wikittyId)
- .addClass("btn btn-danger pull-right salesFunnelItemButton sent toRejected")
- .text("Rejeté")
- .click(sentToRejected);
+ dialog.dialog( "close" );
- //rightDiv
- var rightDiv = $("<div>").addClass("pull-right");
- var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
- if (wikitty["Quotation.category"] != null) {
- var smallInfo = $("<small>")
- .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
- + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
- wikitty["Quotation.conversionHope"] + "%");
- }
- rightDiv.append(rightP);
- rightDiv.append(smallInfo);
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#sendingDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
- //clear:both
- var clearBoth=$("<div style='clear:both;'/>")
+ //Passage d'un draft -> sent
+ $("a.draft").click(draftToSent);
- li.append(leftDiv);
- li.append(aAccepted);
- li.append(aRejected);
- li.append(rightDiv);
- li.append(clearBoth);
+ $( "#dialog-form-draftToSent" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
- var sents = $(".sents");
- sents.append(li);
- oldQuotation.slideUp();
+ var sendingDate = $("#sendDate").val();
+ var id = $("#draft-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#sendDate")).add($("#draft-wikittyId"))
- //update draftAmount and draftAmountHope
- var draftAmount = parseInt($("#draftAmount").text()) - wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var draftAmountHope = parseInt($("#draftAmountHope").text()) - amountHope;
- $("#draftAmount").text(draftAmount);
- $("#draftAmountHope").text(draftAmountHope);
+ var dialog = $( this );
- //update sentAmount and sentAmountHope
- var sentAmount = parseInt($("#sentAmount").text()) + wikitty["Quotation.amount"];
- var sentAmountHope = parseInt($("#sentAmountHope").text()) + amountHope;
- $("#sentAmount").text(sentAmount);
- $("#sentAmountHope").text(sentAmountHope);
+ $.post(createUrl("/sales/funnel/json/send/", id,"?sendingDate=", sendingDate),
+ function(data){
+ //success
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- });
- }
+ var wikittyId = data.meta.id;
+ var wikitty = data.data;
- function sentToRejected(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $.get(createUrl("/sales/funnel/json/reject/", id),
- function(data){
- //success
- oldQuotation.slideUp();
+ var li = $("<li></li>").addClass("salesFunnelItem draft");
- var wikitty = data.data;
+ //leftDiv
+ var leftDiv = $("<div></div>").addClass("pull-left");
+ var aIconEdit = $("<a></a>")
+ .attr("href",createUrl("/wikitty/edit/", wikittyId));
+ var iconEdit = $("<i></i>").addClass("icon-edit");
+ aIconEdit.append(iconEdit);
+ leftDiv.append(aIconEdit);
+ var smallAccount = $("<small></small>");
+ if (wikitty["Quotation.customer"]!=null){
+ var customer = data.preloaded[wikitty["Quotation.customer"]];
+ var firstName = customer.preloaded[customer.data["Employee.person"]].data["Person.firstName"];
+ var lastName = customer.preloaded[customer.data["Employee.person"]].data["Person.lastName"];
+ var company = customer.preloaded[customer.data["Employee.company"]].data["Company.name"];
+ }
+ var aAccount = $("<a></a>")
+ .text(firstName + " " + lastName + " (" + company + ")")
+ .attr("href", createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"]));
+ smallAccount.append(aAccount);
+ leftDiv.append(smallAccount);
+ var leftP = $("<p> - </p>");
+ var itemTitleSpan = $('<span></span>').addClass('salesFunnelItemTitle');
- //update sentAmount and sentAmountHope
- var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
- $("#sentAmount").text(sentAmount);
- $("#sentAmountHope").text(sentAmountHope);
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- });
- }
+ if (wikitty["Quotation.project"]!=null) {
+ var aProject = $("<a/>")
+ .addClass("nameLink")
+ .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"]))
+ .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]);
+ }
+ itemTitleSpan.append(aProject);
+ var descriptionSmall = $('<small/>').text(wikitty["Quotation.description"]);
+ leftP.append(descriptionSmall);
+ leftP.prepend(itemTitleSpan);
+ leftDiv.append(leftP);
- function sentToAccepted(){
- var id = $(this).attr('wikittyId');
- var oldQuotation = $(this).parent();
- $.get(createUrl("/sales/funnel/json/accept/", id),
- function(data){
- //success
- oldQuotation.slideUp();
+ //button
+ var aAccepted = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-success pull-right salesFunnelItemButton sent toAccepted")
+ .text("Accepté")
+ .click(sentToAccepted);
+ var aRejected = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-danger pull-right salesFunnelItemButton sent toRejected")
+ .text("Rejeté")
+ .click(sentToRejected);
+ var aCancelled = $('<a/>')
+ .attr('wikittyId', wikittyId)
+ .addClass("btn btn-warning pull-right salesFunnelItemButton sent toCancelled")
+ .text("Annuler")
+ .click(toCancelled);
- var wikitty = data.data;
+ //rightDiv
+ var rightDiv = $("<div>").addClass("pull-right");
+ var rightP = $("<p>").addClass("salesFunnelItemTitle").text(wikitty["Quotation.amount"] +" €");
+ if (wikitty["Quotation.category"] != null) {
+ var smallInfo = $("<small>")
+ .text(data.preloaded[wikitty["Quotation.category"]].data["WikittyTreeNode.name"]
+ + ' - ' + wikitty["Quotation.estimatedDays"] + 'j - ' +
+ wikitty["Quotation.conversionHope"] + "%");
+ }
+ rightDiv.append(rightP);
+ rightDiv.append(smallInfo);
- //update sentAmount and sentAmountHope
- var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
- var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
- var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
- $("#sentAmount").text(sentAmount);
- $("#sentAmountHope").text(sentAmountHope);
- }).fail(function(){
- //fail
- //TODO JC20130212 retour utilisateur
- });
- }
+ //clear:both
+ var clearBoth=$("<div style='clear:both;'/>")
- //Passage d'un lead -> draft
- $("a.lead").click(leadToDraft);
+ li.append(leftDiv);
+ li.append(aAccepted);
+ li.append(aRejected);
+ li.append(aCancelled);
+ li.append(rightDiv);
+ li.append(clearBoth);
- //Passage d'un draft -> sent
- $("a.draft").click(draftToSent);
+ var sents = $(".sents");
+ sents.append(li);
+ oldQuotation.slideUp();
- //Passage d'un sent vers accepted
- $("a.toAccepted").click(sentToAccepted);
+ //update draftAmount and draftAmountHope
+ var draftAmount = parseInt($("#draftAmount").text()) - wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var draftAmountHope = parseInt($("#draftAmountHope").text()) - amountHope;
+ $("#draftAmount").text(draftAmount);
+ $("#draftAmountHope").text(draftAmountHope);
- //Passage d'un sent vers rejected
- $("a.toRejected").click(sentToRejected);
+ //update sentAmount and sentAmountHope
+ var sentAmount = parseInt($("#sentAmount").text()) + wikitty["Quotation.amount"];
+ var sentAmountHope = parseInt($("#sentAmountHope").text()) + amountHope;
+ $("#sentAmount").text(sentAmount);
+ $("#sentAmountHope").text(sentAmountHope);
+ allFields.val("");
+ dialog.dialog( "close" );
+
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#sendDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
+
+ //Passage d'un sent vers accepted
+ $("a.toAccepted").click(sentToAccepted);
+
+ $( "#dialog-form-sentToAccepted" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
+
+ var acceptedDate = $("#acceptedDate").val();
+ var id = $("#sent-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#acceptedDate")).add($("#sent-wikittyId"))
+
+ var dialog = $( this );
+
+ $.post(createUrl("/sales/funnel/json/accept/", id,"?acceptedDate=", acceptedDate),
+ function(data){
+ //success
+ oldQuotation.slideUp();
+
+ var wikitty = data.data;
+
+ //update sentAmount and sentAmountHope
+ var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
+ $("#sentAmount").text(sentAmount);
+ $("#sentAmountHope").text(sentAmountHope);
+
+ allFields.val("");
+
+ dialog.dialog( "close" );
+
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#acceptedDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
+
+ //Passage d'un sent vers rejected
+ $("a.toRejected").click(sentToRejected);
+
+ $( "#dialog-form-sentToRejected" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
+
+ var rejectedDate = $("#rejectedDate").val();
+ var id = $("#rejected-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#rejectedDate")).add($("#rejected-wikittyId"))
+
+ var dialog = $( this );
+
+ $.post(createUrl("/sales/funnel/json/reject/", id,"?rejectedDate=", rejectedDate),
+ function(data){
+ //success
+ oldQuotation.slideUp();
+
+ var wikitty = data.data;
+
+ //update sentAmount and sentAmountHope
+ var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
+ var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
+ $("#sentAmount").text(sentAmount);
+ $("#sentAmountHope").text(sentAmountHope);
+
+ allFields.val("");
+
+ dialog.dialog( "close" );
+
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#rejectedDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
+
+ //Passage vers cancelled
+ $("a.toCancelled").click(toCancelled);
+
+ $( "#dialog-form-toCancelled" ).dialog({
+ autoOpen: false,
+ height: 300,
+ width: 350,
+ modal: true,
+ buttons: {
+ Ok: function() {
+
+ var cancelledDate = $("#cancelledDate").val();
+ var reason = $("#cancelledReason").val();
+ var id = $("#cancelled-wikittyId").val();
+ var oldQuotation = $(this).data('oldQuotation');
+ var allFields = $([]).add($("#cancelledDate")).add($("#cancelled-wikittyId")).add($("#cancelledReason"));
+
+ var dialog = $( this );
+
+ $.post(createUrl("/sales/funnel/json/cancel/", id,"?cancelledDate=", cancelledDate,"&reason=",reason),
+ function(data){
+ //success
+ oldQuotation.slideUp();
+
+ var wikitty = data.data;
+
+ //TODO JC20130527 update amounts
+ //update sentAmount and sentAmountHope
+ //var sentAmount = parseInt($("#sentAmount").text()) - wikitty["Quotation.amount"];
+ //var amountHope = wikitty["Quotation.amount"]*wikitty["Quotation.conversionHope"]/100;
+ //var sentAmountHope = parseInt($("#sentAmountHope").text()) - amountHope;
+ //$("#sentAmount").text(sentAmount);
+ //$("#sentAmountHope").text(sentAmountHope);
+
+ allFields.val("");
+ dialog.dialog( "close" );
+
+ }).fail(function(){
+ //fail
+ //TODO JC20130212 retour utilisateur
+ dialog.dialog( "close" );
+ });
+
+ },
+ Cancel: function() {
+ $( this ).dialog( "close" );
+ }
+ },
+ close: function() {
+ },
+ open: function(event, ui) {
+ var date = new Date();
+ $("#cancelledDate").val(date.getDate() + "/" + (date.getMonth()+1)+"/"+date.getFullYear());
+ }
+ });
+
// ********************************************************************
// * PROJECT DASHBOARD *
// ********************************************************************
1
0