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

r385 - in trunk/src/site: . rst
by meynier＠users.chorem.org Aug. 14, 2013

Aug. 14, 2013

Author: meynier Date: 2013-08-14 17:19:41 +0200 (Wed, 14 Aug 2013) New Revision: 385 Url: http://chorem.org/projects/chorem/repository/revisions/385 Log: Added the calculation documentation Added: trunk/src/site/rst/calculations.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/rst/calculations.rst =================================================================== --- trunk/src/site/rst/calculations.rst (rev 0) +++ trunk/src/site/rst/calculations.rst 2013-08-14 15:19:41 UTC (rev 385) @@ -0,0 +1,199 @@ +======================== +Gestion de projet Chorem +======================== +-------------------------------------------------- +Outil de gestion et de suivi de projet dans Chorem +-------------------------------------------------- + +.. contents:: + +1. Bilan projet +=============== + +Le bilan de projet présente divers calculs financiers liés aux projets. + +Un certain nombre d'éléments sont à saisir manuellement, les champs en italique sont nécéssaires pour les calculs présent dans le bilan/tableau de bord : + +1.1. Quotation +-------------- + +:*Interval*: l'intervalle de temps sur lequel se déroule le devis +:description: description du devis +:*estimatedDays*: nombre de jours-homme estimés +:*amount*: montant facturé au client +:VAT: taxe à appliquer au montant +:conversionHope: pourcentage de réussite du projet +:supplier: personne chargée du dossier dans l'entreprise +:customer: personne chargée du dossier coté client +:project: projet lié au devis +:category: catégorie du devis + +Pour chaque devis, un ensemble de tâche est associé. Les calculs effectués sur les tâches sont les mêmes que ceux des devis, seul le calcul de certains éléments diffèrent. +Les champs à saisir manuellement des tâches est : + +1.2. Task +--------- + +:*Interval*: l'intervalle de temps sur lequel se déroule la tâche +:description: description de la tâche +:*dayExtension*: jours supplémentaire nécéssaires pour finir la tâche +:*price*: prix facturé pour la tâche +:*estimatedDays*: nombre de jours-homme estimés +:name: nom de la tâche +:*status*: statut de la tâche, devant être actualisé à chaque modification de statut +:*quotation*: devis lié à la tâche + +1.3. Calculs +------------ + +Les calculs sont effectués grâce à la classe **Calculation** présente dans le package *org.chorem.project*. C'est une classe abstraite qui factorise les calculs des Task et des Quotation. Les classes **QuotationCalculation** et **TaskCalculation** définissent les méthodes spécifiques au type d'objet. + +1.3.1. TJM [1]_ estimé +~~~~~~~~~~~~~~~~~~~~~~ + +Le TJM (ou ADR) est ce qui facturé au client par jour:: + + adr = amount / estimatedDays + +1.3.2. TJM réel +~~~~~~~~~~~~~~~ + +Le TJM réel est calculé en fonction du nombre de `jours réels`_ :: + + adr = amount / realDays + +.. _`jours réels`: + +1.3.3. Jours réels +~~~~~~~~~~~~~~~~~~ +La méthode realDays() permet de calculer le nombre de jours réels qu'a pris le projet. Cette méthode est abstraite dans **Calculation**. La durée réelle d'un devis est la somme de la durée de ses tâches. +Le calcul de la durée réelle est effectuée de deux manières différentes, si le devis est terminé ou non. + +a. Devis non terminé +____________________ + +Si le devis n'est pas terminé, le nombre de jours réels est égal au nombre de jours éstimé plus le nombre de jours supplémentaire:: + + realDays = estimatedDays + dayExtension + +b. Devis terminé +________________ + +Si le devis est terminé, le nombre de jours réels est égal à la somme des temps passés sur la tâche (objets Time):: + + realDays = Σ time + +Le temps est divisé en jours, en prenant comme diviseur l'horaire journalier de l'employé concerné.:: + + time = hours / employee.dailyHoursWorked + +1.3.4. Différence estimation/réel +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Simple soustraction entre le nombre de jours estimés et `jours réels`_:: + + deltaDays = realDays - estimatedDays + +.. _`CJM estimé`: + +1.3.5. CJM [2]_ estimé +~~~~~~~~~~~~~~~~~~~~~~ + +Moyenne des CJM (ou ADC) des employés en fonction du pourcentage estimé (pour un devis, un calcul du pourcentage moyen par employé est effectué au préalable):: + + estimatedAdc = Σ (employee.adc*task.estimatedPercentage(employee)) + +.. _`CJM réel`: + +1.3.6. CJM réel +~~~~~~~~~~~~~~~ + +Moyenne des CJM (ou ADC) des employés en fonction du temps réel passé:: + + estimatedAdc = Σ (employee.adc*employee.timeSpent) + +1.3.7. Gain attendu +~~~~~~~~~~~~~~~~~~~ + +Le gain attendu est calculé à partir du montant, du nombre de jours estimés et du `CJM estimé`_ :: + + expectedProfit = amount - (estimatedDays * estimatedAdc) + +1.3.7. Gain ou perte réelle +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Gain ou perte réalisée à la fin du projet, calculée à partir du nombre de `jours réels`_ et du `CJM réel`_ :: + + lossOrProfit = amount - (realDays * realAdc) + +1.4. Alertes des tâches +----------------------- + +En cas de dépassement des délais ou autre déroulement non prévu, des alertes sont affichées sur le tableau de bord. Voici la liste des évenements déclenchant, pour l'instant, des alertes : + + * La tâche devrait avoir commencé (statut "SCHEDULED" alors que la date de début est passée) + * La tâche a été commencé en avance (statut "STARTED" alors que la date de début n'est pas passée) + * La tâche devrait être finie (statut "STARTED" alors que la date de fin est passée) + * La tâche a été finie en avance (statut "FINISHED" alors que la date de début n'est pas passée) + +2. Gestion des employés +======================= + +2.1 Calcul du CJM +----------------- + +La classe **AdcCalculation** dans le package *org.chorem.project* gère le calcul du CJM [2]_ (ou ADC). +Il existe deux types de CJM : le CJM réel est le CJM estimé. Une seule variable du calcul change : le temps productif sur l'année. +Dans le cas du CJM estimé, ce temps est calculé à partir du temps journalier et du taux de productivité. +Dans le cas du CJM réel, il est calculé à partir des objets Time de l'année concernée.:: + + adc = ( (expenses * employeeCost) / totalCompanyCost ) / productiveDays; + +2.1.1 Dépenses totales +~~~~~~~~~~~~~~~~~~~~~~ + +Les dépenses totales sont la somme des paiements (FinancialTransaction) effectués par l'entreprise sur l'année. Une simple requête Wikitty est effectué afin de récupérer ces objets FinancialTransaction afin d'effectuer la somme des montants HT:: + + totalExpenses = Σ expense + +2.1.2 Coût annuel de l'employé +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Le coût annuel de l'employé est le salaire à temps plein multiplié par le nombre de jours travaillé durant l'année:: + + employeeCost = ( employee.salary + employee.otherPayments) * employee.partialTime * productiveDays + + +2.1.3 Nombre de jours travaillés +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +En fonction du CJM souhaité, la méthode de calcul du nombre de jours productifs dans l'année est différente. + +CJM estimé +__________ + +Dans le cas du CJM estimé, on prend le nombre de jours ouvrés dans une année, puis on le multiplie par le taux de travail et de productivité de l'employé.:: + + productiveDays = workingDaysInAYear * partialTime * productivityRate + +CJM réel +________ + +Dans le cas du CJM réel, on additionne tous les temps réalisés par l'employé avant de diviser par son horaire journalier et son taux de productivité.:: + + productiveDays = ( Σ(times(employee)) / dailyHoursWorked ) * productivityRate + +2.1.4 Coût annuel de l'entreprise +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Le coût annuel de l'entreprise est la somme des coûts annuels des employés productifs.:: + + totalCompanyCost = Σ employeeCost(company.employees) + + +.. [1] Taux Journalier Moyen (ADR : Average Daily Rate) +.. [2] Coût Journalier Moyen (ADC : Average Daily Cost) + + + + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-08-14 14:17:38 UTC (rev 384) +++ trunk/src/site/site_fr.xml 2013-08-14 15:19:41 UTC (rev 385) @@ -84,6 +84,7 @@ <item name="Accueil" href="index.html"/> <item name="CDC" href="chorem-cdc.html"/> <item name="requisite" href="requisite.html"/> + <item name="calculs" href="calculations.html"/> </menu> <menu ref="reports"/>

1 0

Build failed in Jenkins: chorem #185
by admin+hudson＠codelutin.com Aug. 14, 2013

Aug. 14, 2013

See <http://ci.nuiton.org/jenkins/job/chorem/185/changes> Changes: [meynier] Updated model for the new page. Added ADC extension and a method in CHoremClient ------------------------------------------ [...truncated 911 lines...] 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: 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] index.jsp~:6:50: 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: 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 [Fatal Error] dashboardProfitability.jsp~:21:46: 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: 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 [Fatal Error] sentQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound. [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] dashboardMultiProject.jsp~:2:33: The prefix "f" for element "f:setLocale" 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: 2; columnNumber: 33; The prefix "f" for element "f:setLocale" 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: 2; columnNumber: 33; The prefix "f" for element "f:setLocale" 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: 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] report.jsp~:5:40: The prefix "c" for element "c:if" 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: 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 [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/ws/trunk/chorem-webmotion/src/main/…> 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: 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/ws/trunk/chorem-webmotion/target/i1…;> 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 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] dashboardSingleProject.jsp~:2:34: The prefix "f" for element "f:setLocale" 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: 2; columnNumber: 34; The prefix "f" for element "f:setLocale" 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: 2; columnNumber: 34; The prefix "f" for element "f:setLocale" 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… Downloaded: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/3.1… (1018 B at 33.1 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/wik… Downloaded: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/wik… (3 KB at 67.5 KB/sec) [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:3.1:compile (default-compile) @ chorem-webmotion --- [INFO] Compiling 41 source files to <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/cl…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>: Recompile with -Xlint:unchecked for details. [INFO] 3 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[129,44] no suitable method found for getAdc(org.chorem.ChoremClient,org.chorem.entities.EmployeeHR) method org.chorem.project.AdcCalculation.getAdc() is not applicable (actual and formal argument lists differ in length) method org.chorem.project.AdcCalculation.getAdc(boolean) is not applicable (actual and formal argument lists differ in length) [ERROR] <http://ci.nuiton.org/jenkins/job/chorem/ws/trunk/chorem-webmotion/target/pr…>:[153,62] no suitable method found for getMultipleAdc(org.chorem.ChoremClient,java.util.List<org.chorem.entities.EmployeeHR>) method org.chorem.project.AdcCalculation.getMultipleAdc(boolean) is not applicable (actual and formal argument lists differ in length) method org.chorem.project.AdcCalculation.getMultipleAdc() is not applicable (actual and formal argument lists differ in length) [INFO] 2 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Chorem ............................................ SUCCESS [2.161s] [INFO] Chorem :: entities ................................ SUCCESS [10.990s] [INFO] Chorem :: webmotion ............................... FAILURE [5.234s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 18.928s [INFO] Finished at: Wed Aug 14 14:16:27 CEST 2013 [INFO] Final Memory: 40M/280M [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:3.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:3.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:174) 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.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) 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 1

Build failed in Jenkins: chorem » Chorem :: webmotion #185
by admin+hudson＠codelutin.com Aug. 14, 2013

Aug. 14, 2013

See <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…> ------------------------------------------ [...truncated 409 lines...] 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] projectSalesReport.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] 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] [Fatal Error] acceptedQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound. 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: 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] decorator.jsp~:7:6: The processing instruction target matching "[xX][mM][lL]" is not allowed. [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: 7; columnNumber: 6; The processing instruction target matching "[xX][mM][lL]" is not allowed. 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: 7; columnNumber: 6; The processing instruction target matching "[xX][mM][lL]" is not allowed. 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: 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] index.jsp~:6:50: 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: 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 [Fatal Error] dashboardProfitability.jsp~:21:46: 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: 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 [Fatal Error] sentQuotation.jsp~:4:37: The prefix "jsp" for element "jsp:include" is not bound. [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] dashboardMultiProject.jsp~:2:33: The prefix "f" for element "f:setLocale" 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: 33; The prefix "f" for element "f:setLocale" 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: 33; The prefix "f" for element "f:setLocale" 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] report.jsp~:5:40: The prefix "c" for element "c:if" 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: 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 [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/…> 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: 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 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] dashboardSingleProject.jsp~:2:34: The prefix "f" for element "f:setLocale" 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: 34; The prefix "f" for element "f:setLocale" 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: 34; The prefix "f" for element "f:setLocale" 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… Downloaded: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/3.1… (1018 B at 33.1 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/wik… Downloaded: http://nexus.nuiton.org/nexus/content/groups/wikitty/org/nuiton/wikitty/wik… (3 KB at 67.5 KB/sec) [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:3.1:compile (default-compile) @ chorem-webmotion --- [INFO] Compiling 41 source files to <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>: Recompile with -Xlint:unchecked for details. [INFO] 3 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[129,44] no suitable method found for getAdc(org.chorem.ChoremClient,org.chorem.entities.EmployeeHR) method org.chorem.project.AdcCalculation.getAdc() is not applicable (actual and formal argument lists differ in length) method org.chorem.project.AdcCalculation.getAdc(boolean) is not applicable (actual and formal argument lists differ in length) [ERROR] <http://ci.nuiton.org/jenkins/job/chorem/org.chorem.chorem$chorem-webmotion/…>:[153,62] no suitable method found for getMultipleAdc(org.chorem.ChoremClient,java.util.List<org.chorem.entities.EmployeeHR>) method org.chorem.project.AdcCalculation.getMultipleAdc(boolean) is not applicable (actual and formal argument lists differ in length) method org.chorem.project.AdcCalculation.getMultipleAdc() is not applicable (actual and formal argument lists differ in length) [INFO] 2 errors [INFO] -------------------------------------------------------------

1 1

r384 - in trunk: chorem-entities/src/main/java/org/chorem chorem-entities/src/main/java/org/chorem/project chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project chorem-webmotion/src/main/resources chorem-webmotion/src/main/webapp/WEB-INF/jsp chorem-webmotion/src/main/webapp/js
by meynier＠users.chorem.org Aug. 14, 2013

Aug. 14, 2013

Author: meynier Date: 2013-08-14 16:17:38 +0200 (Wed, 14 Aug 2013) New Revision: 384 Url: http://chorem.org/projects/chorem/repository/revisions/384 Log: Changed tabulation into spaces and added the adc dashboard page. Added a level of alert $info$. Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.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/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2013-08-14 14:17:38 UTC (rev 384) @@ -389,7 +389,7 @@ WikittyQueryResult<Task> taskResult = findAllByQuery(Task.class, taskQuery); return taskResult.getAll(); } - + /** * Fetch the times from the given task * @param t Task @@ -400,17 +400,17 @@ WikittyQuery timeQuery = new WikittyQueryMaker() .eq(Time.ELEMENT_FIELD_TIME_TASK, t) .end(); - + timeQuery.addSortAscending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE); - + WikittyQueryResult<Time> timeResult = findAllByQuery(Time.class, timeQuery); - + return timeResult.getAll(); } /** * Returns the daily return of the given empoyee - * @param e - * @return + * @param e employee + * @return daily return of employee */ public double getDailyReturn(Employee e) { @@ -419,17 +419,21 @@ if(e.getCompany(false) != null) companyW = restore(e.getCompany(false).getWikittyId()); + double dailyReturn = 0; + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { - return w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); + dailyReturn = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); } else if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { - return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); + dailyReturn = companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); } else { - return this.getConfiguration().getDailyReturn(); + dailyReturn = this.getConfiguration().getDailyReturn(); } + + return dailyReturn; } /** * Returns the daily hours worked of the given empoyee @@ -443,20 +447,24 @@ if(e.getCompany(false) != null) companyW = restore(e.getCompany(false).getWikittyId()); + double dailyHoursWorked = 0; + if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { - return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * + dailyHoursWorked = companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * (w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME)/100); } else { - return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED); + dailyHoursWorked = companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED); } } else { - return this.getConfiguration().getDailyHoursWorked(); + dailyHoursWorked = this.getConfiguration().getDailyHoursWorked(); } + + return dailyHoursWorked; } Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2013-08-14 14:17:38 UTC (rev 384) @@ -69,6 +69,12 @@ return getPeriodInSeconds(start, end)/3600; } + /** + * Calculates the number of working days between two dates + * @param begin start date + * @param end end date + * @return number of working days + */ public static int getWorkingDays(Date begin, Date end) { GregorianCalendar gBegin = new GregorianCalendar(); GregorianCalendar gEnd = new GregorianCalendar(); Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2013-08-14 14:17:38 UTC (rev 384) @@ -19,17 +19,36 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; - +/** + * Makes the calculation for the adc. + * It can calculate the adc of one or more employee by using the method getAdc or getMultipleAdc + * Usage : construct the object with an employee or a list of employees and call the method + * getAdc() or getMultipleAdc() + * + * @author gwenn + * + */ public class AdcCalculation { + /** Chorme Client*/ protected ChoremClient client; + /** Company of the employee(s) */ protected Company company; + /** Employee */ protected EmployeeHR employee; + /** List of employees */ protected List<EmployeeHR> employees; - + + /** start date of the year*/ protected Date start; + /** end date of the year*/ protected Date end; - + + /** + * Construct the object for calculating the adc of an employee + * @param client chorem client + * @param employee employee withthe adc to calculate + */ public AdcCalculation(ChoremClient client, EmployeeHR employee) { this.employee = employee; this.company = employee.getCompany(false); @@ -37,7 +56,12 @@ this.employees = null; initDate(); } - + + /** + * Construct the object for calculating the adc of a list of employees + * @param client chorem client + * @param employees employees with the adc to calculate + */ public AdcCalculation(ChoremClient client, List<EmployeeHR> employees) { this.employees = employees; this.company = employees.get(0).getCompany(false); @@ -45,31 +69,46 @@ this.employee = null; initDate(); } - - private void initDate() { + + /** + * Initiate the start and end date to the beginning and end of the year + * TODO : Manage this in the configuration of chorem + */ + protected void initDate() { + Calendar cstart = new GregorianCalendar(); + cstart.add(Calendar.YEAR, -1); + cstart.set(Calendar.MONTH, Calendar.JANUARY); + cstart.set(Calendar.DAY_OF_MONTH, 1); + cstart.set(Calendar.HOUR_OF_DAY, 0); + cstart.set(Calendar.MINUTE, 0); + cstart.set(Calendar.SECOND, 0); + cstart.set(Calendar.MILLISECOND, 0); + Calendar cend = new GregorianCalendar(); cend.add(Calendar.YEAR, -1); cend.set(Calendar.MONTH, Calendar.DECEMBER); cend.set(Calendar.DAY_OF_MONTH, 31); + cend.set(Calendar.HOUR_OF_DAY, 23); + cend.set(Calendar.MINUTE, 59); + cend.set(Calendar.SECOND, 59); + cend.set(Calendar.MILLISECOND, 999); + - Calendar cstart = new GregorianCalendar(); - cstart.add(Calendar.YEAR, -1); - cstart.set(Calendar.MONTH, Calendar.JANUARY); - cstart.set(Calendar.DAY_OF_MONTH, 1); - + start = cstart.getTime(); end = cend.getTime(); } - - + + /** * Calculates the total gains made by the company in one year - * @return + * TODO : Use wikitty function for sum. + * @return total expenses */ public double getTotalExpenses() { //Construct the query - //TODO : Use wikitty function for sum. + WikittyQuery expenseQuery = new WikittyQueryMaker() .and() .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) //of type financial transaction @@ -117,9 +156,14 @@ return (daysInYear * (partialTime/100) * (productivityRate/100)); } - + + /** + * Returns the real number of procuctive days in year, which is the sum of all the time object by the employee + * @param e + * @return + */ public double getRealNumberOfProductiveDays(EmployeeHR e) { - + //fetch the times of all the employees of the company that have worked between $start an $end WikittyQuery timeQuery = new WikittyQueryMaker() .and() @@ -135,15 +179,17 @@ double total = 0; for(Time t : result.getAll()) { total += ChoremUtil.getPeriodInHours(t.getBeginDate(), t.getEndDate()); - + } return (total/ client.getDailyHoursWorked(e) ) - * (e.getProductivityRate()/100); + * (e.getProductivityRate()/100); } /** - * + * calculates the full time cost in a year + * @param e + * @param real true if the real time is needed * @return */ public double getYearCost(EmployeeHR e, boolean real) { @@ -157,6 +203,11 @@ return result; } + /** + * calculates the full time cost in a year for all the employees in the company + * @param real true if the real time is needed + * @return + */ public double getTotalYearCost(boolean real) { double total = 0; @@ -220,8 +271,8 @@ * @return */ public double getAdc(boolean real) { - + double expenses = getTotalExpenses(); double productiveDays = 0; if(real) { @@ -230,7 +281,7 @@ else { productiveDays = getEstimatedNumberOfProductiveDays(employee); } - + double cost = getYearCost(employee, real); double totalCost = getTotalYearCost(real); @@ -238,13 +289,13 @@ System.out.println("PROD DAYS : " + productiveDays); System.out.println("COST : " + expenses); System.out.println("TOTAL COST : " + expenses); - + double adc = ( (expenses * cost) / totalCost ) / productiveDays; return adc; } - + public double getAdc() { return getAdc(false); } @@ -257,56 +308,55 @@ * @param client * @param employees * @return - */ - public Map<String, Double> getMultipleAdc(boolean real) { - if(employees.size() == 0) - return null; - - Calendar cend = new GregorianCalendar(); + */ + public Map<String, Double> getMultipleAdc(boolean real) { + if(employees.size() == 0) + return null; + + Calendar cend = new GregorianCalendar(); cend.add(Calendar.YEAR, -1); cend.set(Calendar.MONTH, Calendar.DECEMBER); cend.set(Calendar.DAY_OF_MONTH, 31); - + Calendar cstart = new GregorianCalendar(); cstart.add(Calendar.YEAR, -1); cstart.set(Calendar.MONTH, Calendar.JANUARY); cstart.set(Calendar.DAY_OF_MONTH, 1); - + Date start = cstart.getTime(); Date end = cend.getTime(); - //Calculate all the "static" values before + //Calculate all the "static" values before - double expenses = getTotalExpenses(); + double expenses = getTotalExpenses(); double totalCost = getTotalYearCost(real); - //Then, for each employee + //Then, for each employee - HashMap<String, Double> adcs = new HashMap<String, Double>(); - for(EmployeeHR e : employees) { - this.employee = e; - - double productiveDays = 0; - if(real) { - productiveDays = getRealNumberOfProductiveDays(e); - } - else { - productiveDays = getEstimatedNumberOfProductiveDays(e); - } - double cost = getYearCost(e, real); + HashMap<String, Double> adcs = new HashMap<String, Double>(); + for(EmployeeHR e : employees) { + this.employee = e; - Double adc = ( ( (expenses * cost) / totalCost ) / productiveDays); - if(adc.isNaN()) { - adc = 0.0; - } - adcs.put(e.getWikittyId(),adc); - } + double productiveDays = 0; + if(real) { + productiveDays = getRealNumberOfProductiveDays(e); + } + else { + productiveDays = getEstimatedNumberOfProductiveDays(e); + } + double cost = getYearCost(e, real); - return adcs; + Double adc = ( ( (expenses * cost) / totalCost ) / productiveDays); + if(adc.isNaN()) { + adc = 0.0; + } + adcs.put(e.getWikittyId(),adc); + } - } + return adcs; + } @@ -314,4 +364,5 @@ + } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2013-08-14 14:17:38 UTC (rev 384) @@ -10,84 +10,88 @@ public class QuotationCalculation extends Calculation<Quotation> { - - private List<Task> tasks = null; - - public QuotationCalculation(Quotation q, ChoremClient client) { - super(q, q.getAmount(), q.getEstimatedDays(), client); - } - @Override - public double realDays() { - double totalTime = 0; - //For each task - for(Task t : client.getTasks(e)) { - //Sum the real days of the tasks objects - totalTime+=new TaskCalculation(t, client).getRealDays(); - } - return totalTime; + private List<Task> tasks = null; - } + public QuotationCalculation(Quotation q, ChoremClient client) { + super(q, q.getAmount(), q.getEstimatedDays(), client); + } - @Override - public HashMap<Employee, Double> getPercentages() { - HashMap<Employee, Double> percentages = new HashMap<Employee, Double>(); - double totalDays = 0; - for(Task t : getTasks()) - totalDays += t.getEstimatedDays(); - - List<Task> tasks = getTasks(); - for(Task t : tasks) { + @Override + public double realDays() { + double totalTime = 0; + //For each task + for(Task t : client.getTasks(e)) { + //Sum the real days of the tasks objects + totalTime+=new TaskCalculation(t, client).getRealDays(); + } + return totalTime; - HashMap<Employee, Double> taskPercentages = new TaskCalculation(t, client).getPercentages(); - for(Employee emp : taskPercentages.keySet()) { - double rate = (t.getEstimatedDays()/totalDays); - if(percentages.containsKey(emp)) { - //We temporaly put the sum in the map. - percentages.put(emp, percentages.get(emp) + taskPercentages.get(emp)*rate); - } - else { - percentages.put(emp, taskPercentages.get(emp)*rate); - } + } - } - } + @Override + public HashMap<Employee, Double> getPercentages() { + HashMap<Employee, Double> percentages = new HashMap<Employee, Double>(); + double totalDays = 0; + for(Task t : getTasks()) + totalDays += t.getEstimatedDays(); - //Caluculate the average for each employee - /*Set<Employee> keySet = percentages.keySet(); + List<Task> tasks = getTasks(); + for(Task t : tasks) { + + HashMap<Employee, Double> taskPercentages = new TaskCalculation(t, client).getPercentages(); + for(Employee emp : taskPercentages.keySet()) { + double rate = (t.getEstimatedDays()/totalDays); + if(percentages.containsKey(emp)) { + //We temporaly put the sum in the map. + percentages.put(emp, percentages.get(emp) + taskPercentages.get(emp)*rate); + } + else { + percentages.put(emp, taskPercentages.get(emp)*rate); + } + + } + } + + //Caluculate the average for each employee + /*Set<Employee> keySet = percentages.keySet(); for(Employee emp : keySet) { percentages.put(emp, percentages.get(emp)/tasks.size()); }*/ - return percentages; - } + return percentages; + } - @Override - public HashMap<Employee, Double> getTimes() { - HashMap<Employee, Double> times = new HashMap<Employee, Double>(); + @Override + public HashMap<Employee, Double> getTimes() { + HashMap<Employee, Double> times = new HashMap<Employee, Double>(); - for(Task t : getTasks()) { + for(Task t : getTasks()) { - HashMap<Employee, Double> taskPercentages = new TaskCalculation(t, client).getTimes(); - for(Employee emp : taskPercentages.keySet()) { - if(times.containsKey(emp)) { - times.put(emp, times.get(emp) + taskPercentages.get(emp)); - } - else { - times.put(emp, taskPercentages.get(emp)); - } + HashMap<Employee, Double> taskPercentages = new TaskCalculation(t, client).getTimes(); + for(Employee emp : taskPercentages.keySet()) { + if(times.containsKey(emp)) { + times.put(emp, times.get(emp) + taskPercentages.get(emp)); + } + else { + times.put(emp, taskPercentages.get(emp)); + } - } + } - } + } - return times; - } - - public List<Task> getTasks() { - if(tasks == null) - tasks = client.getTasks(e); - return tasks; - - } + return times; + } + + /** + * Fetch the tasks of the quotation keep a reference + * @return + */ + public List<Task> getTasks() { + if(tasks == null) + tasks = client.getTasks(e); + return tasks; + + } } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2013-08-14 14:17:38 UTC (rev 384) @@ -3,22 +3,38 @@ import java.util.HashMap; import java.util.List; -import org.chorem.ChoremClient; import org.chorem.entities.Employee; import org.chorem.entities.Quotation; -import org.chorem.entities.Task; +/** + * Calculates the total values of the quotation calculations + * Usage : construct the cobject by sending the list of quotation in parameter, then you can get the totals + * by using the total* methdds. + * @author gwenn + * + */ public class TotalQuotationCalculation extends Calculation<Quotation> { - + /** + * List of quotation calculation + */ private List<QuotationCalculation> calculations; + /** + * + * @param calculations list of calculation used to calculate the total. + */ public TotalQuotationCalculation(List<QuotationCalculation> calculations) { super(null, totalAmount(calculations), totalEstimatedDays(calculations), null); //super(q, q.getAmount(), q.getEstimatedDays(), client); this.calculations = calculations; } + /** + * + * @param calculations + * @return total amount + */ private static double totalAmount(List<QuotationCalculation> calculations) { double total = 0; for(QuotationCalculation q : calculations) { @@ -28,6 +44,11 @@ return total; } + /** + * + * @param calculations + * @return + */ private static double totalEstimatedDays(List<QuotationCalculation> calculations) { double total = 0; for(QuotationCalculation q : calculations) { Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2013-08-14 14:17:38 UTC (rev 384) @@ -0,0 +1,210 @@ +package org.chorem.webmotion.actions; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.debux.webmotion.server.WebMotionController; +import org.chorem.ChoremClient; +import org.debux.webmotion.server.render.Render; +import org.chorem.entities.ADC; +import org.chorem.entities.Company; +import org.chorem.entities.CompanyImpl; +import org.chorem.entities.Employee; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; + +/** + * + * @author meynier + * + */ +public class AdcDashboardAction extends WebMotionController { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(AdcDashboardAction.class); + + /** + * Return a page with an array with the employees of the specified company + * + * @param client + * chorem client + * @param company + * employees will be fetched from this company + * @return + */ + public Render employeeFilter(ChoremClient client, Company company, int from, int to) { + // get all the empoyees from the default company + + List<Company> companies = client.findAllByQuery(Company.class, + new WikittyQueryMaker().exteq("Company").end()).getAll(); + + // Order by name + WikittyQuery employeeQuery = new WikittyQueryMaker().eq( + Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company).end(); + + WikittyQueryResult<Employee> employeeResult = client.findAllByQuery( + Employee.class, employeeQuery); + + List<EmployeeData> employees = new ArrayList<EmployeeData>(); + Set<Integer> years = new HashSet<Integer>(); + for (Employee e : employeeResult.getAll()) { + EmployeeData eData = new EmployeeData(e, client, from, to); + employees.add(eData); + years.addAll(eData.getAdcPerYear().keySet()); + } + + Collections.sort(employees); + + + + // simply return them + return renderView("dashboardAdc.jsp", + "employees", employees, + "from", from, + "to", to, + "lastYear", (new GregorianCalendar()).get(Calendar.YEAR) +1, + "companies", companies, + "company", + new CompanyImpl(client.restore(company.getWikittyId())), + "years", years, + "title", "ADC Dashboard"); + } + + /** + * generate a page to manage the adcs + * + * @param client chorem client + * @param companyId + * @param addExtension + * @param call + * @return + */ + public Render requestDashboardAdc(ChoremClient client, String companyId, Integer from, Integer to) { + Company company = null; + + if(from == null) { + from = (new GregorianCalendar()).get(Calendar.YEAR); + from--; + } + if(to == null) { + to = (new GregorianCalendar()).get(Calendar.YEAR); + } + + if (companyId == null) + company = client.getDefaultCompany(); + else { + company = new CompanyImpl(client.restore(companyId)); + } + + + + return employeeFilter(client, company, from , to); + } + + + + + + /** + * Structure used to store information about an employee Used for the AJAX + * request + * + * @author gwenn + * + */ + public class EmployeeJson { + + private String salary; + private double productivityRate; + private double partialTime; + private double dailyReturn; + private double dailyHoursWorked; + private double otherPayments; + + public EmployeeJson(String salary, double productivityRate, + double partialTime, double dailyReturn, + double dailyHoursWorked, double otherPayments) { + this.salary = salary; + this.productivityRate = productivityRate; + this.partialTime = partialTime; + this.dailyReturn = dailyReturn; + this.dailyHoursWorked = dailyHoursWorked; + this.otherPayments = otherPayments; + } + } + + /** + * Structure used to store information about an employee used for the + * standard http request + * + * @author gwenn + * + */ + public class EmployeeData implements Comparable { + + private Employee e; + private double estimatedAdc; + private Map<Integer, Double> adcPerYear; + + public EmployeeData(Employee e, ChoremClient client, int from, int to) { + Wikitty w = client.restore(e.getWikittyId()); + + this.estimatedAdc = client.getDailyReturn(e); + //Simple trick to limit to 2 numbers after digit + int x = (int)(client.getDailyHoursWorked(e)*100); + double y = x/100.0; + + x = (int)(this.estimatedAdc*100); + y = x/100.0; + this.estimatedAdc = y; + + + WikittyQuery adcQuery = new WikittyQueryMaker().and() + .eq(ADC.ELEMENT_FIELD_ADC_EMPLOYEEHR, e) + .bw(ADC.ELEMENT_FIELD_ADC_YEAR, from, to) + .end(); + adcPerYear = new HashMap<Integer, Double>(); + + WikittyQueryResult<ADC> adcResult = client.findAllByQuery( + ADC.class, adcQuery); + + for(ADC a : adcResult.getAll()) { + adcPerYear.put(a.getYear(), a.getValue()); + } + System.out.println("ADC FOR " + e.getPerson(false) + " : " + adcPerYear); + this.e = e; + } + + public Employee getObject() { + return e; + } + + public double getEstimatedAdc() { + return estimatedAdc; + } + + public Map<Integer, Double> getAdcPerYear() { + return adcPerYear; + } + + @Override + public int compareTo(Object o) { + EmployeeData e = (EmployeeData) o; + return this.getObject().getPerson(false).getLastName() + .compareTo(e.getObject().getPerson(false).getLastName()); + } + + } + +} Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-08-14 14:17:38 UTC (rev 384) @@ -13,6 +13,8 @@ import org.chorem.ChoremUtil; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.render.Render; +import org.chorem.entities.ADC; +import org.chorem.entities.ADCImpl; import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.Employee; @@ -26,356 +28,398 @@ import org.nuiton.wikitty.query.WikittyQueryResult; /** - * + * Generate a page to edit the calues of the employees + * Also manages ajax requests for calculating the adc or * @author meynier * */ public class EmployeeEditAction extends WebMotionController { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(EmployeeEditAction.class); + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(EmployeeEditAction.class); - /** - * Return a page with an array with the employees of the specified company - * @param client chorem client - * @param company employees will be fetched from this company - * @return - */ - public Render employeeFilter(ChoremClient client, Company company) { - //get all the empoyees from the default company + /** + * Return a page with an array with the employees of the specified company + * @param client chorem client + * @param company employees will be fetched from this company + * @return + */ + public Render employeeFilter(ChoremClient client, Company company) { + //get all the empoyees from the default company - List<Company> companies = client.findAllByQuery(Company.class, - new WikittyQueryMaker().exteq("Company").end()).getAll(); + List<Company> companies = client.findAllByQuery(Company.class, + new WikittyQueryMaker().exteq("Company").end()).getAll(); - //Order by name - WikittyQuery employeeQuery = new WikittyQueryMaker().eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company).end(); + //Order by name + WikittyQuery employeeQuery = new WikittyQueryMaker().eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company).end(); - WikittyQueryResult<Employee> employeeResult = client.findAllByQuery(Employee.class, employeeQuery); + WikittyQueryResult<Employee> employeeResult = client.findAllByQuery(Employee.class, employeeQuery); - List<EmployeeData> employees = new ArrayList<EmployeeData>(); - for(Employee e : employeeResult.getAll()) { - employees.add(new EmployeeData(e, client)); - } - - Collections.sort(employees); - //simply return them - return renderView("employeeEdit.jsp", - "employees",employees, - "companies", companies, - "company", new CompanyImpl(client.restore(company.getWikittyId())), - "title", "Employee edit"); - } + List<EmployeeData> employees = new ArrayList<EmployeeData>(); + for(Employee e : employeeResult.getAll()) { + employees.add(new EmployeeData(e, client)); + } + Collections.sort(employees); + //simply return them + return renderView("employeeEdit.jsp", + "employees",employees, + "companies", companies, + "company", new CompanyImpl(client.restore(company.getWikittyId())), + "title", "Employee edit"); + } - /** - * generate a page to edit the employees - * - * @param client choorem client - * @param companyId - * @param addExtension - * @param call - * @return - */ - public Render requestEmployeeEdit(ChoremClient client, String companyId, String addExtension, Call call) { - Company company = null; - if(companyId == null) - company = client.getDefaultCompany(); - else { - company = new CompanyImpl(client.restore(companyId)); - } + /** + * generate a page to edit the employees + * + * @param client choorem client + * @param companyId + * @param addExtension + * @param call + * @return + */ + public Render requestEmployeeEdit(ChoremClient client, String companyId, String addExtension, Call call) { + Company company = null; - if(call != null) { - Wikitty w = client.restore(company.getWikittyId()); - Map<String, Object> params = call.getExtractParameters(); - for(String key : params.keySet()) { - //Prevent false data - if((key.equals("CompanyHR.dailyReturn") - || key.equals("CompanyHR.dailyHoursWorked"))) { - try { - double value = Double.parseDouble(((String[])params.get(key))[0]); - w.setFqField(key, value); - } - catch(java.lang.NumberFormatException e) { - System.err.println(e.getMessage());//TODO : user output - } - - } - } + if(companyId == null) + company = client.getDefaultCompany(); + else { + company = new CompanyImpl(client.restore(companyId)); + } - client.store(w); - } - - if(addExtension != null && addExtension.equals("true")) { - Wikitty w = client.restore(company.getWikittyId()); - w.addExtension(client.restoreExtensionLastVersion("CompanyHR")); - client.store(w); - } + if(call != null) { + Wikitty w = client.restore(company.getWikittyId()); + Map<String, Object> params = call.getExtractParameters(); + for(String key : params.keySet()) { + //Prevent false data + if((key.equals("CompanyHR.dailyReturn") + || key.equals("CompanyHR.dailyHoursWorked"))) { + try { + double value = Double.parseDouble(((String[])params.get(key))[0]); + w.setFqField(key, value); + } + catch(java.lang.NumberFormatException e) { + System.err.println(e.getMessage());//TODO : user output + } - return employeeFilter(client, company); - } + } + } - /** - * Ajax request for the adc calculation - * - * @param client chorme client - * @param employeeId id of the employee that needs an adc calculation - * @return adc - */ - public Render requestAdc(ChoremClient client, String employeeId) { - Wikitty w = client.restore(employeeId); - EmployeeHR e = new EmployeeHRImpl(w); - - double adc = AdcCalculation.getAdc(client, e); - - w.setField("EmployeeHR", "dailyReturn", adc); - client.store(w); - - int iadc = (int)(adc*100); - return renderJSON("adc", (double)(iadc/100.0)); - - - } - /** - * Ajax request for the adc calculation of multiple employees of the same company - * - * @param client chorme client - * @param employeeId id of the employees that needs an adc calculation - * @return adc - */ - public Render requestMultipleAdc(ChoremClient client, String employeeId) { - List<Wikitty> w = client.restore(ChoremUtil.asList(",", employeeId)); - List<EmployeeHR> employees = new ArrayList<EmployeeHR>(); - for(int i = 0; i< w.size(); i++) { - employees.add(new EmployeeHRImpl(w.get(i))); - } - - HashMap<String, Double> adcs = AdcCalculation.getMultipleAdc(client, employees); - for(int i = 0; i< w.size(); i++) { - Wikitty wi = w.get(i); - wi.setField("EmployeeHR", "dailyReturn", adcs.get(wi.getWikittyId())); - client.store(wi); - } - for(String s : adcs.keySet()) { - int iadc = (int)(adcs.get(s)*100); - adcs.put(s, (double)(iadc/100.0)); - } - return renderJSON("adcs", adcs); - } - - - /** - * Ajax requets to modify the employee values - * - * @param client chorme client - * @param employeeId id of the employee to modify - * @param salaryStr new salary in String format - * @param productivityRateStr new prod rate in String format - * @param partialTimeStr new partial time in String format - * @param dailyReturnStr new daily return in String format - * @return - */ - public Render editEmployeeValues(ChoremClient client, String employeeId, String salaryStr - , String productivityRateStr, String partialTimeStr, String dailyReturnStr, String otherPaymentsStr) { - Wikitty employeeWikitty = client.restore(employeeId); - Employee employee = new EmployeeImpl(employeeWikitty); - if(!employeeWikitty.hasExtension(EmployeeHR.EXT_EMPLOYEEHR)) { - employeeWikitty.addExtension(client.restoreExtensionLastVersion(EmployeeHR.EXT_EMPLOYEEHR)); - } + client.store(w); + } - double salary = 0, productivityRate = 0, partialTime = 0, dailyReturn = 0, otherPayments = 0; - - //Try to parse the strings and generates if errors if it fails - List<ErrorJson> errors = new ArrayList<ErrorJson>(); - try { - salary = Double.parseDouble(salaryStr); - } - catch (java.lang.NumberFormatException e) { - errors.add(new ErrorJson("salary", "Salary must be a real number")); - } + if(addExtension != null && addExtension.equals("true")) { + Wikitty w = client.restore(company.getWikittyId()); + w.addExtension(client.restoreExtensionLastVersion("CompanyHR")); + client.store(w); + } - try{ - productivityRate = Double.parseDouble(productivityRateStr); - } - catch (java.lang.NumberFormatException e) { - errors.add(new ErrorJson("productivityRate", "Productivity rate must be a real number")); - } + return employeeFilter(client, company); + } - try { - partialTime = Double.parseDouble(partialTimeStr); - } - catch (java.lang.NumberFormatException e) { - errors.add(new ErrorJson("partialTime", "Partial time must be a real number")); - } - - try { - dailyReturn = Double.parseDouble(dailyReturnStr); - } - catch (java.lang.NumberFormatException e) { - errors.add(new ErrorJson("dailyReturn", "Daily return must be a real number")); - } - - try { - otherPayments = Double.parseDouble(otherPaymentsStr); - } - catch (java.lang.NumberFormatException e) { - errors.add(new ErrorJson("dailyReturn", "Other payments must be a real number")); - } - - //Verify that the percentages are between 0 and 100 - if(productivityRate > 100 || productivityRate < 0) { - errors.add(new ErrorJson("productivityRate", "Productivity rate must be between 0 and 100")); - } - if(partialTime > 100 || partialTime < 0) { - errors.add(new ErrorJson("partialTime", "Partial time must be between 0 and 100")); - } - if(errors.size() != 0) - return renderJSON("data", "error", "errors", errors); + /** + * Ajax request for the adc calculation + * + * @param client chorme client + * @param employeeId id of the employee that needs an adc calculation + * @return adc + */ + public Render requestAdc(ChoremClient client, String employeeId, boolean real) { + Wikitty w = client.restore(employeeId); + EmployeeHR e = new EmployeeHRImpl(w); + double adc = (new AdcCalculation(client, e)).getAdc(real); - if(salary != 0) - employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_SALARY, salary); - employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_PRODUCTIVITYRATE, productivityRate); - employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_PARTIALTIME, partialTime); - employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_DAILYRETURN, dailyReturn); - employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_OTHERPAYMENTS, otherPayments); - client.store(employeeWikitty); + w.setField(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN, adc); + client.store(w); + int iadc = (int)(adc*100); + return renderJSON("adc", (double)(iadc/100.0)); - EmployeeData data = new EmployeeData(new EmployeeImpl(employeeWikitty), client); - EmployeeJson json = new EmployeeJson( - data.getSalary() + "", - data.getProductivityRate(), - data.getPartialTime(), - data.getDailyReturn(), - data.getDailyHoursWorked(), - data.getOtherPayments() - ); + } - return renderJSON("data", json); - } - - /** - * Class used to store an error - * @author gwenn - * - */ - public class ErrorJson { - private String errorMessage; - private String field; - - public ErrorJson (String field, String message) { - this.field = field; - this.errorMessage = message; - } - } + /** + * Ajax request for the adc calculation of multiple employees of the same company + * + * @param client chorme client + * @param employeeId id of the employees that needs an adc calculation + * @param real You must specify this parameter is true if you want the real values from the last year. + * The value will be stored in a new ADC object. + * @param year Year of the adc if it's the real one that needs to be calculated + * @return adc + */ + public Render requestMultipleAdc(ChoremClient client, String employeeId, boolean real, int year) { + List<Wikitty> wemployees = client.restore(ChoremUtil.asList(",", employeeId)); + List<EmployeeHR> employees = new ArrayList<EmployeeHR>(); + System.out.println("real = " + real + ", year = " + year); + for(int i = 0; i< wemployees.size(); i++) { + employees.add(new EmployeeHRImpl(wemployees.get(i))); + } - /** - * Structure used to store information about an employee - * Used for the AJAX request - * - * @author gwenn - * - */ - public class EmployeeJson { + Map<String, Double> adcs = (new AdcCalculation(client, employees)).getMultipleAdc(real); + if(real) { + for(int i = 0; i< wemployees.size(); i++) { + Wikitty wi = wemployees.get(i); - private String salary; - private double productivityRate; - private double partialTime; - private double dailyReturn; - private double dailyHoursWorked; - private double otherPayments; + //Check if the ADC object already exists + WikittyQuery adcQuery = new WikittyQueryMaker().and() + .eq(ADC.ELEMENT_FIELD_ADC_EMPLOYEEHR, employees.get(i)) + .eq(ADC.ELEMENT_FIELD_ADC_YEAR, year) + .end(); - public EmployeeJson(String salary, double productivityRate, double partialTime, - double dailyReturn, double dailyHoursWorked, double otherPayments) { - this.salary = salary; - this.productivityRate = productivityRate; - this.partialTime = partialTime; - this.dailyReturn = dailyReturn; - this.dailyHoursWorked = dailyHoursWorked; - this.otherPayments = otherPayments; - } - } - - /** - * Structure used to store information about an employee - * used for the standard http request - * @author gwenn - * - */ - public class EmployeeData implements Comparable{ - private Employee e; - private String salary; - private double productivityRate; - private double partialTime; - private double dailyReturn; - private double dailyHoursWorked; - private double otherPayments; + WikittyQueryResult<ADC> adcResult = client.findAllByQuery( + ADC.class, adcQuery); + if(adcResult.size() == 0) { + ADC adc = new ADCImpl(); + adc.setEmployeeHR(wi.getWikittyId()); + adc.setYear(year); + adc.setValue(adcs.get(wi.getWikittyId())); + client.store(adc); + } + else { + ADC adc = adcResult.get(0); //There is only one (in theory) + Wikitty wadc =client.restore(adc.getWikittyId()); + wadc.setField(ADC.EXT_ADC, ADC.FIELD_ADC_VALUE, adcs.get(wi.getWikittyId())); + client.store(wadc); - public EmployeeData(Employee e, ChoremClient client) { - Wikitty w = client.restore(e.getWikittyId()); - if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR)) { - this.salary = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_SALARY) + ""; - this.productivityRate = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PRODUCTIVITYRATE); - this.partialTime = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME); - this.otherPayments = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_OTHERPAYMENTS); - } - else { - this.salary = "Non renseigné"; - this.productivityRate = 100; - this.partialTime = 100; - this.otherPayments = 0; - } - this.dailyReturn = client.getDailyReturn(e); - //Simple trick to limit to 2 numbers after digit - int x = (int)(client.getDailyHoursWorked(e)*100); - double y = x/100.0; - this.dailyHoursWorked = y; - - x = (int)(this.dailyReturn*100); - y = x/100.0; - this.dailyReturn = y; + } + } + } + else { + for(int i = 0; i< wemployees.size(); i++) { + Wikitty wi = wemployees.get(i); + wi.setField(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN, adcs.get(wi.getWikittyId())); + client.store(wi); + } + } + for(String s : adcs.keySet()) { + int iadc = (int)(adcs.get(s)*100); + adcs.put(s, (double)(iadc/100.0)); + } - this.e = e; - } - public Employee getObject() { - return e; - } + return renderJSON("adcs", adcs); + } - public String getSalary() { - return salary; - } - public double getDailyReturn() { - return dailyReturn; - } - public double getDailyHoursWorked() { - return dailyHoursWorked; - } - public double getProductivityRate() { - return productivityRate; - } - public double getPartialTime() { - return partialTime; - } - public double getOtherPayments() { - return otherPayments; - } + /** + * Ajax requets to modify the employee values + * + * @param client chorme client + * @param employeeId id of the employee to modify + * @param salaryStr new salary in String format + * @param productivityRateStr new prod rate in String format + * @param partialTimeStr new partial time in String format + * @param dailyReturnStr new daily return in String format + * @return + */ + public Render editEmployeeValues(ChoremClient client, String employeeId, String salaryStr + , String productivityRateStr, String partialTimeStr, String dailyReturnStr, String otherPaymentsStr) { + Wikitty employeeWikitty = client.restore(employeeId); + Employee employee = new EmployeeImpl(employeeWikitty); + if(!employeeWikitty.hasExtension(EmployeeHR.EXT_EMPLOYEEHR)) { + employeeWikitty.addExtension(client.restoreExtensionLastVersion(EmployeeHR.EXT_EMPLOYEEHR)); + } - @Override - public int compareTo(Object o) { - EmployeeData e = (EmployeeData)o; - return this.getObject().getPerson(false).getLastName().compareTo(e.getObject().getPerson(false).getLastName()); - } + double salary = 0, productivityRate = 0, partialTime = 0, dailyReturn = 0, otherPayments = 0; + //Try to parse the strings and generates if errors if it fails + List<ErrorJson> errors = new ArrayList<ErrorJson>(); + try { + salary = Double.parseDouble(salaryStr); + } + catch (java.lang.NumberFormatException e) { + errors.add(new ErrorJson("salary", "Salary must be a real number")); + } + try{ + productivityRate = Double.parseDouble(productivityRateStr); + } + catch (java.lang.NumberFormatException e) { + errors.add(new ErrorJson("productivityRate", "Productivity rate must be a real number")); + } - } + try { + partialTime = Double.parseDouble(partialTimeStr); + } + catch (java.lang.NumberFormatException e) { + errors.add(new ErrorJson("partialTime", "Partial time must be a real number")); + } + try { + dailyReturn = Double.parseDouble(dailyReturnStr); + } + catch (java.lang.NumberFormatException e) { + errors.add(new ErrorJson("dailyReturn", "Daily return must be a real number")); + } + + try { + otherPayments = Double.parseDouble(otherPaymentsStr); + } + catch (java.lang.NumberFormatException e) { + errors.add(new ErrorJson("dailyReturn", "Other payments must be a real number")); + } + + //Verify that the percentages are between 0 and 100 + if(productivityRate > 100 || productivityRate < 0) { + errors.add(new ErrorJson("productivityRate", "Productivity rate must be between 0 and 100")); + } + if(partialTime > 100 || partialTime < 0) { + errors.add(new ErrorJson("partialTime", "Partial time must be between 0 and 100")); + } + if(errors.size() != 0) + return renderJSON("data", "error", "errors", errors); + + + if(salary != 0) + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_SALARY, salary); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_PRODUCTIVITYRATE, productivityRate); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_PARTIALTIME, partialTime); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_DAILYRETURN, dailyReturn); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_OTHERPAYMENTS, otherPayments); + client.store(employeeWikitty); + + + EmployeeData data = new EmployeeData(new EmployeeImpl(employeeWikitty), client); + + EmployeeJson json = new EmployeeJson( + data.getSalary() + "", + data.getProductivityRate(), + data.getPartialTime(), + data.getDailyReturn(), + data.getDailyHoursWorked(), + data.getOtherPayments() + ); + + return renderJSON("data", json); + + } + + /** + * Class used to store an error + * @author gwenn + * + */ + public class ErrorJson { + private String errorMessage; + private String field; + + public ErrorJson (String field, String message) { + this.field = field; + this.errorMessage = message; + } + } + + /** + * Structure used to store information about an employee + * Used for the AJAX request + * + * @author gwenn + * + */ + public class EmployeeJson { + + private String salary; + private double productivityRate; + private double partialTime; + private double dailyReturn; + private double dailyHoursWorked; + private double otherPayments; + + public EmployeeJson(String salary, double productivityRate, double partialTime, + double dailyReturn, double dailyHoursWorked, double otherPayments) { + this.salary = salary; + this.productivityRate = productivityRate; + this.partialTime = partialTime; + this.dailyReturn = dailyReturn; + this.dailyHoursWorked = dailyHoursWorked; + this.otherPayments = otherPayments; + } + } + + /** + * Structure used to store information about an employee + * used for the standard http request + * @author gwenn + * + */ + public class EmployeeData implements Comparable{ + + private Employee e; + private String salary; + private double productivityRate; + private double partialTime; + private double dailyReturn; + private double dailyHoursWorked; + private double otherPayments; + + + public EmployeeData(Employee e, ChoremClient client) { + Wikitty w = client.restore(e.getWikittyId()); + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR)) { + this.salary = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_SALARY) + ""; + this.productivityRate = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PRODUCTIVITYRATE); + this.partialTime = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME); + this.otherPayments = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_OTHERPAYMENTS); + } + else { + this.salary = "Non renseigné"; + this.productivityRate = 100; + this.partialTime = 100; + this.otherPayments = 0; + } + this.dailyReturn = client.getDailyReturn(e); + //Simple trick to limit to 2 numbers after digit + int x = (int)(client.getDailyHoursWorked(e)*100); + double y = x/100.0; + this.dailyHoursWorked = y; + + x = (int)(this.dailyReturn*100); + y = x/100.0; + this.dailyReturn = y; + + this.e = e; + } + + public Employee getObject() { + return e; + } + + public String getSalary() { + return salary; + } + + public double getDailyReturn() { + return dailyReturn; + } + + public double getDailyHoursWorked() { + return dailyHoursWorked; + } + public double getProductivityRate() { + return productivityRate; + } + public double getPartialTime() { + return partialTime; + } + public double getOtherPayments() { + return otherPayments; + } + + @Override + public int compareTo(Object o) { + EmployeeData e = (EmployeeData)o; + return this.getObject().getPerson(false).getLastName().compareTo(e.getObject().getPerson(false).getLastName()); + } + + + + } + } 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-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-08-14 14:17:38 UTC (rev 384) @@ -34,344 +34,386 @@ import org.nuiton.wikitty.query.WikittyQueryResult; /** - * + * Displays a page that shows one or many quotations, with financial tables and a gantt diagram. * @author meynier * */ public class DashboardProjectAction extends WebMotionController { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(DashboardProjectAction.class); + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(DashboardProjectAction.class); - /** - * Return the view for a single quotation - * @param client Chorem client - * @param id Project ID (useless here) - * @param quotationFilter Quotation id - * @return - */ - public Render singleQuotationFilter(ChoremClient client, String id, String quotationFilter) { + /** + * Return the view for a single quotation + * @param client Chorem client + * @param id Project ID (useless here) + * @param quotationFilter Quotation id + * @return + */ + public Render singleQuotationFilter(ChoremClient client, String id, String quotationFilter) { + Render render = null; + //Fetch the quotation from the filter + WikittyQuery quotationQuery = new WikittyQueryMaker().ideq(quotationFilter).end(); + WikittyQueryResult<Quotation> quotationResult = client.findAllByQuery(Quotation.class, quotationQuery); - //Fetch the quotation from the filter - WikittyQuery quotationQuery = new WikittyQueryMaker().ideq(quotationFilter).end(); - WikittyQueryResult<Quotation> quotationResult = client.findAllByQuery(Quotation.class, quotationQuery); - - HashMap<Project, List<QuotationData>> projectData = new HashMap<Project, List<QuotationData>>(); + HashMap<Project, List<QuotationData>> projectData = new HashMap<Project, List<QuotationData>>(); - //If some quotation has been found - if(quotationResult != null && quotationResult.size() != 0) { - Quotation quotation = quotationResult.get(0); - - //Fetch the quotation's project - WikittyQuery projectQuery = new WikittyQueryMaker().ideq(quotation.getProject()).end(); - WikittyQueryResult<Project> projectResult = client.findAllByQuery(Project.class, projectQuery); - - List<QuotationData> q = new ArrayList<QuotationData>(); - q.add(new QuotationData(quotation, client)); - projectData.put(projectResult.get(0), q); + //If some quotation has been found + if(quotationResult != null && quotationResult.size() != 0) { + Quotation quotation = quotationResult.get(0); - return renderView("dashboardSingleProject.jsp", - "locale", client.getUserLocale(), - "title", "Tableau de bord projet", - "projects", projectData); + //Fetch the quotation's project + WikittyQuery projectQuery = new WikittyQueryMaker().ideq(quotation.getProject()).end(); + WikittyQueryResult<Project> projectResult = client.findAllByQuery(Project.class, projectQuery); - } - else { - return renderView("dashboardSingleProject.jsp"); - } - } + List<QuotationData> q = new ArrayList<QuotationData>(); + q.add(new QuotationData(quotation, client)); + projectData.put(projectResult.get(0), q); - /** - * Display multiple quotation for one or more projects - * @param client chorem client - * @param id Project id - * @param quotationFilter filter (open quotation or all) - * @return - */ - public Render projectFilter(ChoremClient client, String id, String quotationFilter) { - - WikittyQueryResult<Project> projectResult = null; - WikittyQueryResult<Quotation> quotationResult = null; + render = renderView("dashboardSingleProject.jsp", + "locale", client.getUserLocale(), + "title", "Tableau de bord projet", + "projects", projectData); - - HashMap<Project, List<QuotationData>> projectData = new HashMap<Project, List<QuotationData>>(); - - //Fetch the projects from the id or the filter - WikittyQueryMaker projectQueryMaker = new WikittyQueryMaker(); - if(id != null && !id.equals("")) - projectQueryMaker.ideq(id); - else - projectQueryMaker.exteq(Project.EXT_PROJECT); - WikittyQuery projectQuery = projectQueryMaker.end(); + } + else { + render = renderView("dashboardSingleProject.jsp"); + } + return render; + } - projectResult = client.findAllByQuery(Project.class, projectQuery); - - //Fetch the quotations from the projects - if(projectResult.size() != 0) { - for(Project project : projectResult.getAll()) { - WikittyQuery quotationQuery = null; - WikittyQueryMaker wqm = new WikittyQueryMaker(); + /** + * Display multiple quotation for one or more projects + * @param client chorem client + * @param id Project id + * @param quotationFilter filter (open quotation or all) + * @return + */ + public Render projectFilter(ChoremClient client, String id, String quotationFilter) { + WikittyQueryResult<Project> projectResult = null; + WikittyQueryResult<Quotation> quotationResult = null; - if(quotationFilter.equals("open")) { - wqm.and() - .eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project) - .extne(Closed.EXT_CLOSED); - } - else if (quotationFilter.equals("all")){ - wqm.eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project); - } + HashMap<Project, List<QuotationData>> projectData = new HashMap<Project, List<QuotationData>>(); - quotationQuery = wqm.end(); - quotationQuery.setLimit(20); - quotationQuery.addSortDescending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE); - quotationResult = client.findAllByQuery(Quotation.class, quotationQuery); + //Fetch the projects from the id or the filter + WikittyQueryMaker projectQueryMaker = new WikittyQueryMaker(); + if(id != null && !id.equals("")) + projectQueryMaker.ideq(id); + else + projectQueryMaker.exteq(Project.EXT_PROJECT); + WikittyQuery projectQuery = projectQueryMaker.end(); - //Fetch the tasks form the quotations (if there are some) - if(quotationResult != null && quotationResult.size() != 0) { - List<QuotationData> quotation = new ArrayList<QuotationData>(); - for(Quotation quote : quotationResult.getAll()) { - quotation.add(new QuotationData(quote, client)); - } - projectData.put(project, quotation); - } - } - } + projectResult = client.findAllByQuery(Project.class, projectQuery); - return renderView("dashboardSingleProject.jsp", - "locale", client.getUserLocale(), - "title", "Tableau de bord projet", - "projects", projectData); + //Fetch the quotations from the projects + if(projectResult.size() != 0) { + for(Project project : projectResult.getAll()) { + WikittyQuery quotationQuery = null; + WikittyQueryMaker wqm = new WikittyQueryMaker(); - } + if(quotationFilter.equals("open")) { + wqm.and() + .eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project) + .extne(Closed.EXT_CLOSED); + } + else if (quotationFilter.equals("all")){ + wqm.eq(Quotation.ELEMENT_FIELD_QUOTATION_PROJECT, project); + } - - public Render multiProjectFilter(ChoremClient client, Date from, Date to) { - System.out.println(from + "," + to); - if(from == null || to == null) { - Calendar now = new GregorianCalendar(); - Calendar gFrom = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) - , now.getActualMinimum(Calendar.DAY_OF_MONTH)); - Calendar gTo = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) - , now.getActualMaximum(Calendar.DAY_OF_MONTH)); - from = gFrom.getTime(); - to = gTo.getTime(); + quotationQuery = wqm.end(); + quotationQuery.setLimit(20); + 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 && quotationResult.size() != 0) { + List<QuotationData> quotation = new ArrayList<QuotationData>(); + for(Quotation quote : quotationResult.getAll()) { + quotation.add(new QuotationData(quote, client)); + } + projectData.put(project, quotation); + } + } + } + return renderView("dashboardSingleProject.jsp", + "locale", client.getUserLocale(), + "title", "Tableau de bord projet", + "projects", projectData); - WikittyQueryMaker quotationQueryMaker = new WikittyQueryMaker(); - WikittyQuery quotationQuery = quotationQueryMaker.or() - .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to) - .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to) - .and() - .le(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from) - .ge(Interval.FQ_FIELD_INTERVAL_ENDDATE, 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) { - QuotationCalculation calc = new QuotationCalculation(q, client); - calc.calculate(); - calculations.put(q, calc); - } - - TotalQuotationCalculation total = new TotalQuotationCalculation( - new ArrayList<QuotationCalculation>(calculations.values())); - - return renderView("dashboardMultiProject.jsp", - "title", "Tableau de bord projets", - "locale", client.getUserLocale(), - "quotations", quotations, - "calculations", calculations, - "total", total); + /** + * Generates the multi-project page + * @param client chorem client + * @param from begin date for the interval + * @param to end date for the interval + * @return + */ + public Render multiProjectFilter(ChoremClient client, Date from, Date to) { + System.out.println(from + "," + to); + if(from == null || to == null) { + Calendar now = new GregorianCalendar(); + Calendar gFrom = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) + , now.getActualMinimum(Calendar.DAY_OF_MONTH)); + Calendar gTo = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) + , now.getActualMaximum(Calendar.DAY_OF_MONTH)); + from = gFrom.getTime(); + to = gTo.getTime(); + } - } - public Render employeeFilter(ChoremClient client, String id, Date from, Date to, String[] quotationFilters) { - - //If no field has been set, sets the date to the actual month - if(from == null || to == null) { - Calendar now = new GregorianCalendar(); - Calendar gFrom = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) - , now.getActualMinimum(Calendar.DAY_OF_MONTH)); - Calendar gTo = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) - , now.getActualMaximum(Calendar.DAY_OF_MONTH)); - from = gFrom.getTime(); - to = gTo.getTime(); - } - - //Fetch the total list of employee (or just the chosen one - WikittyQueryMaker employeeQueryMaker = new WikittyQueryMaker(); - if(id != null && !id.equals("")) - employeeQueryMaker.ideq(id); - else { - employeeQueryMaker.exteq(Employee.EXT_EMPLOYEE); - } - WikittyQueryResult<Employee> employeeResult = client.findAllByQuery(Employee.class,employeeQueryMaker.end()); - List<Employee> employeeList = employeeResult.getAll(); - - //Fetch all the tasks on the interval - WikittyQueryMaker taskQueryMaker = new WikittyQueryMaker() - .and() - .exteq(Task.EXT_TASK); - - if(quotationFilters!=null) { - taskQueryMaker.or(); - for(String q : quotationFilters) { - taskQueryMaker .eq(Task.FQ_FIELD_TASK_QUOTATION,q); - System.out.println(client.restore(q));} - taskQueryMaker.close(); - } - - taskQueryMaker .or() - .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to) - .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to) - .and() - .le(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from) - .ge(Interval.FQ_FIELD_INTERVAL_ENDDATE, to); - - WikittyQuery taskQuery = taskQueryMaker.end(); - System.out.println(taskQuery); - List<Task> taskList = client.findAllByQuery(Task.class,taskQuery).getAll(); - System.out.println("RESULT : " + taskList); - //Fetch the employee's workers on those tasks - - - - //---------------------------------------- - //Fetch the real time spent on each project/quotation - HashMap<Employee, Double> timeTotals = new HashMap<Employee, Double>(); - HashMap<Employee, HashMap<Quotation, Double>> timePerQuotation = new HashMap<Employee, HashMap<Quotation, Double>>(); - for(Task task : taskList) { - - WikittyQueryMaker timeQueryMaker = new WikittyQueryMaker().and() - .eq(Time.ELEMENT_FIELD_TIME_TASK, task); - if(employeeList.size() == 1) - timeQueryMaker.eq(Time.ELEMENT_FIELD_TIME_EMPLOYEE, employeeList.get(0)); - WikittyQuery timeQuery = timeQueryMaker.end(); - WikittyQueryResult<Time> timeResult = client.findAllByQuery(Time.class, timeQuery); - - - - for(Time time : timeResult.getAll()) { - Employee emp = time.getEmployee(false); - - //TOTAL TIMES - if(timeTotals.containsKey(emp)) - timeTotals.put(emp, timeTotals.get(emp) + ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); - else - timeTotals.put(emp, ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); - - HashMap<Quotation, Double> timeQ = null; - //TIME PER QUOTATION - if(timePerQuotation.containsKey(emp)) { - timeQ = timePerQuotation.get(emp); - } - else { - timeQ = new HashMap<Quotation, Double>(); - timePerQuotation.put(emp, timeQ); - } - Quotation qKey = task.getQuotation(false); - if(timeQ.containsKey(qKey)) { - timeQ.put(qKey, timeQ.get(qKey) + - ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); - } - else { - timeQ.put(qKey, - ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); - } - - } - } - Set<Employee> kSet = timePerQuotation.keySet(); - Set<Quotation> quotations = new HashSet<Quotation>(); - for(Employee e : kSet) { - quotations.addAll(timePerQuotation.get(e).keySet()); - } - List<Quotation> allQuotations = new ArrayList<Quotation>(); - WikittyQuery quotationQuery = new WikittyQueryMaker().or() - .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to) - .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to) - .and() - .le(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from) - .ge(Interval.FQ_FIELD_INTERVAL_ENDDATE, to).end(); - allQuotations = client.findAllByQuery(Quotation.class, quotationQuery).getAll(); - - HashMap<Employee, HashMap<Quotation, Double>> percentages = new HashMap<Employee, HashMap<Quotation, Double>>(); - - for(Employee e : kSet) { - Set<Quotation> qSet = timePerQuotation.get(e).keySet(); - HashMap<Quotation, Double> p = new HashMap<Quotation, Double>(); - for(Quotation q : qSet) { - - p.put(q, ( timePerQuotation.get(e).get(q) / timeTotals.get(e) ) *100 ); - - } - percentages.put(e, p); - } - - - //Calculates the average working time - - Calendar gFrom = new GregorianCalendar(); - Calendar gTo = new GregorianCalendar(); - gFrom.setTime(from); - gTo.setTime(to); - - return renderView("dashboardEmployee.jsp", - "title", "Tableau de bord employé", - "locale", client.getUserLocale(), - "timePerQuotation", timePerQuotation, - "quotations", quotations, - "percentages", percentages, - "timeTotals", timeTotals, - "allQuotations", allQuotations); - - } + WikittyQueryMaker quotationQueryMaker = new WikittyQueryMaker(); + WikittyQuery quotationQuery = quotationQueryMaker.or() + .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to) + .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to) + .and() + .le(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from) + .ge(Interval.FQ_FIELD_INTERVAL_ENDDATE, to) + .end(); + WikittyQueryResult<Quotation> result = + client.findAllByQuery(Quotation.class, quotationQuery); + Collection<Quotation> quotations = result.getAll(); - public Render requestProject(ChoremClient client, String project_name, String project_id, String quotationFilter) { - if(quotationFilter == null) - quotationFilter = "open"; - if(project_name == null || project_name.equals("")) - project_id = ""; - if(quotationFilter.equals("open") || quotationFilter.equals("all")) { - return projectFilter(client, project_id, quotationFilter); - } - else { - return singleQuotationFilter(client, project_id, quotationFilter); - } - } - public Render requestMultiProject(ChoremClient client, Date from, Date to) { - return multiProjectFilter(client, from, to); - } - - public Render requestEmployee(ChoremClient client, String id, Date from, Date to, String[] quotations) { - System.out.println("QUOTATIONS : " + Arrays.toString(quotations)); - return employeeFilter(client, id, from, to, quotations); - } + HashMap<Quotation, QuotationCalculation> calculations = new HashMap<Quotation, QuotationCalculation>(); + for(Quotation q : quotations) { + QuotationCalculation calc = new QuotationCalculation(q, client); + calc.calculate(); + calculations.put(q, calc); + } + TotalQuotationCalculation total = new TotalQuotationCalculation( + new ArrayList<QuotationCalculation>(calculations.values())); - private class IntervalSorter<T extends Interval> implements Comparator { - @Override - public int compare(Object q1, Object q2) { - return ((T)q1).getBeginDate().compareTo(((T)q2).getBeginDate()); - } + return renderView("dashboardMultiProject.jsp", + "title", "Tableau de bord projets", + "locale", client.getUserLocale(), + "quotations", quotations, + "calculations", calculations, + "total", total); - } - - + + } + + /** + * + * @param client + * @param id + * @param from + * @param to + * @param quotationFilters + * @return + */ + public Render employeeFilter(ChoremClient client, String id, Date from, Date to, String[] quotationFilters) { + + //If no field has been set, sets the date to the actual month + if(from == null || to == null) { + Calendar now = new GregorianCalendar(); + Calendar gFrom = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) + , now.getActualMinimum(Calendar.DAY_OF_MONTH)); + Calendar gTo = new GregorianCalendar(now.get(Calendar.YEAR), now.get(Calendar.MONTH) + , now.getActualMaximum(Calendar.DAY_OF_MONTH)); + from = gFrom.getTime(); + to = gTo.getTime(); + } + + //Fetch the total list of employee (or just the chosen one + WikittyQueryMaker employeeQueryMaker = new WikittyQueryMaker(); + if(id != null && !id.equals("")) + employeeQueryMaker.ideq(id); + else { + employeeQueryMaker.exteq(Employee.EXT_EMPLOYEE); + } + WikittyQueryResult<Employee> employeeResult = client.findAllByQuery(Employee.class,employeeQueryMaker.end()); + List<Employee> employeeList = employeeResult.getAll(); + + //Fetch all the tasks on the interval + WikittyQueryMaker taskQueryMaker = new WikittyQueryMaker() + .and() + .exteq(Task.EXT_TASK); + + if(quotationFilters!=null) { + taskQueryMaker.or(); + for(String q : quotationFilters) { + taskQueryMaker .eq(Task.FQ_FIELD_TASK_QUOTATION,q); + System.out.println(client.restore(q));} + taskQueryMaker.close(); + } + + taskQueryMaker .or() + .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to) + .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to) + .and() + .le(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from) + .ge(Interval.FQ_FIELD_INTERVAL_ENDDATE, to); + + WikittyQuery taskQuery = taskQueryMaker.end(); + System.out.println(taskQuery); + List<Task> taskList = client.findAllByQuery(Task.class,taskQuery).getAll(); + System.out.println("RESULT : " + taskList); + //Fetch the employee's workers on those tasks + + + + //---------------------------------------- + //Fetch the real time spent on each project/quotation + HashMap<Employee, Double> timeTotals = new HashMap<Employee, Double>(); + HashMap<Employee, HashMap<Quotation, Double>> timePerQuotation = new HashMap<Employee, HashMap<Quotation, Double>>(); + for(Task task : taskList) { + + WikittyQueryMaker timeQueryMaker = new WikittyQueryMaker().and() + .eq(Time.ELEMENT_FIELD_TIME_TASK, task); + if(employeeList.size() == 1) + timeQueryMaker.eq(Time.ELEMENT_FIELD_TIME_EMPLOYEE, employeeList.get(0)); + WikittyQuery timeQuery = timeQueryMaker.end(); + WikittyQueryResult<Time> timeResult = client.findAllByQuery(Time.class, timeQuery); + + + + for(Time time : timeResult.getAll()) { + Employee emp = time.getEmployee(false); + + //TOTAL TIMES + if(timeTotals.containsKey(emp)) + timeTotals.put(emp, timeTotals.get(emp) + ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); + else + timeTotals.put(emp, ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); + + HashMap<Quotation, Double> timeQ = null; + //TIME PER QUOTATION + if(timePerQuotation.containsKey(emp)) { + timeQ = timePerQuotation.get(emp); + } + else { + timeQ = new HashMap<Quotation, Double>(); + timePerQuotation.put(emp, timeQ); + } + Quotation qKey = task.getQuotation(false); + if(timeQ.containsKey(qKey)) { + timeQ.put(qKey, timeQ.get(qKey) + + ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); + } + else { + timeQ.put(qKey, + ChoremUtil.getPeriodInHours(time.getBeginDate(), time.getEndDate())); + } + + } + } + Set<Employee> kSet = timePerQuotation.keySet(); + Set<Quotation> quotations = new HashSet<Quotation>(); + for(Employee e : kSet) { + quotations.addAll(timePerQuotation.get(e).keySet()); + } + List<Quotation> allQuotations = new ArrayList<Quotation>(); + WikittyQuery quotationQuery = new WikittyQueryMaker().or() + .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from, to) + .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, from, to) + .and() + .le(Interval.FQ_FIELD_INTERVAL_BEGINDATE, from) + .ge(Interval.FQ_FIELD_INTERVAL_ENDDATE, to).end(); + allQuotations = client.findAllByQuery(Quotation.class, quotationQuery).getAll(); + + HashMap<Employee, HashMap<Quotation, Double>> percentages = new HashMap<Employee, HashMap<Quotation, Double>>(); + + for(Employee e : kSet) { + Set<Quotation> qSet = timePerQuotation.get(e).keySet(); + HashMap<Quotation, Double> p = new HashMap<Quotation, Double>(); + for(Quotation q : qSet) { + + p.put(q, ( timePerQuotation.get(e).get(q) / timeTotals.get(e) ) *100 ); + + } + percentages.put(e, p); + } + + + //Calculates the average working time + + Calendar gFrom = new GregorianCalendar(); + Calendar gTo = new GregorianCalendar(); + gFrom.setTime(from); + gTo.setTime(to); + + return renderView("dashboardEmployee.jsp", + "title", "Tableau de bord employé", + "locale", client.getUserLocale(), + "timePerQuotation", timePerQuotation, + "quotations", quotations, + "percentages", percentages, + "timeTotals", timeTotals, + "allQuotations", allQuotations); + + } + + /** + * + * @param client + * @param project_name + * @param project_id + * @param quotationFilter + * @return + */ + public Render requestProject(ChoremClient client, String project_name, String project_id, String quotationFilter) { + if(quotationFilter == null) + quotationFilter = "open"; + if(project_name == null || project_name.equals("")) + project_id = ""; + Render render = null; + if(quotationFilter.equals("open") || quotationFilter.equals("all")) { + render = projectFilter(client, project_id, quotationFilter); + } + else { + render = singleQuotationFilter(client, project_id, quotationFilter); + } + return render; + } + /** + * + * @param client + * @param from + * @param to + * @return + */ + public Render requestMultiProject(ChoremClient client, Date from, Date to) { + return multiProjectFilter(client, from, to); + } + + /** + * + * @param client + * @param id + * @param from + * @param to + * @param quotations + * @return + */ + public Render requestEmployee(ChoremClient client, String id, Date from, Date to, String[] quotations) { + System.out.println("QUOTATIONS : " + Arrays.toString(quotations)); + return employeeFilter(client, id, from, to, quotations); + } + + + private class IntervalSorter<T extends Interval> implements Comparator { + + @Override + public int compare(Object q1, Object q2) { + + return ((T)q1).getBeginDate().compareTo(((T)q2).getBeginDate()); + } + + } + + } Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2013-08-14 14:17:38 UTC (rev 384) @@ -23,12 +23,23 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; +/** + * Manage the ajax actions for the gantt diagram on the single-project dashboard + * @author gwenn + * + */ public class GanttAction extends WebMotionController { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(GanttAction.class); + /** + * Return gantt data under json format + * @param client + * @param id + * @return + */ public Render getGanttInfo(ChoremClient client, String id) { Wikitty wikitty = client.restore(id); WikittyQuery quotationQuery = new WikittyQueryMaker() @@ -48,18 +59,7 @@ for(Task t : taskResult.getAll()) { if(t.getBeginDate() != null && t.getEndDate() != null) { - if(t.getStatus().equalsIgnoreCase("scheduled")) { - customClass = "ganttBlue"; - } - else if(t.getStatus().equalsIgnoreCase("started")) { - customClass = "ganttGreen"; - } - else if(t.getStatus().equalsIgnoreCase("finished")) { - customClass = "ganttRed"; - } - else if(t.getStatus().equalsIgnoreCase("closed")) { - customClass = "ganttGrey"; - } + customClass= "gantt-" + t.getStatus().toLowerCase(); Values[] v = null; if(t.getDayExtension() != 0) Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2013-08-14 14:17:38 UTC (rev 384) @@ -8,79 +8,97 @@ import org.chorem.ChoremClient; import org.chorem.entities.Task; import org.chorem.entities.Quotation; +import org.chorem.entities.Time; import org.chorem.project.QuotationCalculation; +/** + * Represent a quotation to use it in a jsp page + * @author gwenn + * + */ public class QuotationData extends QuotationCalculation { - private List<TaskData> tasksData; - - public QuotationData(Quotation q, ChoremClient client) { - super(q, client); - tasksData = new ArrayList<TaskData>(); - - for(Task t : this.getTasks()) { - tasksData.add(new TaskData(t, client)); - } - this.calculate(); - getAlerts(); - } - - private void getAlerts() { - Calendar now = new GregorianCalendar(); - for(TaskData td : tasksData) { - Task t = td.getObject(); - if(t.getBeginDate() != null && t.getEndDate() != null) { - String str = "<h4>Warning</h4>"; - boolean alert = false; - //Test if the statuses are correct - if(t.getStatus().equalsIgnoreCase("Scheduled")) { - if(t.getBeginDate().before(now.getTime())) { - alert = true; - str += "Task " + t.getName() + " should be started"; - } - } - else if(t.getStatus().equalsIgnoreCase("Started")) { - if(t.getBeginDate().after(now.getTime())) { - alert = true; - str += "Task " + t.getName() + " has been started in advance"; - } - else if(t.getEndDate().before(now.getTime())) { - alert = true; - str += "Task " + t.getName() + " should have ended by now"; - } - } - else if(t.getStatus().equalsIgnoreCase("Finished")) { - - if(t.getEndDate().after(now.getTime())) { - alert = true; - str += "Task " + t.getName() + " has been finished in advance"; - } - } - if(alert) { - td.setAlert(str); - } - - } + protected List<TaskData> tasksData; - } - - } - - public TaskData getTaskData(Task t) { - for(TaskData td : tasksData) { - if(td.getObject() == t) { - return td; - } - } - return null; - } - - - - public List<TaskData> getTasksData() { - return tasksData; - } - - + public QuotationData(Quotation q, ChoremClient client) { + super(q, client); + tasksData = new ArrayList<TaskData>(); + + for(Task t : this.getTasks()) { + tasksData.add(new TaskData(t, client)); + } + this.calculate(); + addAlerts(tasksData); + } + + /** + * fetch the alerts of each task and stor it in the linked TaskData object + * @param tasksData + */ + protected void addAlerts(List<TaskData> tasksData) { + Calendar now = new GregorianCalendar(); + for(TaskData td : tasksData) { + Task t = td.getObject(); + if(t.getBeginDate() != null && t.getEndDate() != null) { + String alertStr = "<h4>Warning</h4>"; + String infoStr = "<h4>Info</h4>"; + boolean alert = false; + boolean info = false; + //Test if the statuses are correct + if(t.getStatus().equalsIgnoreCase("Scheduled")) { + if(t.getBeginDate().before(now.getTime())) { + alert = true; + alertStr += "Task " + t.getName() + " should be started"; + } + } + else if(t.getStatus().equalsIgnoreCase("Started")) { + + if(t.getEndDate().before(now.getTime())) { + alert = true; + alertStr += "Task " + t.getName() + " should have ended by now"; + } + } + + for(Time time : client.getTimes(t)) { + if(time.getBeginDate().before(t.getBeginDate()) || time.getEndDate().before(t.getBeginDate())) { + info=true; + infoStr = "Times have been added to the task but is is not started"; + } + else if(time.getBeginDate().after(t.getEndDate()) || time.getEndDate().after(t.getEndDate())) { + info=true; + infoStr = "Times have been added to the task but it should be ended"; + } + } + + + if(alert) { + td.setAlert(alertStr); + } + if(info) { + td.setInfo(infoStr); + } + + } + + } + + } + + public TaskData getTaskData(Task t) { + for(TaskData td : tasksData) { + if(td.getObject() == t) { + return td; + } + } + return null; + } + + + + public List<TaskData> getTasksData() { + return tasksData; + } + + } 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-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2013-08-14 14:17:38 UTC (rev 384) @@ -11,13 +11,18 @@ import org.chorem.ChoremClient; import org.chorem.ChoremUtil; import org.chorem.webmotion.actions.GenericAction; -import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.render.Render; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; +/** + * Currently unsused class managing the ajax request for the quotation status changed. + * May be deprecated with the completion of the transaction funnel. + * @author gwenn + * + */ public class QuotationStatusAction extends GenericAction{ /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2013-08-14 14:17:38 UTC (rev 384) @@ -7,19 +7,28 @@ public class TaskData extends TaskCalculation { - - private String alert; - - public TaskData(Task t, ChoremClient client) { - super(t, client); - this.calculate(); - } - - public void setAlert(String a) { - alert = a; - } - - public String getAlert() { - return alert; - } + + private String alert; + private String info; + + public TaskData(Task t, ChoremClient client) { + super(t, client); + this.calculate(); + } + + public void setAlert(String a) { + alert = a; + } + + public String getAlert() { + return alert; + } + + public void setInfo(String a) { + info = a; + } + + public String getInfo() { + return info; + } } Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/resources/mapping 2013-08-14 14:17:38 UTC (rev 384) @@ -11,7 +11,7 @@ * /fragment/* DecoratorFilter.decorate wmDecoratorNo=true * /sales/funnel/json/* DecoratorFilter.decorate wmDecoratorNo=true * /project/json/* DecoratorFilter.decorate wmDecoratorNo=true -* /admin/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true +* /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true * /ascii/* DecoratorFilter.decorate wmDecoratorNo=true * /rest/* DecoratorFilter.decorate wmDecoratorNo=true GET /* DecoratorFilter.decorate @@ -52,8 +52,6 @@ * /fragment/sales/{method} action:sales.SalesAction.{method} * /admin view:contact.jsp * /admin/importExport view:admin/importExport.jsp -* /admin/employeeEdit action:EmployeeEditAction.requestEmployeeEdit -* /admin/employeeEdit/json/{method}/{employeeId} action:EmployeeEditAction.{method} * /admin/{method} action:AdminAction.{method} * /contact view:contact.jsp * /report view:report.jsp @@ -64,6 +62,9 @@ * /hr/vacationDiv/{ids} action:HrAction.editVacationDiv * /hr/vacationRequest/save action:HrAction.saveVacationRequest * /hr/vacationRequest/delete/{id} action:HrAction.deleteVacationRequest +* /hr/employeeEdit action:EmployeeEditAction.requestEmployeeEdit +* /hr/dashboardAdc action:AdcDashboardAction.requestDashboardAdc +* /hr/employeeEdit/json/{method}/{employeeId} action:EmployeeEditAction.{method} * /salesMenu view:salesReports/menu.jsp * /sales/report/sentQuotation action:sales.SentQuotationsReportAction.sentQuotationPerMonth * /sales/report/acceptedQuotation action:sales.AcceptedQuotationsReportAction.acceptedQuotationPerMonth Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp 2013-08-14 14:17:38 UTC (rev 384) @@ -0,0 +1,92 @@ +<%-- + #%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"%> + +<f:setLocale value="${locale}" /> + +<link rel="stylesheet" href="<c:url value='/css/employeeEdit.css'/>" /> + +<h1>${title}</h1> + +<form method="GET" id="companyForm"> + +<select class="filterBox" name="companyId" id="companySelect"> + <option>Choisir une entreprise</option> + <c:forEach var="c" items="${companies}"> + <option value="${c.wikittyId}" + <c:if test="${company.equals(c)}">selected</c:if> + >${c.name}</option> + </c:forEach> + </select> +</form> + +<form class="well form-inline" method="POST" id="company"> +<h4><a href="<c:url value="/wikitty/view/${company.wikittyId}"/>">${company.wikitty}</a></h4> +<input type="hidden" name="companyId" value="${company.wikittyId}"/> + +from : +<input type="text" value="${from}"> +to : +<input type="text" value="${to}"> +</form> +<form style='display:inline;' id='searchForm'>Recherche : <input type="text" id="searchInput"/></form> +<p><button class="btn btn-success" id="calculateBtn" year = "${lastYear}"> + <i class="icon-refresh icon-white"></i> + Calculer les CJMs pour ${lastYear} +</button></p> +<table class="table table-striped table-bordered table-condensed tableEdit"> + <thead> + <th class="headEmployee">Employé</th> + <c:forEach items="${years}" var="year"> + <th class="${year}">${year}</th> + </c:forEach> + <th>CJM estimé</th> + </thead> + <tbody> + <c:set var="count" value="0"/> + <c:forEach items="${employees}" var="employee"> + <tr class="bodyRow row${count}" id="${employee.object.wikittyId}"> + <td class="person bodyEmployee"><w:display wikitty="${employee.object.wikitty}" + fqfield="Employee.person" label="" /> + </td> + <c:forEach items="${years}" var="year"> + <td class="year${year}"> + <c:if test="${not empty employee.adcPerYear[year]}"> + ${employee.adcPerYear[year]} + </c:if> + </td> + </c:forEach> + <td class="estimatedAdc">${employee.estimatedAdc}</td> + + </tr> + <c:set var="count" value="${count + 1}"/> + </c:forEach> + </tbody> +</table> +<script src="<c:url value='/js/employeeEdit.js'/>"></script> +<script src="<c:url value='/js/dashboardAdc.js'/>"></script> + Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-08-14 14:17:38 UTC (rev 384) @@ -177,7 +177,10 @@ wikitty="${task.object.wikitty}" fqfield="Task.name" label="" /></a> <c:if test="${not empty task.alert}"> <i class="icon-warning-sign" title="${task.alert}"></i> - </c:if> + </c:if> + <c:if test="${not empty task.info}"> + <i class="icon-info-sign" title="${task.info}"></i> + </c:if> <td><w:display wikitty="${task.object.wikitty}" Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-08-14 14:17:38 UTC (rev 384) @@ -193,6 +193,8 @@ <li>Employee HR</li> <li><a href="<c:url value="/wikitty/EmployeeHR/search"/>"><i class="icon-th-list icon-black"></i> All employees HR</a></li> <li><a href="<c:url value="/wikitty/EmployeeHR/edit/new"/>"><i class="icon-plus icon-black"></i> Add employee HR</a> + <li><a href="<c:url value="/hr/employeeEdit"/>">Employee edit</a></li> + <li><a href="<c:url value="/hr/dashboardAdc"/>">Adc Dashboard</a></li> <li>Vacation</li> <li><a href="<c:url value="/wikitty/Vacation/search"/>"><i class="icon-th-list icon-black"></i> All vacations</a></li> <li><a href="<c:url value="/wikitty/Vacation/edit/new"/>"><i class="icon-plus icon-black"></i> Add vacation</a></li> @@ -221,7 +223,7 @@ <li class="divider"></li> <li><a href="<c:url value="/admin/reindex"/>">Reindex</a></li> <li class="divider"></li> - <li><a href="<c:url value="/admin/employeeEdit"/>">Employee edit</a></li> + </ul> </li> </ul> Added: trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2013-08-14 14:17:38 UTC (rev 384) @@ -0,0 +1,47 @@ + + +$(document).ready(function() { + + + + + $('#calculateBtn').click(function() { + + var rows = $('.bodyRow'); + var str = ""; + var year = $(this).attr('year'); + for(var i = 0; i < rows.length; i++) { + str = str + $(rows[i]).attr('id'); + if(i != (rows.length -1)) { + str= str + ','; + } + + } + $(this).attr('disabled', 'disabled'); + $.get(createUrl("/hr/employeeEdit/json/requestMultipleAdc/",str,'?real=true&year=2012'), + function(ret){ + $('#calculateBtn').removeAttr('disabled'); + var adcs = ret['adcs']; + if($('.' + year).size() != 0) { + for(var i in adcs) { + var row = $('#'+i); + row.find('.year' + year).text(adcs[i]); + } + }else { + $('.headEmployee').after("<th class='"+year+"'>"+year+"</th>"); + for(var i in adcs) { + + var row = $('#'+i); + row.find('.bodyEmployee').after('<td class="year'+year+'">'+adcs[i]+'</td>'); + + } + } + }); + + + }); + + + + +}); \ No newline at end of file Modified: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2013-08-14 12:14:58 UTC (rev 383) +++ trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2013-08-14 14:17:38 UTC (rev 384) @@ -124,7 +124,7 @@ $('#editAllBtn').attr('disabled', 'disabled'); $('.spinner').show(); } - $.get(createUrl("/admin/employeeEdit/json/editEmployeeValues/",row.attr("id"), "?salaryStr=", + $.get(createUrl("/hr/employeeEdit/json/editEmployeeValues/",row.attr("id"), "?salaryStr=", salaryVal, "&productivityRateStr=", prodVal, "&partialTimeStr=", timeVal, "&dailyReturnStr=", cjmVal, "&otherPaymentsStr=", otherVal), function(ret){ @@ -182,7 +182,7 @@ var cjm = row.find(".dailyReturn"); blockDailyReturn(row); blockEdit(row); - $.get(createUrl("/admin/employeeEdit/json/requestAdc/",row.attr("id")), + $.get(createUrl("/hr/employeeEdit/json/requestAdc/",row.attr("id"),"?real=false"), function(ret){ var adc = ret['adc']; displayDailyReturn(row, adc, true); @@ -205,8 +205,7 @@ } } - console.log(str); - $.get(createUrl("/admin/employeeEdit/json/requestMultipleAdc/",str), + $.get(createUrl("/hr/employeeEdit/json/requestMultipleAdc/",str, "?real=false&year=0"), function(ret){ var adcs = ret['adcs']; for(var i in adcs) {

1 0

r383 - in trunk/chorem-entities/src/main: java/org/chorem java/org/chorem/project xmi
by meynier＠users.chorem.org Aug. 14, 2013

Aug. 14, 2013

Author: meynier Date: 2013-08-14 14:14:58 +0200 (Wed, 14 Aug 2013) New Revision: 383 Url: http://chorem.org/projects/chorem/repository/revisions/383 Log: Updated model for the new page. Added ADC extension and a method in CHoremClient Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.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/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2013-08-09 10:06:59 UTC (rev 382) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2013-08-14 12:14:58 UTC (rev 383) @@ -39,6 +39,7 @@ import org.chorem.entities.Quotation18Migration; import org.chorem.entities.QuotationMigration; import org.chorem.entities.Task; +import org.chorem.entities.Time; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyService; @@ -55,6 +56,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import org.parboiled.common.StringUtils; /** @@ -64,7 +66,7 @@ public class ChoremClient extends WikittyClient { static protected Map<String, WikittyService> ws = new HashMap<String, WikittyService>(); - + protected ChoremClient(ApplicationConfig config, WikittyService ws) { super(config, ws); this.getMigrationRegistry().put(Invoice.EXT_INVOICE, new InvoiceMigration()); @@ -100,53 +102,53 @@ return result; } -// /** -// * Returns new ChoremClient instance with specified security token -// * -// * @param token can be null, if no authorisation token already exist (no login done) -// * @return -// */ -// static public ChoremClient getClient(String token) { -// ApplicationConfig config = ChoremConfig.getConfig(); -// WikittyService ws = getWikittyService(config); -// ChoremClient result = new ChoremClient(config, ws); -// result.setSecurityToken(token); -// -// return result; -// } -// -// /** -// * Return new ChoremClient instance with authentication done with login and -// * password found in application configuration. If no login found -// * ChoremClient returned doesn't have authentication. -// * -// * @return -// */ -// static public ChoremClient getClient() { -// ApplicationConfig config = ChoremConfig.getConfig(); -// String login = config.getOption(ChoremConfigOption.CHOREM_LOGIN.key); -// String password = config.getOption(ChoremConfigOption.CHOREM_PASSWORD.key); -// -// ChoremClient result = getClient(login, password); -// -// return result; -// } -// -// /** -// * return new ChoremClient instance with authentication done with -// * login and password in argument, only if login is not null and not blank -// * -// * @param login login used for authentication -// * @param password password used for authentication -// */ -// static public ChoremClient getClient(String login, String password) { -// ChoremClient result = getClient(null); -// -// if (StringUtils.isNotBlank(login)) { -// result.login(login, password); -// } -// return result; -// } + // /** + // * Returns new ChoremClient instance with specified security token + // * + // * @param token can be null, if no authorisation token already exist (no login done) + // * @return + // */ + // static public ChoremClient getClient(String token) { + // ApplicationConfig config = ChoremConfig.getConfig(); + // WikittyService ws = getWikittyService(config); + // ChoremClient result = new ChoremClient(config, ws); + // result.setSecurityToken(token); + // + // return result; + // } + // + // /** + // * Return new ChoremClient instance with authentication done with login and + // * password found in application configuration. If no login found + // * ChoremClient returned doesn't have authentication. + // * + // * @return + // */ + // static public ChoremClient getClient() { + // ApplicationConfig config = ChoremConfig.getConfig(); + // String login = config.getOption(ChoremConfigOption.CHOREM_LOGIN.key); + // String password = config.getOption(ChoremConfigOption.CHOREM_PASSWORD.key); + // + // ChoremClient result = getClient(login, password); + // + // return result; + // } + // + // /** + // * return new ChoremClient instance with authentication done with + // * login and password in argument, only if login is not null and not blank + // * + // * @param login login used for authentication + // * @param password password used for authentication + // */ + // static public ChoremClient getClient(String login, String password) { + // ChoremClient result = getClient(null); + // + // if (StringUtils.isNotBlank(login)) { + // result.login(login, password); + // } + // return result; + // } /** * Returns WikittyService to use. This WikittyService is singleton. @@ -186,7 +188,7 @@ exts.addAll(org.chorem.entities.GoalAbstract.extensions); exts.addAll(org.chorem.entities.IntervalAbstract.extensions); exts.addAll(org.chorem.entities.InterviewAbstract.extensions); -// exts.addAll(org.chorem.entities.InvoiceableAbstract.extensions); + // exts.addAll(org.chorem.entities.InvoiceableAbstract.extensions); exts.addAll(org.chorem.entities.InvoiceAbstract.extensions); exts.addAll(org.chorem.entities.MissionAbstract.extensions); exts.addAll(org.chorem.entities.NoteAbstract.extensions); @@ -207,39 +209,39 @@ exts.addAll(org.chorem.entities.VacationRequestAbstract.extensions); exts.addAll(org.chorem.entities.WarrantyAbstract.extensions); exts.addAll(org.chorem.entities.WorkerAbstract.extensions); - - + + exts.addAll(org.nuiton.wikitty.entities.WikittyAuthorisationAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyGroupAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyHookAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyLabelAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyTreeNodeAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyUserAbstract.extensions); - + // Ajout de TAG value specifique au objet deja genere dans Wikitty -//org.chorem.entities.WikittyTreeNode.attribute.name.tagvalue.help=Le nom pour cette catégorie (ex: dépense, Salaire, ...) -//org.chorem.entities.WikittyTreeNode.attribute.attachment.tagvalue.visible=false -//org.chorem.entities.WikittyTreeNode.attribute.parent.tagvalue.help=La catégorie Parente de celle-ci (ex: dépense pour Loyer) -//org.chorem.entities.WikittyTreeNode.attribute.parent.tagvalue.allowed=Category + //org.chorem.entities.WikittyTreeNode.attribute.name.tagvalue.help=Le nom pour cette catégorie (ex: dépense, Salaire, ...) + //org.chorem.entities.WikittyTreeNode.attribute.attachment.tagvalue.visible=false + //org.chorem.entities.WikittyTreeNode.attribute.parent.tagvalue.help=La catégorie Parente de celle-ci (ex: dépense pour Loyer) + //org.chorem.entities.WikittyTreeNode.attribute.parent.tagvalue.allowed=Category WikittyExtension e = org.nuiton.wikitty.entities.WikittyTreeNodeAbstract.extensionWikittyTreeNode; e.setVersion(WikittyUtil.incrementMajorRevision(e.getTagValue("version"))); // toujours faire attention d'etre a +1 par rapport a l'objet genere e.getFieldType("name").addTagValue("help", "Le nom pour cette catégorie (ex: dépense, Salaire, ...)"); e.getFieldType("attachment").addTagValue("visible", "false"); e.getFieldType("parent").addTagValue("help", "La catégorie Parente de celle-ci (ex: dépense pour Loyer)"); e.getFieldType("parent").addTagValue("allowed", "Category"); - + result.storeExtension(null, exts); ws.put(domain, result); } } } - + return result; } - + /** * Returns the attachments linked with a wikitty id ordered by date * @@ -248,13 +250,13 @@ */ public List<Attachment> getAttachments(String wikittyId) { WikittyQuery criteria = new WikittyQueryMaker() - .eq(Attachment.FQ_FIELD_ATTACHMENT_TARGET, wikittyId).end(); + .eq(Attachment.FQ_FIELD_ATTACHMENT_TARGET, wikittyId).end(); WikittyQueryResult<Attachment> result = findAllByQuery(Attachment.class, criteria); List<Attachment> attachments = result.getAll(); return attachments; } - + /** * Returns the contact details linked with a wikitty id * @@ -263,7 +265,7 @@ */ public List<ContactDetails> getContactDetails(String wikittyId) { WikittyQuery criteria = new WikittyQueryMaker() - .eq(ContactDetails.FQ_FIELD_CONTACTDETAILS_TARGET, wikittyId).end(); + .eq(ContactDetails.FQ_FIELD_CONTACTDETAILS_TARGET, wikittyId).end(); WikittyQueryResult<ContactDetails> result = findAllByQuery(ContactDetails.class, criteria); List<ContactDetails> contactDetails = result.getAll(); @@ -316,9 +318,9 @@ // on regarde si l'utilateur a une societe (au moins, on la prend au hasard :)) WikittyQuery q = new WikittyQueryMaker() - .select(Employee.FQ_FIELD_EMPLOYEE_COMPANY) - .eq(Employee.FQ_FIELD_EMPLOYEE_PERSON, user) - .end(); + .select(Employee.FQ_FIELD_EMPLOYEE_COMPANY) + .eq(Employee.FQ_FIELD_EMPLOYEE_PERSON, user) + .end(); companyId = findByQuery(q); // on a toujours pas de societe, on utilise celle de la config de l'application @@ -346,9 +348,9 @@ String userId = getUser().getWikittyId(); // on recupere toutes les companies pour lequel le user est salarie WikittyQuery q = new WikittyQueryMaker() - .select(Employee.FQ_FIELD_EMPLOYEE_COMPANY) - .eq(Employee.FQ_FIELD_EMPLOYEE_PERSON, userId) - .end(); + .select(Employee.FQ_FIELD_EMPLOYEE_COMPANY) + .eq(Employee.FQ_FIELD_EMPLOYEE_PERSON, userId) + .end(); WikittyQueryResult<Company> result = findAllByQuery(Company.class, q); return result.getAll(); } @@ -369,77 +371,93 @@ return result; } + + + /** + * Fetch the task from the given quotation + * Simple wikitty query + * @param q Quotation + * @return unmodifiable list of task from the quotation + */ + public List<Task> getTasks(Quotation q) { + WikittyQuery taskQuery = new WikittyQueryMaker() + .eq(Task.ELEMENT_FIELD_TASK_QUOTATION, q) + .end(); + + taskQuery.addSortAscending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE); + + WikittyQueryResult<Task> taskResult = findAllByQuery(Task.class, taskQuery); + return taskResult.getAll(); + } + /** + * Fetch the times from the given task + * @param t Task + * @return unmodifiable list of times from the task + */ + public List<Time> getTimes(Task t) { + //Fetch the time objects from the task + WikittyQuery timeQuery = new WikittyQueryMaker() + .eq(Time.ELEMENT_FIELD_TIME_TASK, t) + .end(); + + timeQuery.addSortAscending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE); + + WikittyQueryResult<Time> timeResult = findAllByQuery(Time.class, timeQuery); + + return timeResult.getAll(); + } + /** + * Returns the daily return of the given empoyee + * @param e + * @return + */ + public double getDailyReturn(Employee e) { - /** - * Fetch the task from the given quotation - * Simple wikitty query - * @param q Quotation - * @param client chorem client - * @return unmodifiable list of task from the quotation - */ - public List<Task> getTasks(Quotation q) { - WikittyQuery taskQuery = new WikittyQueryMaker() - .eq(Task.ELEMENT_FIELD_TASK_QUOTATION, q) - .end(); - - taskQuery.addSortAscending(Quotation.ELEMENT_FIELD_INTERVAL_BEGINDATE); + Wikitty w = this.restore(e.getWikittyId()); + Wikitty companyW = null; + if(e.getCompany(false) != null) + companyW = restore(e.getCompany(false).getWikittyId()); - WikittyQueryResult<Task> taskResult = findAllByQuery(Task.class, taskQuery); - return taskResult.getAll(); - } - - /** - * Returns the daily return of the given empoyee - * @param e - * @return - */ - public double getDailyReturn(Employee e) { - - Wikitty w = this.restore(e.getWikittyId()); - Wikitty companyW = null; - if(e.getCompany(false) != null) - companyW = restore(e.getCompany(false).getWikittyId()); - - if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && - w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { - return w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); - } - else if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) - && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { - return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); - } - else { - return this.getConfiguration().getDailyReturn(); - } - } - /** - * Returns the daily hours worked of the given empoyee - * @param e - * @return - */ - public double getDailyHoursWorked(Employee e) { - - Wikitty w = this.restore(e.getWikittyId()); - Wikitty companyW = null; - if(e.getCompany(false) != null) - companyW = restore(e.getCompany(false).getWikittyId()); - - if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && - companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { - if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { - return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * - (w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME)/100); - } - else { - return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED); - } - - } - else { - return this.getConfiguration().getDailyHoursWorked(); - } - } - - + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && + w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { + return w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); + } + else if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) + && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { + return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); + } + else { + return this.getConfiguration().getDailyReturn(); + } + } + /** + * Returns the daily hours worked of the given empoyee + * @param e + * @return + */ + public double getDailyHoursWorked(Employee e) { + + Wikitty w = this.restore(e.getWikittyId()); + Wikitty companyW = null; + if(e.getCompany(false) != null) + companyW = restore(e.getCompany(false).getWikittyId()); + + if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && + companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { + return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * + (w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME)/100); + } + else { + return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED); + } + + } + else { + return this.getConfiguration().getDailyHoursWorked(); + } + } + + } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2013-08-09 10:06:59 UTC (rev 382) +++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2013-08-14 12:14:58 UTC (rev 383) @@ -5,6 +5,7 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.chorem.ChoremClient; import org.chorem.ChoremUtil; @@ -12,168 +13,305 @@ import org.chorem.entities.EmployeeHR; import org.chorem.entities.FinancialTransaction; import org.chorem.entities.Interval; -import org.chorem.entities.Quotation; import org.chorem.entities.Time; import org.chorem.entities.Company; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; -import com.arjuna.ats.jta.transaction.Transaction; public class AdcCalculation { - - /** - * Calculates the total gains made by the company in one year - * @return - */ - public static double getTotalExpenses(ChoremClient client, Company company, Date start, Date end) { - - WikittyQuery expenseQuery = new WikittyQueryMaker() - .and() - .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) - .or() - .containsOne(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYER, getEmployeesHR(client, company)) - .eq(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYER, company) - .close() - .bw(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) - .end(); - - WikittyQueryResult<FinancialTransaction> result = client.findAllByQuery(FinancialTransaction.class, expenseQuery); - - double total = 0; - for(FinancialTransaction ft : result.getAll()) { - total += ft.getAmount(); - } - - return total; - } - - - - /** - * calculates all the salaries of the employees ponderated by the productivity rate - * @return - */ - public static double getTotalSalaries(ChoremClient client, Company company) { - //pondéré par pct de productivité - - - double total = 0; - for(EmployeeHR e : getEmployeesHR(client, company)) { - total += e.getSalary() * (e.getProductivityRate()/100); - } - return total; - } - - private static List<EmployeeHR> getEmployeesHR(ChoremClient client, Company company) { - WikittyQuery employeeQuery = new WikittyQueryMaker().and() - .exteq(EmployeeHR.EXT_EMPLOYEEHR) - .eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company) - .end(); - WikittyQueryResult<EmployeeHR> result = client.findAllByQuery(EmployeeHR.class, employeeQuery); - return result.getAll(); - - } - - /** - * Calculates the sum of all the times object linked to the company - * @return - */ - public static double getTotalTimes(ChoremClient client, Company company, Date start, Date end) { - WikittyQuery empQuery = new WikittyQueryMaker() - .eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company).end(); - WikittyQueryResult<Employee> empResult = client.findAllByQuery(Employee.class, empQuery); - - WikittyQuery timeQuery = new WikittyQueryMaker() - .and() - .exteq(Time.EXT_TIME) - .containsOne(Time.ELEMENT_FIELD_TIME_EMPLOYEE, empResult.getAll()) - .or() - .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, start, end) - .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, start, end) - .end(); - WikittyQueryResult<Time> result = client.findAllByQuery(Time.class, timeQuery); + protected ChoremClient client; + protected Company company; + protected EmployeeHR employee; + protected List<EmployeeHR> employees; + + protected Date start; + protected Date end; + + public AdcCalculation(ChoremClient client, EmployeeHR employee) { + this.employee = employee; + this.company = employee.getCompany(false); + this.client = client; + this.employees = null; + initDate(); + } + + public AdcCalculation(ChoremClient client, List<EmployeeHR> employees) { + this.employees = employees; + this.company = employees.get(0).getCompany(false); + this.client = client; + this.employee = null; + initDate(); + } + + private void initDate() { + Calendar cend = new GregorianCalendar(); + cend.add(Calendar.YEAR, -1); + cend.set(Calendar.MONTH, Calendar.DECEMBER); + cend.set(Calendar.DAY_OF_MONTH, 31); + + Calendar cstart = new GregorianCalendar(); + cstart.add(Calendar.YEAR, -1); + cstart.set(Calendar.MONTH, Calendar.JANUARY); + cstart.set(Calendar.DAY_OF_MONTH, 1); + + start = cstart.getTime(); + end = cend.getTime(); + } + + + /** + * Calculates the total gains made by the company in one year + * @return + */ + public double getTotalExpenses() { - double total = 0; - for(Time t : result.getAll()) { - total += ChoremUtil.getPeriodInHours(t.getBeginDate(), t.getEndDate()); - } + //Construct the query + //TODO : Use wikitty function for sum. + WikittyQuery expenseQuery = new WikittyQueryMaker() + .and() + .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) //of type financial transaction + .or() + //The payer is an employee of the company or the company itself + .containsOne(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYER, getEmployeesHR()) + .eq(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYER, company) + .close() + //The payment hapened during the year + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, start, end) + .end(); - return total; - } - - /** - * Returns the employee's adc - * @return - */ - public static double getAdc(ChoremClient client, EmployeeHR e) { - Company company = e.getCompany(false); - Date end = new GregorianCalendar().getTime(); - Calendar cstart = new GregorianCalendar(); - cstart.add(Calendar.YEAR, -1); - Date start = cstart.getTime(); - - double expenses = getTotalExpenses(client, company, start, end); - double salaries = getTotalSalaries(client, company); - double times = getTotalTimes(client, company, start, end); - - double dailyHoursWorked = client.getDailyHoursWorked(e); - double dailySalary = client.restore(e.getWikittyId()) - .getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR,EmployeeHR.FIELD_EMPLOYEEHR_SALARY)/21.5; - - System.out.println("EXPENSES : " + expenses); - System.out.println("SALARIES : " + salaries); - System.out.println("TIMES : " + times); - System.out.println("DHW : " + dailyHoursWorked); - System.out.println("SALARY : " + dailySalary); - - - double adc = ( (expenses/salaries)/times ) * dailyHoursWorked * dailySalary; - //dailySalary = dailySalary *1.6; //charges patronales - //double adc = dailySalary; - - return adc; - } - - public static HashMap<String, Double> getMultipleAdc(ChoremClient client, List<EmployeeHR> employees) { + WikittyQueryResult<FinancialTransaction> result = client.findAllByQuery(FinancialTransaction.class, expenseQuery); + + //Calculates the total + double total = 0; + for(FinancialTransaction ft : result.getAll()) { + total += ft.getAmount(); + } + + return total; + } + + /** + * Calculates the employee cost at full time + * @return + */ + public double getMonthlyFullTimeCost(EmployeeHR e) { + double salary = e.getSalary(); + double otherPayments = e.getOtherPayments(); + double partialTime = e.getPartialTime(); + + return ( ( salary + otherPayments) * (partialTime/100) ); + } + + + /** + * calculates the estimated number of prodctive days when the employee will work + * @return + */ + public double getEstimatedNumberOfProductiveDays(EmployeeHR e) { + int daysInYear = 218; //It would be *much* better to calculate this or at least get it from input + double partialTime = e.getPartialTime(); + double productivityRate = e.getProductivityRate(); + + return (daysInYear * (partialTime/100) * (productivityRate/100)); + } + + public double getRealNumberOfProductiveDays(EmployeeHR e) { + + //fetch the times of all the employees of the company that have worked between $start an $end + WikittyQuery timeQuery = new WikittyQueryMaker() + .and() + .exteq(Time.EXT_TIME) + .eq(Time.ELEMENT_FIELD_TIME_EMPLOYEE, e) + .or() + .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, start, end) + .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, start, end) + .end(); + WikittyQueryResult<Time> result = client.findAllByQuery(Time.class, timeQuery); + + //Calculates the total + double total = 0; + for(Time t : result.getAll()) { + total += ChoremUtil.getPeriodInHours(t.getBeginDate(), t.getEndDate()); + + } + + return (total/ client.getDailyHoursWorked(e) ) + * (e.getProductivityRate()/100); + } + + /** + * + * @return + */ + public double getYearCost(EmployeeHR e, boolean real) { + double result = 0; + if(real) { + result = getMonthlyFullTimeCost(e) * getRealNumberOfProductiveDays(e); + } + else { + result = getMonthlyFullTimeCost(e) * getEstimatedNumberOfProductiveDays(e); + } + return result; + } + + public double getTotalYearCost(boolean real) { + + double total = 0; + for(EmployeeHR e : getEmployeesHR()) { + total += getYearCost(e, real); + } + return total; + } + + + + /** + * Get all the employees of the company having the EmployeeHR extension + * @param client + * @param company + * @return + */ + protected List<EmployeeHR> getEmployeesHR() { + + WikittyQuery employeeQuery = new WikittyQueryMaker().and() + .exteq(EmployeeHR.EXT_EMPLOYEEHR) + .eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company) + .end(); + WikittyQueryResult<EmployeeHR> result = client.findAllByQuery(EmployeeHR.class, employeeQuery); + return result.getAll(); + + } + + /** + * Calculates the sum of all the times object linked to the company + * @return + */ + public double getTotalTimes() { + + WikittyQuery empQuery = new WikittyQueryMaker() + .eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company).end(); + WikittyQueryResult<Employee> empResult = client.findAllByQuery(Employee.class, empQuery); + + //fetch the times of all the employees of the company that have worked between $start an $end + WikittyQuery timeQuery = new WikittyQueryMaker() + .and() + .exteq(Time.EXT_TIME) + .containsOne(Time.ELEMENT_FIELD_TIME_EMPLOYEE, empResult.getAll()) + .or() + .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, start, end) + .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, start, end) + .end(); + WikittyQueryResult<Time> result = client.findAllByQuery(Time.class, timeQuery); + + //Calculates the total + double total = 0; + for(Time t : result.getAll()) { + total += ChoremUtil.getPeriodInHours(t.getBeginDate(), t.getEndDate()); + } + + return total; + } + + /** + * Returns the employee's adc + * @return + */ + public double getAdc(boolean real) { + + + double expenses = getTotalExpenses(); + double productiveDays = 0; + if(real) { + productiveDays = getRealNumberOfProductiveDays(employee); + } + else { + productiveDays = getEstimatedNumberOfProductiveDays(employee); + } + + double cost = getYearCost(employee, real); + double totalCost = getTotalYearCost(real); + + System.out.println("EXPENSES : " + expenses); + System.out.println("PROD DAYS : " + productiveDays); + System.out.println("COST : " + expenses); + System.out.println("TOTAL COST : " + expenses); + + double adc = ( (expenses * cost) / totalCost ) / productiveDays; + + + return adc; + } + + public double getAdc() { + return getAdc(false); + } + public Map<String, Double> getMultipleAdc() { + return getMultipleAdc(false); + } + + /** + * Returns multiple adc form the given employee list. + * @param client + * @param employees + * @return + */ + public Map<String, Double> getMultipleAdc(boolean real) { if(employees.size() == 0) return null; - Company company = employees.get(0).getCompany(false); - Date end = new GregorianCalendar().getTime(); - Calendar cstart = new GregorianCalendar(); - cstart.add(Calendar.YEAR, -1); - Date start = cstart.getTime(); - double expenses = getTotalExpenses(client, company, start, end); - double salaries = getTotalSalaries(client, company); - double times = getTotalTimes(client, company, start, end); - + Calendar cend = new GregorianCalendar(); + cend.add(Calendar.YEAR, -1); + cend.set(Calendar.MONTH, Calendar.DECEMBER); + cend.set(Calendar.DAY_OF_MONTH, 31); + + Calendar cstart = new GregorianCalendar(); + cstart.add(Calendar.YEAR, -1); + cstart.set(Calendar.MONTH, Calendar.JANUARY); + cstart.set(Calendar.DAY_OF_MONTH, 1); + + Date start = cstart.getTime(); + Date end = cend.getTime(); + + //Calculate all the "static" values before + + double expenses = getTotalExpenses(); + + double totalCost = getTotalYearCost(real); + + //Then, for each employee + HashMap<String, Double> adcs = new HashMap<String, Double>(); for(EmployeeHR e : employees) { - double dailyHoursWorked = client.getDailyHoursWorked(e); - double dailySalary = client.restore(e.getWikittyId()) - .getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_SALARY)/21.5; - System.out.println("EXPENSES : " + expenses); - System.out.println("SALAIRES : " + salaries); - System.out.println("TIMES : " + times); - System.out.println("DAILY HW : " + dailyHoursWorked); - System.out.println("DAILY SALARY : " + dailySalary); - adcs.put(e.getWikittyId(),( (expenses/salaries)/times ) * dailyHoursWorked * dailySalary); + this.employee = e; + + double productiveDays = 0; + if(real) { + productiveDays = getRealNumberOfProductiveDays(e); + } + else { + productiveDays = getEstimatedNumberOfProductiveDays(e); + } + double cost = getYearCost(e, real); + + Double adc = ( ( (expenses * cost) / totalCost ) / productiveDays); + if(adc.isNaN()) { + adc = 0.0; + } + adcs.put(e.getWikittyId(),adc); } - //dailySalary = dailySalary *1.6; //charges patronales - //double adc = dailySalary; - + return adcs; - - } - - - - - - + } + + + + + + + } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2013-08-09 10:06:59 UTC (rev 382) +++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2013-08-14 12:14:58 UTC (rev 383) @@ -15,249 +15,249 @@ */ public abstract class Calculation<T> { - /**Main object (Task or Quotation)*/ - protected T e; - /** Chorme client */ - protected ChoremClient client; - /** Total price of the object */ - protected double amount; - /** Estimated number of days */ - protected double nbDays; + /**Main object (Task or Quotation)*/ + protected T e; + /** Chorme client */ + protected ChoremClient client; + /** Total price of the object */ + protected double amount; + /** Estimated number of days */ + protected double nbDays; - protected static final int SEC_PER_HOUR = 3600; - protected static final int WORKING_HOURS_PER_DAY = 7; - /* Seuil de rentabilite productif */ + protected static final int SEC_PER_HOUR = 3600; + protected static final int WORKING_HOURS_PER_DAY = 7; + /* Seuil de rentabilite productif */ - //attributes to store the calculations - private Double adr = null; - private Double realDays = null; - private Double deltaDays = null; - private Double realAdr = null; - private Double expectedProfit = null; - private Double lossOrProfit = null; - private Double resultPerDay = null; - private Double avgReturn = null; - private Double realReturn = null; + //attributes to store the calculations + private Double adr = null; + private Double realDays = null; + private Double deltaDays = null; + private Double realAdr = null; + private Double expectedProfit = null; + private Double lossOrProfit = null; + private Double resultPerDay = null; + private Double avgReturn = null; + private Double realReturn = null; - /** - * - * @param e Element that will serve for the calculations - * @param amount Amount of this element - * @param nbDays Estimated number of days for this element - * @param client Instance of ChoremClient - */ - public Calculation(T e, double amount, double nbDays, ChoremClient client) { - this.e = e; - this.client = client; - this.amount = amount; - this.nbDays = nbDays; - } + /** + * + * @param e Element that will serve for the calculations + * @param amount Amount of this element + * @param nbDays Estimated number of days for this element + * @param client Instance of ChoremClient + */ + public Calculation(T e, double amount, double nbDays, ChoremClient client) { + this.e = e; + this.client = client; + this.amount = amount; + this.nbDays = nbDays; + } - /** - * Makes all the calcuations and store them into the attributes - */ - public void calculate() { + /** + * Makes all the calcuations and store them into the attributes + */ + public void calculate() { - this.adr = adr(); - this.realDays = realDays(); - this.deltaDays = deltaDays(); - this.realAdr = realAdr(); - this.expectedProfit = expectedProfit(); - this.lossOrProfit = lossOrProfit(); - this.resultPerDay = resultPerDay(); - this.avgReturn = avgReturn(); - this.realReturn = realReturn(); - } - - /** - * Calculates the real number of days from the Time objects. - * @return - */ - public abstract double realDays(); - - - /** - * Return the times (in hour) per employee for the current object - * @return - */ - protected abstract HashMap<Employee, Double> getTimes(); - - /** - * Return the percentages for the current object - * @return - */ - protected abstract HashMap<Employee, Double> getPercentages(); - - public HashMap<Employee, Double> getTimePercentages() { - HashMap<Employee, Double> times = getTimes(); - HashMap<Employee, Double> timePercentages = new HashMap<Employee, Double>(); - double sum = 0; - Set<Employee> keySet = times.keySet(); - for (Employee key : keySet) { - sum+= times.get(key); - } - for (Employee key : keySet) { - timePercentages.put(key, (times.get(key)/sum)*100); - } - - - return timePercentages; - } - /** - * Return the average Return for all the employees, ponderated by the percentages - * @return - */ - public double avgReturn() { - - //Fetch the percentages per employee - HashMap<Employee, Double> percentages = getPercentages(); - if(percentages.size() == 0) { - return client.getConfiguration().getDailyReturn(); - } - Set<Employee> keySet = percentages.keySet(); - double avgReturn = 0; - for(Employee key : keySet) { - avgReturn += client.getDailyReturn(key)*(percentages.get(key)/100); - } - - return avgReturn; - } - - /** - * Calculates the real daily return from the different times object and the daily return of the employees. - * @return - */ - public double realReturn() { - HashMap<Employee, Double> times = getTimes(); - if(times.size() == 0) { - return client.getConfiguration().getDailyReturn(); - } - double realReturn = 0; - Set<Employee> keySet = times.keySet(); - for(Employee key : keySet) { - double srp = client.getDailyReturn(key); - double hoursPerDay = client.getDailyHoursWorked(key); - - //TODO :Find a way to use the different work hours - - //} - realReturn += srp* ( times.get(key) / hoursPerDay ) ; - } - realReturn = realReturn/getRealDays(); - - return realReturn; - } - - /** - * Returns the average daily rate, which is the amount divided by the estimated number of days. - * @return the ADR - */ - public double adr() { - return amount/nbDays; - } + this.adr = adr(); + this.realDays = realDays(); + this.deltaDays = deltaDays(); + this.realAdr = realAdr(); + this.expectedProfit = expectedProfit(); + this.lossOrProfit = lossOrProfit(); + this.resultPerDay = resultPerDay(); + this.avgReturn = avgReturn(); + this.realReturn = realReturn(); + } - + /** + * Calculates the real number of days from the Time objects. + * @return + */ + public abstract double realDays(); - /** - * Gives the difference between the real number of days and the estimated value - * @return - */ - public double deltaDays() { - return getRealDays() - nbDays; - } - /** - * Calculates the real ADR from the real number of days. - * @return - */ - public double realAdr() { - double realDays = getRealDays(); + /** + * Return the times (in hour) per employee for the current object + * @return + */ + protected abstract HashMap<Employee, Double> getTimes(); - return amount/realDays; - } + /** + * Return the percentages for the current object + * @return + */ + protected abstract HashMap<Employee, Double> getPercentages(); - /** - * Profit calculated from the estimated ADR and the estimated numer of days - * @return - */ - public double expectedProfit() { - return amount - (nbDays*getAvgReturn()); - } + public HashMap<Employee, Double> getTimePercentages() { + HashMap<Employee, Double> times = getTimes(); + HashMap<Employee, Double> timePercentages = new HashMap<Employee, Double>(); + double sum = 0; + Set<Employee> keySet = times.keySet(); + for (Employee key : keySet) { + sum+= times.get(key); + } + for (Employee key : keySet) { + timePercentages.put(key, (times.get(key)/sum)*100); + } - /** - * Real profit (or loss) done when the quotation is closed. - * @return - */ - public double lossOrProfit() { - return amount - (getRealDays() * getRealReturn()); - } - /** - * Average profit/loss per day - * @return - */ - public double resultPerDay() { - return getLossOrProfit() / getRealDays(); - } - - - - /* ########################################################################################## - * ######################### GETTERS ####################################################### - * ########################################################################################## - * - * The getters returns the attributes if it has been calculated and calculates directly the value otherwise - */ + return timePercentages; + } + /** + * Return the average Return for all the employees, ponderated by the percentages + * @return + */ + public double avgReturn() { - public double getAdr() { - if(adr == null) - adr = adr(); - return adr; - } - public double getRealDays() { - if(realDays == null) - realDays = realDays(); - return realDays; - } - public double getDeltaDays() { - if(deltaDays == null) - deltaDays = deltaDays(); - return deltaDays; - } - public double getRealAdr() { - if(realAdr == null) - realAdr = realAdr(); - return realAdr; - } - public double getExpectedProfit() { - if(expectedProfit == null) - expectedProfit = expectedProfit(); - return expectedProfit; - } - public double getLossOrProfit() { - if(lossOrProfit == null) - lossOrProfit = lossOrProfit(); - return lossOrProfit; - } - public double getResultPerDay() { - if(resultPerDay == null) - resultPerDay = resultPerDay(); - return resultPerDay; - } - - public double getAvgReturn() { - if(avgReturn == null) - avgReturn = avgReturn(); - return avgReturn; - } - public double getRealReturn() { - if(realReturn == null) - realReturn = realReturn(); - return realReturn; - } - - public T getObject() { - return e; - } + //Fetch the percentages per employee + HashMap<Employee, Double> percentages = getPercentages(); + if(percentages.size() == 0) { + return client.getConfiguration().getDailyReturn(); + } + Set<Employee> keySet = percentages.keySet(); + double avgReturn = 0; + for(Employee key : keySet) { + avgReturn += client.getDailyReturn(key)*(percentages.get(key)/100); + } + + return avgReturn; + } + + /** + * Calculates the real daily return from the different times object and the daily return of the employees. + * @return + */ + public double realReturn() { + HashMap<Employee, Double> times = getTimes(); + if(times.size() == 0) { + return client.getConfiguration().getDailyReturn(); + } + double realReturn = 0; + Set<Employee> keySet = times.keySet(); + for(Employee key : keySet) { + double srp = client.getDailyReturn(key); + double hoursPerDay = client.getDailyHoursWorked(key); + + //TODO :Find a way to use the different work hours + + //} + realReturn += srp* ( times.get(key) / hoursPerDay ) ; + } + realReturn = realReturn/getRealDays(); + + return realReturn; + } + + /** + * Returns the average daily rate, which is the amount divided by the estimated number of days. + * @return the ADR + */ + public double adr() { + return amount/nbDays; + } + + + + /** + * Gives the difference between the real number of days and the estimated value + * @return + */ + public double deltaDays() { + return getRealDays() - nbDays; + } + + /** + * Calculates the real ADR from the real number of days. + * @return + */ + public double realAdr() { + double realDays = getRealDays(); + + return amount/realDays; + } + + /** + * Profit calculated from the estimated ADR and the estimated numer of days + * @return + */ + public double expectedProfit() { + return amount - (nbDays*getAvgReturn()); + } + + /** + * Real profit (or loss) done when the quotation is closed. + * @return + */ + public double lossOrProfit() { + return amount - (getRealDays() * getRealReturn()); + } + + /** + * Average profit/loss per day + * @return + */ + public double resultPerDay() { + return getLossOrProfit() / getRealDays(); + } + + + + /* ########################################################################################## + * ######################### GETTERS ####################################################### + * ########################################################################################## + * + * The getters returns the attributes if it has been calculated and calculates directly the value otherwise + */ + + public double getAdr() { + if(adr == null) + adr = adr(); + return adr; + } + public double getRealDays() { + if(realDays == null) + realDays = realDays(); + return realDays; + } + public double getDeltaDays() { + if(deltaDays == null) + deltaDays = deltaDays(); + return deltaDays; + } + public double getRealAdr() { + if(realAdr == null) + realAdr = realAdr(); + return realAdr; + } + public double getExpectedProfit() { + if(expectedProfit == null) + expectedProfit = expectedProfit(); + return expectedProfit; + } + public double getLossOrProfit() { + if(lossOrProfit == null) + lossOrProfit = lossOrProfit(); + return lossOrProfit; + } + public double getResultPerDay() { + if(resultPerDay == null) + resultPerDay = resultPerDay(); + return resultPerDay; + } + + public double getAvgReturn() { + if(avgReturn == null) + avgReturn = avgReturn(); + return avgReturn; + } + public double getRealReturn() { + if(realReturn == null) + realReturn = realReturn(); + return realReturn; + } + + public T getObject() { + return e; + } } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2013-08-09 10:06:59 UTC (rev 382) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2013-08-14 12:14:58 UTC (rev 383) @@ -75,13 +75,9 @@ protected HashMap<Employee, Double> getTimes() { HashMap<Employee, Double> times = new HashMap<Employee, Double>(); - //Feth the time objects from the task - WikittyQuery timeQuery = new WikittyQueryMaker() - .eq(Time.ELEMENT_FIELD_TIME_TASK, e) - .end(); - WikittyQueryResult<Time> timeResult = client.findAllByQuery(Time.class, timeQuery); - for(Time t : timeResult.getAll()) { + + for(Time t : client.getTimes(e)) { Employee emp = t.getEmployee(false); if(emp != null) { if(times.containsKey(emp)) { Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-08-09 10:06:59 UTC (rev 382) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-08-14 12:14:58 UTC (rev 383) @@ -34,7 +34,15 @@ org.chorem.entities.Attachment.attribute.mimetype.tagvalue.choiceQuery=SELECT Attachment.mimetype WHERE extension=Attachment 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/...) + # +# ADC +# +org.chorem.entities.ADC.class.tagvalue.version=1.0 +org.chorem.entities.Cancelled.class.tagvalue.toString=%ADC.employeeHR|noemployee%s %ADC.year|noyear%s %ADC.value|novalue$s + + +# # Cancelled # org.chorem.entities.Cancelled.class.tagvalue.version=1.0 Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ)

1 0

r382 - in trunk: . chorem-entities chorem-webmotion
by tchemit＠users.chorem.org Aug. 9, 2013

Aug. 9, 2013

Author: tchemit Date: 2013-08-09 12:06:59 +0200 (Fri, 09 Aug 2013) New Revision: 382 Url: http://chorem.org/projects/chorem/repository/revisions/382 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2013-08-07 13:35:46 UTC (rev 381) +++ trunk/chorem-entities/pom.xml 2013-08-09 10:06:59 UTC (rev 382) @@ -1,12 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> @@ -16,7 +11,7 @@ <groupId>org.chorem.chorem</groupId> <artifactId>chorem-entities</artifactId> - <name>Chorem entities</name> + <name>Chorem :: entities</name> <description>Chorem entities</description> <dependencies> @@ -119,7 +114,6 @@ <filtering>true</filtering> </resource> </resources>--> - <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> @@ -160,4 +154,5 @@ </plugins> </build> + </project> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2013-08-07 13:35:46 UTC (rev 381) +++ trunk/chorem-webmotion/pom.xml 2013-08-09 10:06:59 UTC (rev 382) @@ -1,12 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> @@ -15,12 +10,11 @@ <groupId>org.chorem.chorem</groupId> <artifactId>chorem-webmotion</artifactId> + <packaging>war</packaging> - <name>Chorem webmotion</name> + <name>Chorem :: webmotion</name> <description>Chorem webmotion</description> - <packaging>war</packaging> - <properties> <i18n.bundleOutputName>chorem-i18n</i18n.bundleOutputName> <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources @@ -35,6 +29,9 @@ target/${project.build.finalName}.war, </redmine.releaseFiles> +  + <skipPostRelease>false</skipPostRelease> + </properties> <dependencies> @@ -195,7 +192,41 @@ <filtering>true</filtering> </resource> </resources>--> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> +  + <webAppConfig> + <contextPath>/chorem</contextPath> + </webAppConfig> + <systemProperties> + <systemProperty> + <name>chorem.log.dir</name> + <value>${basedir}/target</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <configuration> + <path>/chorem</path> + <uriEncoding>UTF-8</uriEncoding> + <systemProperties> + <chorem.log.dir>${basedir}/target</chorem.log.dir> + </systemProperties> + </configuration> + </plugin> + + </plugins> + </pluginManagement> <plugins>  <plugin> @@ -258,55 +289,6 @@ </executions> </plugin> </plugins> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <stopKey>A</stopKey> - <stopPort>1269</stopPort> -  - <webAppConfig> - <contextPath>/chorem</contextPath> - </webAppConfig> - <systemProperties> - <systemProperty> - <name>chorem.log.dir</name> - <value>${basedir}/target</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <configuration> - <path>/chorem</path> - <uriEncoding>UTF-8</uriEncoding> - <systemProperties> - <chorem.log.dir>${basedir}/target</chorem.log.dir> - </systemProperties> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - <configuration> - <path>/chorem</path> - <uriEncoding>UTF-8</uriEncoding> - <systemProperties> - <chorem.log.dir>${basedir}/target</chorem.log.dir> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-07 13:35:46 UTC (rev 381) +++ trunk/pom.xml 2013-08-09 10:06:59 UTC (rev 382) @@ -1,34 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.0</version> </parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> <version>0.3-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>chorem-entities</module> - <module>chorem-webmotion</module> - </modules> - - <name>chorem</name> + <name>Chorem</name> <description>Project management</description> - <inceptionYear>2011</inceptionYear> - <url>http://maven-site.chorem.org/chorem</url> - <packaging>pom</packaging> - + <inceptionYear>2011</inceptionYear> <licenses> <license> <name>GNU Affero General Public License version 3</name> @@ -73,6 +61,11 @@ </developer> </developers> + <modules> + <module>chorem-entities</module> + <module>chorem-webmotion</module> + </modules> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/chorem/trunk</connection> <developerConnection> @@ -80,7 +73,6 @@ </developerConnection> <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> </scm> - <distributionManagement> <site> <id>${platform}</id> @@ -115,6 +107,19 @@ <i18n.silent>true</i18n.silent> </properties> + <repositories> + + <repository> + <id>chorem-group</id> + <name>Chorem Group</name> + <url>http://nexus.nuiton.org/nexus/content/groups/chorem-group</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + + </repositories> + <dependencyManagement> <dependencies> @@ -266,7 +271,6 @@ <filtering>true</filtering> </resource> </resources>--> - <pluginManagement> <plugins> @@ -302,22 +306,8 @@ </plugins> </pluginManagement> - </build> - <repositories> - - <repository> - <id>chorem-group</id> - <name>Chorem Group</name> - <url>http://nexus.nuiton.org/nexus/content/groups/chorem-group</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - - </repositories> - <profiles> <profile> @@ -361,5 +351,4 @@ </profile> </profiles> - </project>

1 0

r381 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions java/org/chorem/webmotion/actions/project webapp/WEB-INF/jsp webapp/js
by meynier＠users.chorem.org Aug. 7, 2013

Aug. 7, 2013

Author: meynier Date: 2013-08-07 15:35:46 +0200 (Wed, 07 Aug 2013) New Revision: 381 Url: http://chorem.org/projects/chorem/repository/revisions/381 Log: Various small modifications on the dashboards Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-08-07 13:34:26 UTC (rev 380) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-08-07 13:35:46 UTC (rev 381) @@ -1,19 +1,10 @@ package org.chorem.webmotion.actions; -import java.text.NumberFormat; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.GregorianCalendar; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,21 +13,13 @@ 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.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.Employee; import org.chorem.entities.EmployeeHR; import org.chorem.entities.EmployeeHRImpl; import org.chorem.entities.EmployeeImpl; -import org.chorem.entities.Interval; -import org.chorem.entities.Quotation; -import org.chorem.entities.Project; -import org.chorem.entities.Task; -import org.chorem.entities.Time; -import org.chorem.entities.Worker; import org.chorem.project.AdcCalculation; -import org.chorem.project.QuotationCalculation; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; @@ -53,18 +36,14 @@ static private Log log = LogFactory.getLog(EmployeeEditAction.class); /** - * Return the view for a single quotation - * @param client Chorem client - * @param id Project ID (useless here) - * @param quotationFilter Quotation id + * Return a page with an array with the employees of the specified company + * @param client chorem client + * @param company employees will be fetched from this company * @return */ public Render employeeFilter(ChoremClient client, Company company) { //get all the empoyees from the default company - - - List<Company> companies = client.findAllByQuery(Company.class, new WikittyQueryMaker().exteq("Company").end()).getAll(); @@ -79,7 +58,7 @@ } Collections.sort(employees); - //simply return them lol + //simply return them return renderView("employeeEdit.jsp", "employees",employees, "companies", companies, @@ -88,6 +67,15 @@ } + /** + * generate a page to edit the employees + * + * @param client choorem client + * @param companyId + * @param addExtension + * @param call + * @return + */ public Render requestEmployeeEdit(ChoremClient client, String companyId, String addExtension, Call call) { Company company = null; @@ -127,12 +115,19 @@ return employeeFilter(client, company); } + /** + * Ajax request for the adc calculation + * + * @param client chorme client + * @param employeeId id of the employee that needs an adc calculation + * @return adc + */ public Render requestAdc(ChoremClient client, String employeeId) { Wikitty w = client.restore(employeeId); EmployeeHR e = new EmployeeHRImpl(w); - AdcCalculation adcCalc = new AdcCalculation(e, client); - double adc = adcCalc.getAdc(); + double adc = AdcCalculation.getAdc(client, e); + w.setField("EmployeeHR", "dailyReturn", adc); client.store(w); @@ -141,16 +136,56 @@ } + /** + * Ajax request for the adc calculation of multiple employees of the same company + * + * @param client chorme client + * @param employeeId id of the employees that needs an adc calculation + * @return adc + */ + public Render requestMultipleAdc(ChoremClient client, String employeeId) { + List<Wikitty> w = client.restore(ChoremUtil.asList(",", employeeId)); + List<EmployeeHR> employees = new ArrayList<EmployeeHR>(); + for(int i = 0; i< w.size(); i++) { + employees.add(new EmployeeHRImpl(w.get(i))); + } + + HashMap<String, Double> adcs = AdcCalculation.getMultipleAdc(client, employees); + for(int i = 0; i< w.size(); i++) { + Wikitty wi = w.get(i); + wi.setField("EmployeeHR", "dailyReturn", adcs.get(wi.getWikittyId())); + client.store(wi); + } + for(String s : adcs.keySet()) { + int iadc = (int)(adcs.get(s)*100); + adcs.put(s, (double)(iadc/100.0)); + } + return renderJSON("adcs", adcs); + } + + /** + * Ajax requets to modify the employee values + * + * @param client chorme client + * @param employeeId id of the employee to modify + * @param salaryStr new salary in String format + * @param productivityRateStr new prod rate in String format + * @param partialTimeStr new partial time in String format + * @param dailyReturnStr new daily return in String format + * @return + */ public Render editEmployeeValues(ChoremClient client, String employeeId, String salaryStr - , String productivityRateStr, String partialTimeStr, String dailyReturnStr) { + , String productivityRateStr, String partialTimeStr, String dailyReturnStr, String otherPaymentsStr) { Wikitty employeeWikitty = client.restore(employeeId); Employee employee = new EmployeeImpl(employeeWikitty); - if(!employeeWikitty.hasExtension("EmployeeHR")) { - employeeWikitty.addExtension(client.restoreExtensionLastVersion("EmployeeHR")); + if(!employeeWikitty.hasExtension(EmployeeHR.EXT_EMPLOYEEHR)) { + employeeWikitty.addExtension(client.restoreExtensionLastVersion(EmployeeHR.EXT_EMPLOYEEHR)); } - double salary = 0, productivityRate = 0, partialTime = 0, dailyReturn = 0; + double salary = 0, productivityRate = 0, partialTime = 0, dailyReturn = 0, otherPayments = 0; + + //Try to parse the strings and generates if errors if it fails List<ErrorJson> errors = new ArrayList<ErrorJson>(); try { salary = Double.parseDouble(salaryStr); @@ -180,6 +215,14 @@ errors.add(new ErrorJson("dailyReturn", "Daily return must be a real number")); } + try { + otherPayments = Double.parseDouble(otherPaymentsStr); + } + catch (java.lang.NumberFormatException e) { + errors.add(new ErrorJson("dailyReturn", "Other payments must be a real number")); + } + + //Verify that the percentages are between 0 and 100 if(productivityRate > 100 || productivityRate < 0) { errors.add(new ErrorJson("productivityRate", "Productivity rate must be between 0 and 100")); } @@ -191,10 +234,11 @@ if(salary != 0) - employeeWikitty.setFqField("EmployeeHR.salary", salary); - employeeWikitty.setFqField("EmployeeHR.productivityRate", productivityRate); - employeeWikitty.setFqField("EmployeeHR.partialTime", partialTime); - employeeWikitty.setFqField("EmployeeHR.dailyReturn", dailyReturn); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_SALARY, salary); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_PRODUCTIVITYRATE, productivityRate); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_PARTIALTIME, partialTime); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_DAILYRETURN, dailyReturn); + employeeWikitty.setFqField(EmployeeHR.FQ_FIELD_EMPLOYEEHR_OTHERPAYMENTS, otherPayments); client.store(employeeWikitty); @@ -205,12 +249,19 @@ data.getProductivityRate(), data.getPartialTime(), data.getDailyReturn(), - data.getDailyHoursWorked() + data.getDailyHoursWorked(), + data.getOtherPayments() ); return renderJSON("data", json); } + + /** + * Class used to store an error + * @author gwenn + * + */ public class ErrorJson { private String errorMessage; private String field; @@ -221,6 +272,13 @@ } } + /** + * Structure used to store information about an employee + * Used for the AJAX request + * + * @author gwenn + * + */ public class EmployeeJson { private String salary; @@ -228,18 +286,25 @@ private double partialTime; private double dailyReturn; private double dailyHoursWorked; + private double otherPayments; public EmployeeJson(String salary, double productivityRate, double partialTime, - double dailyReturn, double dailyHoursWorked) { + double dailyReturn, double dailyHoursWorked, double otherPayments) { this.salary = salary; this.productivityRate = productivityRate; this.partialTime = partialTime; this.dailyReturn = dailyReturn; this.dailyHoursWorked = dailyHoursWorked; + this.otherPayments = otherPayments; } - } - + + /** + * Structure used to store information about an employee + * used for the standard http request + * @author gwenn + * + */ public class EmployeeData implements Comparable{ private Employee e; @@ -248,19 +313,22 @@ private double partialTime; private double dailyReturn; private double dailyHoursWorked; + private double otherPayments; public EmployeeData(Employee e, ChoremClient client) { Wikitty w = client.restore(e.getWikittyId()); - if(w.hasExtension("EmployeeHR")) { - this.salary = w.getFieldAsDouble("EmployeeHR", "salary") + ""; - this.productivityRate = w.getFieldAsDouble("EmployeeHR", "productivityRate"); - this.partialTime = w.getFieldAsDouble("EmployeeHR", "partialTime"); + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR)) { + this.salary = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_SALARY) + ""; + this.productivityRate = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PRODUCTIVITYRATE); + this.partialTime = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME); + this.otherPayments = w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_OTHERPAYMENTS); } else { this.salary = "Non renseigné"; this.productivityRate = 100; this.partialTime = 100; + this.otherPayments = 0; } this.dailyReturn = client.getDailyReturn(e); //Simple trick to limit to 2 numbers after digit @@ -296,6 +364,9 @@ public double getPartialTime() { return partialTime; } + public double getOtherPayments() { + return otherPayments; + } @Override public int compareTo(Object o) { 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-08-07 13:34:26 UTC (rev 380) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2013-08-07 13:35:46 UTC (rev 381) @@ -27,6 +27,7 @@ import org.chorem.entities.Time; import org.chorem.entities.Worker; import org.chorem.project.QuotationCalculation; +import org.chorem.project.TotalQuotationCalculation; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; @@ -100,7 +101,7 @@ if(id != null && !id.equals("")) projectQueryMaker.ideq(id); else - projectQueryMaker.exteq("Project"); + projectQueryMaker.exteq(Project.EXT_PROJECT); WikittyQuery projectQuery = projectQueryMaker.end(); projectResult = client.findAllByQuery(Project.class, projectQuery); @@ -181,13 +182,18 @@ calc.calculate(); calculations.put(q, calc); } + + TotalQuotationCalculation total = new TotalQuotationCalculation( + new ArrayList<QuotationCalculation>(calculations.values())); + return renderView("dashboardMultiProject.jsp", "title", "Tableau de bord projets", "locale", client.getUserLocale(), "quotations", quotations, - "calculations", calculations); + "calculations", calculations, + "total", total); } @@ -210,7 +216,7 @@ if(id != null && !id.equals("")) employeeQueryMaker.ideq(id); else { - employeeQueryMaker.exteq("Employee"); + employeeQueryMaker.exteq(Employee.EXT_EMPLOYEE); } WikittyQueryResult<Employee> employeeResult = client.findAllByQuery(Employee.class,employeeQueryMaker.end()); List<Employee> employeeList = employeeResult.getAll(); @@ -218,7 +224,7 @@ //Fetch all the tasks on the interval WikittyQueryMaker taskQueryMaker = new WikittyQueryMaker() .and() - .exteq("Task"); + .exteq(Task.EXT_TASK); if(quotationFilters!=null) { taskQueryMaker.or(); @@ -315,6 +321,7 @@ percentages.put(e, p); } + //Calculates the average working time Calendar gFrom = new GregorianCalendar(); @@ -365,4 +372,6 @@ } } + + } Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2013-08-07 13:34:26 UTC (rev 380) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2013-08-07 13:35:46 UTC (rev 381) @@ -15,6 +15,7 @@ import org.chorem.ChoremClient; import org.chorem.entities.Quotation; import org.chorem.entities.Task; +import org.chorem.entities.TaskStatus; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; import org.nuiton.wikitty.entities.Wikitty; @@ -47,19 +48,19 @@ for(Task t : taskResult.getAll()) { if(t.getBeginDate() != null && t.getEndDate() != null) { - if(t.getStatus().equals("SCHEDULED")) { + if(t.getStatus().equalsIgnoreCase("scheduled")) { customClass = "ganttBlue"; } - else if(t.getStatus().equals("STARTED")) { + else if(t.getStatus().equalsIgnoreCase("started")) { customClass = "ganttGreen"; } - else if(t.getStatus().equals("FINISHED")) { + else if(t.getStatus().equalsIgnoreCase("finished")) { customClass = "ganttRed"; } - else if(t.getStatus().equals("CLOSED")) { + else if(t.getStatus().equalsIgnoreCase("closed")) { customClass = "ganttGrey"; } - + Values[] v = null; if(t.getDayExtension() != 0) v= new Values[2]; Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2013-08-07 13:34:26 UTC (rev 380) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2013-08-07 13:35:46 UTC (rev 381) @@ -51,17 +51,18 @@ <th>Montant</th> <th>Nombre de jours estimés</th> <th><abbr title="Taux journalier moyen">TJM</abbr></th> + <th>Gain attendu</th> <th>Nombre de jours rééls</th> + <th><abbr title="Taux journalier moyen">TJM</abbr> reel</th> <th>Différence estimation/réél</th> - <th><abbr title="Taux journalier moyen">TJM</abbr> reel</th> - <th>Gain attendu</th> <th>Perte/gain</th> - <th>Average CJM</th> - <th>Real CJM</th> + <th>CJM estimé</th> + <th>CJM réel</th> </tr> </thead> + <tbody> <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=""/> @@ -73,16 +74,18 @@ <td class="number"> <f:formatNumber type="number" maxFractionDigits="2" value="${calculations[q].getAdr()}" /></td> + + <td class="currency"> <f:formatNumber type="currency" + maxFractionDigits="2" value="${calculations[q].getExpectedProfit()}" /></td> <td class="number"> <f:formatNumber type="number" maxFractionDigits="2" value="${calculations[q].getRealDays()}" /></td> + <td class="number"> <f:formatNumber type="number" + maxFractionDigits="2" value="${calculations[q].getRealAdr()}" /></td> + <td class="number"> <f:formatNumber type="number" maxFractionDigits="2" value="${calculations[q].getDeltaDays()}" /></td> - <td class="number"> <f:formatNumber type="number" - maxFractionDigits="2" value="${calculations[q].getRealAdr()}" /></td> <td class="currency"> <f:formatNumber type="currency" - maxFractionDigits="2" value="${calculations[q].getExpectedProfit()}" /></td> - <td class="currency"> <f:formatNumber type="currency" maxFractionDigits="2" value="${calculations[q].getLossOrProfit()}" /></td> <td> <f:formatNumber type="number" maxFractionDigits="2" value="${calculations[q].getAvgReturn()}" /></td> @@ -90,8 +93,34 @@ maxFractionDigits="2" value="${calculations[q].getRealReturn()}" /></td> </tr> - </tbody> + </c:forEach> + <tr> + <td><b>Total</b></td> + <td></td> + <td ><f:formatNumber type="number" + maxFractionDigits="2" value="${total.getAmount()}" /></td> + <td class="number"><f:formatNumber type="number" + maxFractionDigits="2" value="${total.getEstimatedDays()}" /></td> + <td class="currency"></td> + <td class="currency"><f:formatNumber type="currency" + maxFractionDigits="2" value="${total.getExpectedProfit()}" /></td> + <td class="number"><f:formatNumber type="number" + maxFractionDigits="2" value="${total.getRealDays()}" /></td> + <td class="currency"></td> + <td class="number"></td> + <td class="currency"><f:formatNumber type="currency" + maxFractionDigits="2" value="${total.getLossOrProfit()}" /></td> + <td class="currency"></td> + <td class="currency"></td> + + </tr> + </tbody> </table> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2013-08-07 13:34:26 UTC (rev 380) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2013-08-07 13:35:46 UTC (rev 381) @@ -45,7 +45,7 @@ </form> <form class="well form-inline" method="POST" id="company"> -<h4>${company.name}</h4> +<h4><a href="<c:url value="/wikitty/view/${company.wikittyId}"/>">${company.wikitty}</a></h4> <input type="hidden" name="companyId" value="${company.wikittyId}"/> <c:if test='${company.wikitty.hasExtension("CompanyHR")}'> Heures par jour : <w:input wikitty="${company.wikitty}" fqfield="CompanyHR.dailyHoursWorked"/> @@ -81,14 +81,17 @@ <i class="icon-remove icon-white"></i> Tout annuler </button> + <img class="spinner" style="display:none" src="<c:url value='/img/ajax-loader.gif'/>"/> +<form style='display:inline;' id='searchForm'>Recherche : <input type="text" id="searchInput"/></form> <table class="table table-striped table-bordered table-condensed tableEdit"> <thead> <th>Employé</th> <th>Salaire</th> + <th>Autres rémunérations</th> <th>Heures par jour</th> + <th>Temps de travail</th> <th>Taux de productivité</th> - <th>Temps partiel</th> <th>CJM <a class="allCjmRefresh" style="cursor:pointer"> <i class="icon icon-refresh"></i></a></th> <th>Edit</th> @@ -103,12 +106,16 @@ <td class="edit salary"> ${employee.salary} </td> + <td class="otherPayments"> + ${employee.otherPayments} + </td> <td class="dailyHoursWorked"><f:formatNumber type="number" maxFractionDigits="2" value="${employee.dailyHoursWorked}"/></td> + <td class="partialTime"><f:formatNumber type="number" + maxFractionDigits="2" value="${employee.partialTime}"/>%</td> <td class="productivityRate"><f:formatNumber type="number" maxFractionDigits="2" value="${employee.productivityRate}"/>%</td> - <td class="partialTime"><f:formatNumber type="number" - maxFractionDigits="2" value="${employee.partialTime}"/>%</td> + <td class="dailyReturn" <c:if test='${employee.object.wikitty.hasExtension("EmployeeHR")}'> refresh="true" Modified: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2013-08-07 13:34:26 UTC (rev 380) +++ trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2013-08-07 13:35:46 UTC (rev 381) @@ -12,10 +12,8 @@ $(".employeeEdit").click(employeeEdit); $(".cjmRefresh").click(calculateAdc); + $('.allCjmRefresh').click(calculateMultipleAdc); - $('.allCjmRefresh').click(function() { - $('.cjmRefresh').click(); - }); $('#editAllBtn').click(function() { $('.employeeEdit').click(); @@ -29,16 +27,36 @@ $('.editCancel').click(); }); + $('#searchForm').submit(function() { + $('.tableEdit tbody tr').each(function() { + + var name = $.trim($(this).find('.person').text().toLowerCase()); + //alert(name + "/" + name.indexOf($('#searchInput').val())); + if(name.indexOf($('#searchInput').val().toLowerCase()) !== -1 ) { + $(this).show(); + } + else { + $(this).hide(); + } + + }); + + return false; + }); + function employeeEdit() { var row = $(this).parent().parent(); var salary = row.find(".salary"); + var other = row.find(".otherPayments"); var prod = row.find(".productivityRate"); var time = row.find(".partialTime"); var cjm = row.find(".dailyReturn"); salary.attr("oldVal", $.trim(salary.html())); salary.html("<input type = 'text' size='3' value='"+$.trim(salary.html())+"'/>"); + other.attr("oldVal", $.trim(other.html())); + other.html("<input type = 'text' size='3' value='"+$.trim(other.html())+"'/>"); prod.attr("oldVal", $.trim(prod.html())); prod.html("<input type = 'text' size='3' value='"+$.trim(prod.html()).replace('%','')+"'/>"); time.attr("oldVal", $.trim(time.html())); @@ -60,11 +78,13 @@ var row = $(this).parent().parent(); var salary = row.find(".salary"); + var other = row.find(".otherPayments"); var prod = row.find(".productivityRate"); var time = row.find(".partialTime"); var cjm = row.find('.dailyReturn'); salary.html($.trim(salary.attr('oldVal'))); + other.html($.trim(other.attr('oldVal'))); prod.html($.trim(prod.attr('oldVal'))); time.html($.trim(time.attr('oldVal'))); @@ -86,11 +106,13 @@ var cell = $(this).parent(); var salary = row.find(".salary"); + var other = row.find(".otherPayments"); var prod = row.find(".productivityRate"); var time = row.find(".partialTime"); var cjm = row.find(".dailyReturn"); var salaryVal = $.trim(salary.find("input").attr('value')); + var otherVal = $.trim(other.find("input").attr('value')); var prodVal = $.trim(prod.find("input").attr('value')); var timeVal = $.trim(time.find("input").attr('value')); var cjmVal = $.trim(cjm.find("input").attr('value')); @@ -104,7 +126,7 @@ } $.get(createUrl("/admin/employeeEdit/json/editEmployeeValues/",row.attr("id"), "?salaryStr=", salaryVal, "&productivityRateStr=", prodVal, "&partialTimeStr=", timeVal, - "&dailyReturnStr=", cjmVal), + "&dailyReturnStr=", cjmVal, "&otherPaymentsStr=", otherVal), function(ret){ var data = ret['data']; @@ -127,6 +149,7 @@ else { salary.html(data['salary']); + other.html(data['otherPayments']); prod.html(data["productivityRate"]+"%"); time.html(data['partialTime']+"%"); displayDailyReturn(row, data['dailyReturn'], true); @@ -162,12 +185,39 @@ $.get(createUrl("/admin/employeeEdit/json/requestAdc/",row.attr("id")), function(ret){ var adc = ret['adc']; - displayDailyReturn(row, adc); + displayDailyReturn(row, adc, true); displayEdit(row); }); } + function calculateMultipleAdc() { + + var cjmCells = $('.cjmRefresh').parent(); + var rows = cjmCells.parent(); + blockDailyReturn(rows); + blockEdit(rows); + var str = ""; + for(var i = 0; i < rows.length; i++) { + str = str + $(rows[i]).attr('id'); + if(i != (rows.length -1)) { + str= str + ','; + } + + } + console.log(str); + $.get(createUrl("/admin/employeeEdit/json/requestMultipleAdc/",str), + function(ret){ + var adcs = ret['adcs']; + for(var i in adcs) { + var row = $('#'+i); + displayDailyReturn(row, adcs[i], true); + displayEdit(row); + } + }); + + } + function blockEdit(row) { row.find('.cellEdit').html('<img src="../img/ajax-loader.gif"/>'); }

1 0

r380 - in trunk/chorem-entities/src/main/java/org/chorem: . project
by meynier＠users.chorem.org Aug. 7, 2013

Aug. 7, 2013

Author: meynier Date: 2013-08-07 15:34:26 +0200 (Wed, 07 Aug 2013) New Revision: 380 Url: http://chorem.org/projects/chorem/repository/revisions/380 Log: Added the total calculation and various other small modifications Added: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2013-08-01 14:16:31 UTC (rev 379) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2013-08-07 13:34:26 UTC (rev 380) @@ -32,6 +32,7 @@ import org.chorem.entities.ConfigurationImpl; import org.chorem.entities.ContactDetails; import org.chorem.entities.Employee; +import org.chorem.entities.EmployeeHR; import org.chorem.entities.Invoice; import org.chorem.entities.InvoiceMigration; import org.chorem.entities.Quotation; @@ -400,12 +401,13 @@ if(e.getCompany(false) != null) companyW = restore(e.getCompany(false).getWikittyId()); - if(w.hasExtension("EmployeeHR") && w.getFieldAsDouble("EmployeeHR", "dailyReturn") != 0) { - return w.getFieldAsDouble("EmployeeHR", "dailyReturn"); + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && + w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { + return w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); } - else if(companyW != null && companyW.hasExtension("CompanyHR") - && companyW.getFieldAsDouble("CompanyHR", "dailyReturn") != 0) { - return companyW.getFieldAsDouble("CompanyHR", "dailyReturn"); + else if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) + && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN) != 0) { + return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, EmployeeHR.FIELD_EMPLOYEEHR_DAILYRETURN); } else { return this.getConfiguration().getDailyReturn(); @@ -423,13 +425,14 @@ if(e.getCompany(false) != null) companyW = restore(e.getCompany(false).getWikittyId()); - if(companyW.hasExtension("CompanyHR") && companyW.getFieldAsDouble("CompanyHR", "dailyHoursWorked") != 0) { - if(w.hasExtension("EmployeeHR") && w.getFieldAsDouble("EmployeeHR", "partialTime") != 0) { - return companyW.getFieldAsDouble("CompanyHR", "dailyHoursWorked") * - (w.getFieldAsDouble("EmployeeHR", "partialTime")/100); + if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && + companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { + if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { + return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * + (w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME)/100); } else { - return companyW.getFieldAsDouble("CompanyHR", "dailyHoursWorked"); + return companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED); } } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2013-08-01 14:16:31 UTC (rev 379) +++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2013-08-07 13:34:26 UTC (rev 380) @@ -3,12 +3,14 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import java.util.HashMap; import java.util.List; import org.chorem.ChoremClient; import org.chorem.ChoremUtil; import org.chorem.entities.Employee; import org.chorem.entities.EmployeeHR; +import org.chorem.entities.FinancialTransaction; import org.chorem.entities.Interval; import org.chorem.entities.Quotation; import org.chorem.entities.Time; @@ -17,57 +19,57 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; +import com.arjuna.ats.jta.transaction.Transaction; + public class AdcCalculation { - ChoremClient client; - EmployeeHR e; - Company company; - Date start; - Date end; /** * Calculates the total gains made by the company in one year * @return */ - public double getTotalGain() { + public static double getTotalExpenses(ChoremClient client, Company company, Date start, Date end) { - WikittyQuery gainQuery = new WikittyQueryMaker() + WikittyQuery expenseQuery = new WikittyQueryMaker() .and() - .exteq("Closed") - .containsOne(Quotation.ELEMENT_FIELD_QUOTATION_SUPPLIER, getEmployeesHR()) + .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) .or() - .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, start, end) - .bw(Interval.FQ_FIELD_INTERVAL_ENDDATE, start, end) + .containsOne(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYER, getEmployeesHR(client, company)) + .eq(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYER, company) + .close() + .bw(FinancialTransaction.ELEMENT_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) .end(); - WikittyQueryResult<Quotation> result = client.findAllByQuery(Quotation.class, gainQuery); + WikittyQueryResult<FinancialTransaction> result = client.findAllByQuery(FinancialTransaction.class, expenseQuery); double total = 0; - for(Quotation q : result.getAll()) { - total += q.getAmount(); + for(FinancialTransaction ft : result.getAll()) { + total += ft.getAmount(); } return total; } + + /** * calculates all the salaries of the employees ponderated by the productivity rate * @return */ - public double getTotalSalaries() { + public static double getTotalSalaries(ChoremClient client, Company company) { //pondéré par pct de productivité double total = 0; - for(EmployeeHR e : getEmployeesHR()) { + for(EmployeeHR e : getEmployeesHR(client, company)) { total += e.getSalary() * (e.getProductivityRate()/100); } return total; } - private List<EmployeeHR> getEmployeesHR() { + private static List<EmployeeHR> getEmployeesHR(ChoremClient client, Company company) { WikittyQuery employeeQuery = new WikittyQueryMaker().and() - .exteq("EmployeeHR") + .exteq(EmployeeHR.EXT_EMPLOYEEHR) .eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company) .end(); WikittyQueryResult<EmployeeHR> result = client.findAllByQuery(EmployeeHR.class, employeeQuery); @@ -76,17 +78,17 @@ } /** - * Calculates the sum of all the tims object linked to the company + * Calculates the sum of all the times object linked to the company * @return */ - public double getTotalTimes() { + public static double getTotalTimes(ChoremClient client, Company company, Date start, Date end) { WikittyQuery empQuery = new WikittyQueryMaker() .eq(Employee.ELEMENT_FIELD_EMPLOYEE_COMPANY, company).end(); WikittyQueryResult<Employee> empResult = client.findAllByQuery(Employee.class, empQuery); WikittyQuery timeQuery = new WikittyQueryMaker() .and() - .exteq("Time") + .exteq(Time.EXT_TIME) .containsOne(Time.ELEMENT_FIELD_TIME_EMPLOYEE, empResult.getAll()) .or() .bw(Interval.FQ_FIELD_INTERVAL_BEGINDATE, start, end) @@ -102,38 +104,76 @@ return total; } - public double getAdc() { + /** + * Returns the employee's adc + * @return + */ + public static double getAdc(ChoremClient client, EmployeeHR e) { + Company company = e.getCompany(false); + Date end = new GregorianCalendar().getTime(); + Calendar cstart = new GregorianCalendar(); + cstart.add(Calendar.YEAR, -1); + Date start = cstart.getTime(); - double expenses = getTotalGain(); - double salaries = getTotalSalaries(); - double times = getTotalTimes(); + double expenses = getTotalExpenses(client, company, start, end); + double salaries = getTotalSalaries(client, company); + double times = getTotalTimes(client, company, start, end); double dailyHoursWorked = client.getDailyHoursWorked(e); - double dailySalary = client.restore(e.getWikittyId()).getFieldAsDouble("EmployeeHR", "salary")/21.5; - System.out.println("GAIN : " + expenses); - System.out.println("SALAIRES : " + salaries); + double dailySalary = client.restore(e.getWikittyId()) + .getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR,EmployeeHR.FIELD_EMPLOYEEHR_SALARY)/21.5; + + System.out.println("EXPENSES : " + expenses); + System.out.println("SALARIES : " + salaries); System.out.println("TIMES : " + times); - System.out.println("DAILY HW : " + dailyHoursWorked); - System.out.println("DAILY SALARY : " + dailySalary); + System.out.println("DHW : " + dailyHoursWorked); + System.out.println("SALARY : " + dailySalary); + + double adc = ( (expenses/salaries)/times ) * dailyHoursWorked * dailySalary; + //dailySalary = dailySalary *1.6; //charges patronales + //double adc = dailySalary; - return adc; } - - public AdcCalculation(EmployeeHR e, ChoremClient client) { - this.e = e; - this.company = e.getCompany(false); - this.client = client; - this.end = new GregorianCalendar().getTime(); - Calendar start = new GregorianCalendar(); - start.add(Calendar.YEAR, -1); - this.start = start.getTime(); + public static HashMap<String, Double> getMultipleAdc(ChoremClient client, List<EmployeeHR> employees) { + if(employees.size() == 0) + return null; + Company company = employees.get(0).getCompany(false); + Date end = new GregorianCalendar().getTime(); + Calendar cstart = new GregorianCalendar(); + cstart.add(Calendar.YEAR, -1); + Date start = cstart.getTime(); + + double expenses = getTotalExpenses(client, company, start, end); + double salaries = getTotalSalaries(client, company); + double times = getTotalTimes(client, company, start, end); + + HashMap<String, Double> adcs = new HashMap<String, Double>(); + for(EmployeeHR e : employees) { + double dailyHoursWorked = client.getDailyHoursWorked(e); + double dailySalary = client.restore(e.getWikittyId()) + .getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_SALARY)/21.5; + System.out.println("EXPENSES : " + expenses); + System.out.println("SALAIRES : " + salaries); + System.out.println("TIMES : " + times); + System.out.println("DAILY HW : " + dailyHoursWorked); + System.out.println("DAILY SALARY : " + dailySalary); + adcs.put(e.getWikittyId(),( (expenses/salaries)/times ) * dailyHoursWorked * dailySalary); + } + //dailySalary = dailySalary *1.6; //charges patronales + //double adc = dailySalary; + + return adcs; + } + + + } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2013-08-01 14:16:31 UTC (rev 379) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2013-08-07 13:34:26 UTC (rev 380) @@ -7,7 +7,6 @@ import org.chorem.entities.Employee; import org.chorem.entities.Quotation; import org.chorem.entities.Task; -import java.util.Set; public class QuotationCalculation extends Calculation<Quotation> { Added: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java (rev 0) +++ trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2013-08-07 13:34:26 UTC (rev 380) @@ -0,0 +1,122 @@ +package org.chorem.project; + +import java.util.HashMap; +import java.util.List; + +import org.chorem.ChoremClient; +import org.chorem.entities.Employee; +import org.chorem.entities.Quotation; +import org.chorem.entities.Task; + +public class TotalQuotationCalculation extends Calculation<Quotation> { + + + private List<QuotationCalculation> calculations; + + public TotalQuotationCalculation(List<QuotationCalculation> calculations) { + super(null, totalAmount(calculations), totalEstimatedDays(calculations), null); + //super(q, q.getAmount(), q.getEstimatedDays(), client); + this.calculations = calculations; + } + + private static double totalAmount(List<QuotationCalculation> calculations) { + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getObject().getAmount(); + + } + return total; + } + + private static double totalEstimatedDays(List<QuotationCalculation> calculations) { + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getObject().getEstimatedDays(); + + } + return total; + } + + public double getAmount() { + return amount; + } + + public double getEstimatedDays() { + return nbDays; + } + + + @Override + public double realDays() { + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getRealDays(); + + } + return total; + + } + + @Override + public double avgReturn() { + + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getAvgReturn(); + + } + return total; + } + + @Override + public double realReturn() { + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getRealReturn(); + + } + return total; + } + + @Override + public double expectedProfit() { + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getExpectedProfit(); + + } + return total; + } + + @Override + public double lossOrProfit() { + double total = 0; + for(QuotationCalculation q : calculations) { + total += q.getLossOrProfit(); + + } + return total; + } + + + + + + + @Override + public HashMap<Employee, Double> getPercentages() { + return null; + } + + @Override + public HashMap<Employee, Double> getTimePercentages() { + return null; + } + + + @Override + public HashMap<Employee, Double> getTimes() { + return null; + } + +}

1 0

r379 - trunk/chorem-entities/src/main/xmi
by meynier＠users.chorem.org Aug. 1, 2013

Aug. 1, 2013

Author: meynier Date: 2013-08-01 16:16:31 +0200 (Thu, 01 Aug 2013) New Revision: 379 Url: http://chorem.org/projects/chorem/repository/revisions/379 Log: Added otherPayments in extension EmployeeHR 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-07-29 14:51:52 UTC (rev 378) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-08-01 14:16:31 UTC (rev 379) @@ -104,7 +104,7 @@ # # EmployeeHR # -org.chorem.entities.EmployeeHR.class.tagvalue.version=3.0 +org.chorem.entities.EmployeeHR.class.tagvalue.version=4.0 org.chorem.entities.EmployeeHR.class.tagvalue.toString=%Employee.person$s (%Employee.company$s) HR org.chorem.entities.EmployeeHR.attribute.type.tagvalue.help=Le type de contrat de travail (CDI, CDD, Stage, ...) org.chorem.entities.EmployeeHR.attribute.type.tagvalue.choiceQuery=SELECT EmployeeHR.type WHERE extension=EmployeeHR @@ -117,6 +117,7 @@ org.chorem.entities.EmployeeHR.attribute.productivityRate.tagvalue.help=Taux de productivité org.chorem.entities.EmployeeHR.attribute.partialTime.tagvalue.help=Taux de travail (temps complet:100, mi-temps:50) org.chorem.entities.EmployeeHR.attribute.partialTime.tagvalue.default=100 +org.chorem.entities.EmployeeHR.attribute.otherPayments.tagvalue.help=Remuneration autre que salaire (prime, etc.) # # Evaluation (a mettre ici) # Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ)

1 0

r378 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions webapp/WEB-INF/jsp webapp/css webapp/img webapp/js
by meynier＠users.chorem.org July 29, 2013

July 29, 2013

Author: meynier Date: 2013-07-29 16:51:52 +0200 (Mon, 29 Jul 2013) New Revision: 378 Url: http://chorem.org/projects/chorem/repository/revisions/378 Log: Added buttons in employee edit page to edit/validate/cancel all rows $and various other small improvments$ Added: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-07-26 14:28:28 UTC (rev 377) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-07-29 14:51:52 UTC (rev 378) @@ -128,9 +128,14 @@ } public Render requestAdc(ChoremClient client, String employeeId) { - EmployeeHR e = new EmployeeHRImpl(client.restore(employeeId)); + Wikitty w = client.restore(employeeId); + EmployeeHR e = new EmployeeHRImpl(w); AdcCalculation adcCalc = new AdcCalculation(e, client); double adc = adcCalc.getAdc(); + + w.setField("EmployeeHR", "dailyReturn", adc); + client.store(w); + int iadc = (int)(adc*100); return renderJSON("adc", (double)(iadc/100.0)); @@ -262,6 +267,10 @@ int x = (int)(client.getDailyHoursWorked(e)*100); double y = x/100.0; this.dailyHoursWorked = y; + + x = (int)(this.dailyReturn*100); + y = x/100.0; + this.dailyReturn = y; this.e = e; } Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-07-26 14:28:28 UTC (rev 377) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2013-07-29 14:51:52 UTC (rev 378) @@ -112,7 +112,7 @@ <table class="table table-striped table-bordered table-condensed"> <thead> <tr> - <th>Responsable Code Lutin</th> + <th>Responsable ${q.object.getSupplier(false).getCompany(false)}</th> <th>Responsable entreprise</th> <th>Jours estimés</th> <th>Jours réels</th> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2013-07-26 14:28:28 UTC (rev 377) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2013-07-29 14:51:52 UTC (rev 378) @@ -28,8 +28,8 @@ <f:setLocale value="${locale}" /> +<link rel="stylesheet" href="<c:url value='/css/employeeEdit.css'/>" /> - <h1>${title}</h1> <form method="GET" id="companyForm"> @@ -67,16 +67,30 @@ </c:if> </form> - - -<table class="table table-striped table-bordered table-condensed"> +<button class="btn btn-success" id="editAllBtn"> + <i class="icon-edit icon-white"></i> + Tout éditer + </button> + + <button class="editBtn btn btn-success" id="validateAllBtn" disabled> + <i class="icon-ok icon-white"></i> + Tout valider + </button> + + <button class="editBtn btn btn-danger" id="cancelAllBtn" disabled> + <i class="icon-remove icon-white"></i> + Tout annuler + </button> +<img class="spinner" style="display:none" src="<c:url value='/img/ajax-loader.gif'/>"/> +<table class="table table-striped table-bordered table-condensed tableEdit"> <thead> <th>Employé</th> <th>Salaire</th> <th>Heures par jour</th> <th>Taux de productivité</th> <th>Temps partiel</th> - <th>CJM</th> + <th>CJM <a class="allCjmRefresh" style="cursor:pointer"> + <i class="icon icon-refresh"></i></a></th> <th>Edit</th> </thead> <tbody> @@ -86,7 +100,7 @@ <td class="person"><w:display wikitty="${employee.object.wikitty}" fqfield="Employee.person" label="" /> </td> - <td class="salary"> + <td class="edit salary"> ${employee.salary} </td> <td class="dailyHoursWorked"><f:formatNumber type="number" Added: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2013-07-29 14:51:52 UTC (rev 378) @@ -0,0 +1,4 @@ +.tableEdit tbody tr td input { + width:80%; +} + Added: trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif =================================================================== (Binary files differ) Property changes on: trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Modified: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2013-07-26 14:28:28 UTC (rev 377) +++ trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2013-07-29 14:51:52 UTC (rev 378) @@ -3,6 +3,8 @@ $(document).ready(function() { + var editCounter = 0; + var blockCounter = 0; $("#companySelect").change(function() { $("#companyForm").submit(); @@ -11,7 +13,23 @@ $(".employeeEdit").click(employeeEdit); $(".cjmRefresh").click(calculateAdc); + $('.allCjmRefresh').click(function() { + $('.cjmRefresh').click(); + }); + $('#editAllBtn').click(function() { + $('.employeeEdit').click(); + }); + + $('#validateAllBtn').click(function() { + $('.editOk').click(); + }); + + $('#cancelAllBtn').click(function() { + $('.editCancel').click(); + }); + + function employeeEdit() { var row = $(this).parent().parent(); var salary = row.find(".salary"); @@ -29,6 +47,11 @@ cjm.html("<input type = 'text' size='3' value='"+$.trim(cjm.find('.adc').html()).replace('%','')+"'/>"); displayConfirmation(row); + editCounter++; + if(editCounter === 1) + $('.editBtn').removeAttr('disabled'); + + } @@ -51,6 +74,10 @@ if(cjm.attr("refresh") === "true") refresh = true; displayDailyReturn(row, $.trim(cjm.attr('oldVal')), refresh); + editCounter--; + if(editCounter === 0) + $('.editBtn').attr('disabled', 'disabled'); + } @@ -69,6 +96,12 @@ var cjmVal = $.trim(cjm.find("input").attr('value')); blockEdit(row); + blockCounter++; + if(blockCounter === 1) { + $('.editBtn').attr('disabled', 'disabled'); + $('#editAllBtn').attr('disabled', 'disabled'); + $('.spinner').show(); + } $.get(createUrl("/admin/employeeEdit/json/editEmployeeValues/",row.attr("id"), "?salaryStr=", salaryVal, "&productivityRateStr=", prodVal, "&partialTimeStr=", timeVal, "&dailyReturnStr=", cjmVal), @@ -85,6 +118,11 @@ "<span class='errorMessage'>"+errors[i]["errorMessage"]+"</span>"); } displayConfirmation(row); + blockCounter--; + if(blockCounter === 0) { + $('.editBtn').removeAttr('disabled'); + $('.spinner').hide(); + } } else { @@ -96,7 +134,17 @@ displayEdit(row); if(cell.attr("refresh") !== "true") cell.attr('refresh', 'true'); - + editCounter--; + blockCounter--; + //Only case where the butotn should be reactivated + if(editCounter !== 0 && blockCounter === 0) + $('.editBtn').removeAttr('disabled'); + else + $('.editBtn').attr('disabled', 'disabled'); + if(blockCounter === 0) { + $('.spinner').hide(); + $('#editAllBtn').removeAttr('disabled'); + } } @@ -121,11 +169,11 @@ } function blockEdit(row) { - row.find('.cellEdit').html('wait...'); + row.find('.cellEdit').html('<img src="../img/ajax-loader.gif"/>'); } function blockDailyReturn(row) { - row.find('.dailyReturn').html('wait...'); + row.find('.dailyReturn').html('<img src="../img/ajax-loader.gif"/>'); } function displayConfirmation(row) { @@ -146,9 +194,9 @@ function displayDailyReturn(row, val, icon) { var cell = row.find('.dailyReturn'); - var str = '<span class="adc">' + val + ' </span><a class="cjmRefresh" style="cursor:pointer">' + var str = '<span class="adc">' + val + ' </span>' if(icon) - str += '<i class="icon icon-refresh"></i></a>' + str += '<a class="cjmRefresh" style="cursor:pointer"><i class="icon icon-refresh"></i></a>' cell.html(str); row.find(".cjmRefresh").click(calculateAdc); }

1 0