From df91f31f60cab375a57a8596a0087f23b282f791 Mon Sep 17 00:00:00 2001
From: Javier Moran Rua <jmoran@igalia.com>
Date: Thu, 17 Dec 2009 18:21:52 +0100
Subject: [PATCH]  ItEr39S13RFIntegracionSistemaXeracionInformesItEr38S19: Set
 up infrastructure for supporting reports (JasperReports) and add report for
 worked hours per worker.

---
 .../reports/dtos/HoursWorkedPerWorkerDTO.java | 143 ++++++++++
 .../business/resources/daos/IWorkerDAO.java   |   8 +
 .../business/resources/daos/WorkerDAO.java    |  48 ++++
 navalplanner-webapp/pom.xml                   |  35 +++
 .../src/main/jasper/worker_report.jrxml       | 269 ++++++++++++++++++
 .../web/common/CustomMenuController.java      |   4 +-
 .../web/reports/ComboboxOutputFormat.java     |  48 ++++
 .../HoursWorkedPerWorkerController.java       | 109 +++++++
 .../reports/HoursWorkedPerWorkerModel.java    |  67 +++++
 .../reports/HoursWorkedPerWorkerReport.java   |  33 +++
 .../reports/IHoursWorkedPerWorkerModel.java   |  21 ++
 .../web/reports/INavalplannerReport.java      |  28 ++
 .../web/reports/NavalplannerReport.java       |  54 ++++
 .../main/resources/logos/navalpro_logo.gif    | Bin 0 -> 6888 bytes
 .../webapp/reports/combobox_output_format.zul |  32 +++
 .../src/main/webapp/reports/worker_report.zul | 112 ++++++++
 pom.xml                                       |   6 +
 17 files changed, 1016 insertions(+), 1 deletion(-)
 create mode 100644 navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerDTO.java
 create mode 100644 navalplanner-webapp/src/main/jasper/worker_report.jrxml
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/ComboboxOutputFormat.java
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerReport.java
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IHoursWorkedPerWorkerModel.java
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/INavalplannerReport.java
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReport.java
 create mode 100644 navalplanner-webapp/src/main/resources/logos/navalpro_logo.gif
 create mode 100644 navalplanner-webapp/src/main/webapp/reports/combobox_output_format.zul
 create mode 100644 navalplanner-webapp/src/main/webapp/reports/worker_report.zul

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerDTO.java
new file mode 100644
index 000000000..7b0fb9445
--- /dev/null
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/HoursWorkedPerWorkerDTO.java
@@ -0,0 +1,143 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.business.reports.dtos;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.navalplanner.business.labels.entities.Label;
+import org.navalplanner.business.resources.entities.Worker;
+import org.navalplanner.business.workreports.entities.WorkReportLine;
+import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
+
+public class HoursWorkedPerWorkerDTO {
+
+    private String workerName;
+
+    private Date date;
+
+    private Date clockStart;
+
+    private Date clockFinish;
+
+    private Integer numHours;
+
+    private String orderElementCode;
+
+    private String descriptionValues;
+
+    private String labels;
+
+    public HoursWorkedPerWorkerDTO(
+            Worker worker,
+            WorkReportLine workReportLine) {
+
+        this.workerName = worker.getName();
+        this.date = workReportLine.getDate();
+        this.clockStart = workReportLine.getClockStart();
+        this.clockFinish = workReportLine.getClockFinish();
+        this.numHours = workReportLine.getNumHours();
+        this.orderElementCode = workReportLine.getOrderElement().getCode();
+        this.descriptionValues = descriptionValuesAsString(workReportLine.getDescriptionValues());
+        this.labels = labelsAsString(workReportLine.getLabels());
+    }
+
+    private String labelsAsString(Set<Label> labels) {
+        String result = "";
+        for (Label label: labels) {
+            result = label.getType().getName() + ": " + label.getName() + ", ";
+        }
+        return (result.length() > 0) ? result.substring(0, result.length() - 2) : result;
+    }
+
+    private String descriptionValuesAsString(Set<DescriptionValue> descriptionValues) {
+        String result = "";
+        for (DescriptionValue descriptionValue: descriptionValues) {
+            result = descriptionValue.getFieldName() + ": " + descriptionValue.getValue() + ", ";
+        }
+        return (result.length() > 0) ? result.substring(0, result.length() - 2) : result;
+    }
+
+    public Integer getNumHours() {
+        return numHours;
+    }
+
+    public void setNumHours(Integer numHours) {
+        this.numHours = numHours;
+    }
+
+    public Date getClockStart() {
+        return clockStart;
+    }
+
+    public void setClockStart(Date clockStart) {
+        this.clockStart = clockStart;
+    }
+
+    public Date getClockFinish() {
+        return clockFinish;
+    }
+
+    public void setClockFinish(Date clockFinish) {
+        this.clockFinish = clockFinish;
+    }
+
+    public String getWorkerName() {
+        return workerName;
+    }
+
+    public void setWorkerName(String workerName) {
+        this.workerName = workerName;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getOrderElementCode() {
+        return orderElementCode;
+    }
+
+    public void setOrderElementCode(String orderElementCode) {
+        this.orderElementCode = orderElementCode;
+    }
+
+    public String getDescriptionValues() {
+        return descriptionValues;
+    }
+
+    public void setDescriptionValues(String descriptionValues) {
+        this.descriptionValues = descriptionValues;
+    }
+
+    public String getLabels() {
+        return labels;
+    }
+
+    public void setLabels(String labels) {
+        this.labels = labels;
+    }
+
+}
\ No newline at end of file
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
index c39dd6e40..6f8abc1c9 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
@@ -20,10 +20,12 @@
 
 package org.navalplanner.business.resources.daos;
 
+import java.util.Date;
 import java.util.List;
 
 import org.navalplanner.business.common.daos.IGenericDAO;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
+import org.navalplanner.business.reports.dtos.HoursWorkedPerWorkerDTO;
 import org.navalplanner.business.resources.entities.Worker;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -66,4 +68,10 @@ public interface IWorkerDAO extends IGenericDAO<Worker, Long> {
      */
     @Transactional(readOnly = true)
     List<Worker> getWorkers();
+
+    /**
+     *
+     */
+    List<HoursWorkedPerWorkerDTO> getWorkingHoursPerWorker(List<Worker> workers, Date startingDate, Date endingDate);
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
index b6a567b10..fd383c79a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
@@ -20,16 +20,20 @@
 
 package org.navalplanner.business.resources.daos;
 
+import java.util.Date;
 import java.util.List;
 
 import org.hibernate.Criteria;
+import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
+import org.navalplanner.business.reports.dtos.HoursWorkedPerWorkerDTO;
 import org.navalplanner.business.resources.entities.Worker;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Hibernate DAO for the <code>Worker</code> entity.
@@ -74,4 +78,48 @@ public class WorkerDAO extends GenericDAOHibernate<Worker, Long>
                                 "nif", containsName))).list();
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<HoursWorkedPerWorkerDTO> getWorkingHoursPerWorker(List<Worker> workers, Date startingDate, Date endingDate) {
+        String strQuery =
+            "SELECT new org.navalplanner.business.reports.dtos.HoursWorkedPerWorkerDTO(worker, wrl) " +
+            "FROM Worker worker, WorkReportLine wrl " +
+            "LEFT OUTER JOIN wrl.resource resource " +
+                "WHERE resource.id = worker.id ";
+
+        // Set date range
+        if (startingDate != null && endingDate != null) {
+            strQuery += "AND wrl.date BETWEEN :startingDate AND :endingDate ";
+        }
+        if (startingDate != null && endingDate == null) {
+            strQuery += "AND wrl.date >= :startingDate ";
+        }
+        if (startingDate == null && endingDate != null) {
+            strQuery += "AND wrl.date <= :endingDate ";
+        }
+
+        // Set workers
+        if (workers != null && !workers.isEmpty()) {
+            strQuery += "AND worker IN (:workers) ";
+        }
+
+        // Order by
+        strQuery += "ORDER BY worker.id, wrl.date";
+
+        // Set parameters
+        Query query = getSession().createQuery(strQuery);
+        if (startingDate != null) {
+            query.setParameter("startingDate", startingDate);
+        }
+        if (endingDate != null) {
+            query.setParameter("endingDate", endingDate);
+        }
+        if (workers != null && !workers.isEmpty()) {
+            query.setParameterList("workers", workers);
+        }
+
+        // Get result
+        return query.list();
+    }
+
 }
diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index 8a3f26973..89aa5f0df 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -37,9 +37,44 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- =========================================================== -->
+            <!-- Jasper reports configuration -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jasperreports-maven-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <configuration>
+                    <sourceDirectory>${project.build.sourceDirectory}/../jasper</sourceDirectory>
+                    <outputDirectory>${project.build.sourceDirectory}/../../../target/classes</outputDirectory>
+                    <xmlValidation>true</xmlValidation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile-reports</goal>
+                        </goals>
+                        <phase>compile</phase>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <!--note this must be repeated here to pick up correct xml validation -->
+                    <dependency>
+                      <groupId>jasperreports</groupId>
+                      <artifactId>jasperreports</artifactId>
+                      <version>3.7.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
+
     </build>
     <dependencies>
+        <!-- Jasper Reports -->
+        <dependency>
+          <groupId>jasperreports</groupId>
+          <artifactId>jasperreports</artifactId>
+        </dependency>
         <!-- Gettext commons -->
         <dependency>
             <groupId>org.xnap.commons</groupId>
diff --git a/navalplanner-webapp/src/main/jasper/worker_report.jrxml b/navalplanner-webapp/src/main/jasper/worker_report.jrxml
new file mode 100644
index 000000000..7abdbd359
--- /dev/null
+++ b/navalplanner-webapp/src/main/jasper/worker_report.jrxml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+	<style name="Title" isDefault="false" fontName="Arial" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
+	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="18"/>
+	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
+	<style name="Detail" isDefault="false" fontName="Arial" fontSize="12"/>
+	<parameter name="startingDate" class="java.util.Date"/>
+	<parameter name="endingDate" class="java.util.Date"/>
+	<field name="workerName" class="java.lang.String"/>
+	<field name="date" class="java.util.Date"/>
+	<field name="clockStart" class="java.util.Date"/>
+	<field name="clockFinish" class="java.util.Date"/>
+	<field name="numHours" class="java.lang.Integer"/>
+	<field name="orderElementCode" class="java.lang.String"/>
+	<field name="descriptionValues" class="java.lang.String"/>
+	<field name="labels" class="java.lang.String"/>
+	<variable name="sumHoursPerDay" class="java.lang.Integer" resetType="Group" resetGroup="Data" incrementType="Group" incrementGroup="Data" calculation="Sum">
+		<variableExpression><![CDATA[$F{numHours}]]></variableExpression>
+		<initialValueExpression><![CDATA[new Integer(0)]]></initialValueExpression>
+	</variable>
+	<variable name="sumHoursPerWorker" class="java.lang.Integer" resetType="Group" resetGroup="Worker" incrementType="Group" incrementGroup="Worker" calculation="Sum">
+		<variableExpression><![CDATA[$V{sumHoursPerDay}]]></variableExpression>
+		<initialValueExpression><![CDATA[new Integer(0)]]></initialValueExpression>
+	</variable>
+	<group name="Group2">
+		<groupExpression><![CDATA[(int)($V{REPORT_COUNT}/5)]]></groupExpression>
+	</group>
+	<group name="Worker">
+		<groupExpression><![CDATA[$F{workerName}]]></groupExpression>
+		<groupHeader>
+			<band height="22">
+				<textField isBlankWhenNull="true">
+					<reportElement x="0" y="0" width="143" height="20"/>
+					<textElement>
+						<font size="12"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$F{workerName}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="2" y="20" width="553" height="2"/>
+				</line>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="27">
+				<textField>
+					<reportElement x="153" y="1" width="30" height="20"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerWorker}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement x="0" y="21" width="553" height="1"/>
+				</line>
+				<staticText>
+					<reportElement x="27" y="1" width="124" height="20"/>
+					<textElement verticalAlignment="Middle">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Total hours per worker:]]></text>
+				</staticText>
+			</band>
+		</groupFooter>
+	</group>
+	<group name="Data">
+		<groupExpression><![CDATA[$F{date}]]></groupExpression>
+		<groupHeader>
+			<band height="42">
+				<rectangle>
+					<reportElement mode="Opaque" x="19" y="21" width="536" height="20" forecolor="#000000" backcolor="#E0E4FB"/>
+				</rectangle>
+				<textField pattern="dd/MM/yy" isBlankWhenNull="true">
+					<reportElement x="16" y="0" width="86" height="20"/>
+					<textElement>
+						<font size="11"/>
+					</textElement>
+					<textFieldExpression class="java.util.Date"><![CDATA[$F{date}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement style="Column header" x="87" y="26" width="66" height="15"/>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Hora fin]]></text>
+				</staticText>
+				<staticText>
+					<reportElement style="Column header" x="191" y="26" width="85" height="15"/>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Código pedido]]></text>
+				</staticText>
+				<staticText>
+					<reportElement style="Column header" x="276" y="26" width="135" height="15"/>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Campos de texto]]></text>
+				</staticText>
+				<staticText>
+					<reportElement style="Column header" x="411" y="26" width="56" height="15"/>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Etiquetas]]></text>
+				</staticText>
+				<staticText>
+					<reportElement style="Column header" x="22" y="26" width="62" height="15"/>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Hora inicio]]></text>
+				</staticText>
+				<staticText>
+					<reportElement style="Column header" x="153" y="26" width="30" height="15"/>
+					<textElement verticalAlignment="Top">
+						<font size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Horas]]></text>
+				</staticText>
+			</band>
+		</groupHeader>
+		<groupFooter>
+			<band height="26">
+				<textField>
+					<reportElement x="153" y="4" width="30" height="20"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.Integer"><![CDATA[$V{sumHoursPerDay}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="45" y="4" width="106" height="20"/>
+					<textElement verticalAlignment="Middle">
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Total hours per day:]]></text>
+				</staticText>
+				<line>
+					<reportElement x="153" y="3" width="30" height="1"/>
+				</line>
+			</band>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="120" splitType="Stretch">
+			<staticText>
+				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
+				<textElement verticalAlignment="Middle"/>
+				<text><![CDATA[Worker report]]></text>
+			</staticText>
+			<staticText>
+				<reportElement style="SubTitle" x="34" y="46" width="240" height="22"/>
+				<textElement/>
+				<text><![CDATA[Worked hours per worker]]></text>
+			</staticText>
+			<image scaleImage="RealHeight">
+				<reportElement x="316" y="3" width="237" height="65"/>
+				<imageExpression class="java.lang.String"><![CDATA["logos/navalpro_logo.gif"]]></imageExpression>
+			</image>
+			<staticText>
+				<reportElement x="0" y="76" width="78" height="20">
+					<printWhenExpression><![CDATA[new java.lang.Boolean($P{startingDate} != null)]]></printWhenExpression>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Data comezo:]]></text>
+			</staticText>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="78" y="76" width="92" height="20"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression class="java.util.Date"><![CDATA[$P{startingDate}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="248" y="76" width="100" height="20"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression class="java.util.Date"><![CDATA[$P{endingDate}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="170" y="76" width="78" height="20">
+					<printWhenExpression><![CDATA[new java.lang.Boolean($P{endingDate} != null)]]></printWhenExpression>
+				</reportElement>
+				<textElement verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Data fin:]]></text>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="22" splitType="Stretch">
+			<textField pattern="h.mm a" isBlankWhenNull="true">
+				<reportElement x="19" y="0" width="66" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.util.Date"><![CDATA[$F{clockStart}]]></textFieldExpression>
+			</textField>
+			<textField pattern="h.mm a" isBlankWhenNull="true">
+				<reportElement x="84" y="0" width="69" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.util.Date"><![CDATA[$F{clockFinish}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="192" y="0" width="85" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{orderElementCode}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="277" y="0" width="135" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{descriptionValues}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="412" y="0" width="143" height="20"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{labels}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="153" y="0" width="30" height="20"/>
+				<textElement textAlignment="Center"/>
+				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{numHours}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="16" splitType="Stretch">
+			<line>
+				<reportElement positionType="FixRelativeToBottom" x="0" y="3" width="555" height="1"/>
+				<graphicElement>
+					<pen lineWidth="0.5" lineColor="#999999"/>
+				</graphicElement>
+			</line>
+		</band>
+	</columnFooter>
+	<pageFooter>
+		<band height="20" splitType="Stretch">
+			<textField>
+				<reportElement style="Column header" x="433" y="0" width="80" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement style="Column header" x="513" y="0" width="40" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="EEEEE dd MMMMM yyyy">
+				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
+</jasperReport>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 98e60f098..630c85104 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -241,7 +241,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
                             "02-criterios.html#id1"));
         }
 
-        topItem(_("Quality management"), "/", "", true);
+        topItem(_("Reports"), "", "",
+                subItem(_("Worker report"),
+                        "/reports/worker_report.zul", ""));
     }
 
     private Vbox getRegisteredItemsInsertionPoint() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/ComboboxOutputFormat.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/ComboboxOutputFormat.java
new file mode 100644
index 000000000..d3b429332
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/ComboboxOutputFormat.java
@@ -0,0 +1,48 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.web.reports;
+
+import org.zkoss.zk.ui.HtmlMacroComponent;
+import org.zkoss.zul.Combobox;
+import org.zkoss.zul.Comboitem;
+
+public class ComboboxOutputFormat extends HtmlMacroComponent {
+
+    private static final long serialVersionUID = 1L;
+
+    public String getOutputFormat() {
+        return getSelectedItem().getLabel().toLowerCase();
+    }
+
+    private Comboitem getSelectedItem() {
+        final Comboitem item = getCombobox().getSelectedItem();
+        return (item != null) ? item : getDefaultItem();
+    }
+
+    private Combobox getCombobox() {
+        return (Combobox) this.getFellowIfAny("combobox");
+    }
+
+    private Comboitem getDefaultItem() {
+        return getCombobox().getItemAtIndex(0);
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
new file mode 100644
index 000000000..39f507ebf
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
@@ -0,0 +1,109 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.web.reports;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.jasperreports.engine.JRDataSource;
+
+import org.navalplanner.business.resources.entities.Worker;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.util.GenericForwardComposer;
+import org.zkoss.zkex.zul.Jasperreport;
+import org.zkoss.zul.Datebox;
+import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listitem;
+
+/**
+ *
+ * @author Diego Pino Garcia <dpino@igalia.com>
+ *
+ */
+public class HoursWorkedPerWorkerController extends GenericForwardComposer {
+
+    private IHoursWorkedPerWorkerModel hoursWorkedPerWorkerModel;
+
+    private HoursWorkedPerWorkerReport workerReport;
+
+    private Listbox lbWorkers;
+
+    private Datebox startingDate;
+
+    private Datebox endingDate;
+
+    private ComboboxOutputFormat outputFormat;
+
+    @Override
+    public void doAfterCompose(Component comp) throws Exception {
+        super.doAfterCompose(comp);
+        comp.setVariable("controller", this, true);
+    }
+
+    public List<Worker> getWorkers() {
+        return hoursWorkedPerWorkerModel.getWorkers();
+    }
+
+    public void showReport(Jasperreport report) {
+        final String type = outputFormat.getOutputFormat();
+
+        workerReport = new HoursWorkedPerWorkerReport(report);
+        workerReport.setDatasource(getDataSource());
+        workerReport.setParameters(getParameters());
+        workerReport.show(type);
+    }
+
+    private JRDataSource getDataSource() {
+        return hoursWorkedPerWorkerModel.getWorkerReport(getSelectedWorkers(), getStartingDate(), getEndingDate());
+    }
+
+    private Map<String, Object> getParameters() {
+        Map<String, Object> result = new HashMap<String, Object>();
+
+        result.put("startingDate", getStartingDate());
+        result.put("endingDate", getEndingDate());
+
+        return result;
+    }
+
+    private List<Worker> getSelectedWorkers() {
+        List<Worker> result = new ArrayList<Worker>();
+
+        final Set<Listitem> listItems = lbWorkers.getSelectedItems();
+        for (Listitem each: listItems) {
+            result.add((Worker) each.getValue());
+        }
+        return result;
+    }
+
+    private Date getStartingDate() {
+         return startingDate.getValue();
+    }
+
+    private Date getEndingDate() {
+        return endingDate.getValue();
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
new file mode 100644
index 000000000..ebf4deed3
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerModel.java
@@ -0,0 +1,67 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.web.reports;
+
+import java.util.Date;
+import java.util.List;
+
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JREmptyDataSource;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+import org.navalplanner.business.reports.dtos.HoursWorkedPerWorkerDTO;
+import org.navalplanner.business.resources.daos.IWorkerDAO;
+import org.navalplanner.business.resources.entities.Worker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Diego Pino Garcia <dpino@igalia.com>
+ *
+ */
+@Service
+@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
+
+    @Autowired
+    private IWorkerDAO workerDAO;
+
+    @Transactional(readOnly = true)
+    public JRDataSource getWorkerReport(List<Worker> workers, Date startingDate, Date endingDate) {
+        final List<HoursWorkedPerWorkerDTO> workingHoursPerWorkerList = workerDAO.getWorkingHoursPerWorker(workers, startingDate, endingDate);
+
+        if (workingHoursPerWorkerList != null && !workingHoursPerWorkerList.isEmpty()) {
+            return new JRBeanCollectionDataSource(workingHoursPerWorkerList);
+        } else {
+            return new JREmptyDataSource();
+        }
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<Worker> getWorkers() {
+        return workerDAO.getWorkers();
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerReport.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerReport.java
new file mode 100644
index 000000000..182de6abc
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerReport.java
@@ -0,0 +1,33 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.web.reports;
+
+import org.zkoss.zkex.zul.Jasperreport;
+
+
+public class HoursWorkedPerWorkerReport extends NavalplannerReport {
+
+    public HoursWorkedPerWorkerReport(Jasperreport report) {
+        report.setSrc("worker_report.jasper");
+        setReport(report);
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IHoursWorkedPerWorkerModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IHoursWorkedPerWorkerModel.java
new file mode 100644
index 000000000..ef7c3331f
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/IHoursWorkedPerWorkerModel.java
@@ -0,0 +1,21 @@
+package org.navalplanner.web.reports;
+
+import java.util.Date;
+import java.util.List;
+
+import net.sf.jasperreports.engine.JRDataSource;
+
+import org.navalplanner.business.resources.entities.Worker;
+
+/**
+ *
+ * @author Diego Pino Garcia <dpino@igalia.com>
+ *
+ */
+public interface IHoursWorkedPerWorkerModel {
+
+    JRDataSource getWorkerReport(List<Worker> workers, Date startingDate, Date endingDate);
+
+    List<Worker> getWorkers();
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/INavalplannerReport.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/INavalplannerReport.java
new file mode 100644
index 000000000..ee61a42b3
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/INavalplannerReport.java
@@ -0,0 +1,28 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.web.reports;
+
+
+public interface INavalplannerReport {
+
+    void show(String type);
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReport.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReport.java
new file mode 100644
index 000000000..e1dd7d718
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReport.java
@@ -0,0 +1,54 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * 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 Affero 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/>.
+ */
+
+package org.navalplanner.web.reports;
+
+import java.util.Map;
+
+import net.sf.jasperreports.engine.JRDataSource;
+
+import org.zkoss.zkex.zul.Jasperreport;
+
+public abstract class NavalplannerReport implements INavalplannerReport {
+
+    private Jasperreport report;
+
+    public Jasperreport getReport() {
+        return report;
+    }
+
+    public void setReport(Jasperreport report) {
+        this.report = report;
+    }
+
+    @Override
+    public void show(String type) {
+        this.report.setType(type);
+    }
+
+    public void setParameters(Map parameters) {
+        report.setParameters(parameters);
+    }
+
+    public void setDatasource(JRDataSource dataSource) {
+        report.setDatasource(dataSource);
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/resources/logos/navalpro_logo.gif b/navalplanner-webapp/src/main/resources/logos/navalpro_logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..11966e80e438dd7e2ec296b0270680ccd49db369
GIT binary patch
literal 6888
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
XG$9a@a8*M`-1XO{H2lp00Neio86E@>

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/reports/combobox_output_format.zul b/navalplanner-webapp/src/main/webapp/reports/combobox_output_format.zul
new file mode 100644
index 000000000..717ae9869
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/reports/combobox_output_format.zul
@@ -0,0 +1,32 @@
+<!--
+    This file is part of ###PROJECT_NAME###
+
+    Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+    Desenvolvemento Tecnolóxico de Galicia
+
+    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 Affero 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/>.
+-->
+
+<vbox>
+
+    <combobox id="combobox"
+            value="HTML"
+            autocomplete="true"
+            autodrop="true" >
+        <comboitem label="HTML"/>
+        <comboitem label="ODT"/>
+        <comboitem label="PDF"/>
+    </combobox>
+
+</vbox>
diff --git a/navalplanner-webapp/src/main/webapp/reports/worker_report.zul b/navalplanner-webapp/src/main/webapp/reports/worker_report.zul
new file mode 100644
index 000000000..a1355631d
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/reports/worker_report.zul
@@ -0,0 +1,112 @@
+<!--
+    This file is part of ###PROJECT_NAME###
+
+    Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+    Desenvolvemento Tecnolóxico de Galicia
+
+    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 Affero 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/>.
+-->
+
+<?page  id="reports"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
+
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+
+<?component name="combobox_output_format" macroURI="combobox_output_format.zul"
+    class="org.navalplanner.web.reports.ComboboxOutputFormat" ?>
+
+<zk>
+
+    <window self="@{define(content)}"
+        apply="org.navalplanner.web.reports.HoursWorkedPerWorkerController"
+        title="Hours worked per worker"
+        border="normal" >
+
+         <!-- Select output format -->
+         <panel title="${i18n:_('Dates')}" border="normal"
+             style="overflow:auto">
+             <panelchildren>
+                 <grid width="600px">
+                     <columns>
+                         <column width="200px" />
+                         <column />
+                     </columns>
+                     <rows>
+                         <row>
+                             <label value="${i18n:_('Start date:')}" />
+                             <datebox id="startingDate" />
+                         </row>
+                         <row>
+                             <label value="${i18n:_('End date:')}" />
+                             <datebox id="endingDate" />
+                         </row>
+                     </rows>
+                 </grid>
+             </panelchildren>
+         </panel>
+
+          <!-- Select output format -->
+        <panel title="${i18n:_('Workers')}"
+            border="normal"
+            style="overflow:auto">
+            <panelchildren>
+                <listbox id="lbWorkers"
+                        width="600px"
+                        multiple="true"
+                        model="@{controller.workers}">
+                    <listhead>
+                        <listheader label="${i18n:_('NIF')}" sort="auto(nif)" />
+                        <listheader label="${i18n:_('Name')}" sort="auto(name)" />
+                    </listhead>
+                    <listitem self="@{each='worker'}" value="@{worker}">
+                        <listcell label="@{worker.nif}" />
+                        <listcell label="@{worker.name}" />
+                    </listitem>
+                </listbox>
+            </panelchildren>
+        </panel>
+
+        <!-- Select output format -->
+        <panel title="${i18n:_('Format')}" border="normal"
+            style="overflow:auto">
+            <panelchildren>
+                <grid width="600px">
+                    <columns>
+                        <column width="200px" />
+                        <column />
+                    </columns>
+                    <rows>
+                        <row>
+                            <label value="${i18n:_('Output format:')}" />
+                            <combobox_output_format id="outputFormat" />
+                        </row>
+                    </rows>
+                </grid>
+
+            </panelchildren>
+        </panel>
+
+        <separator spacing="10px" orient="horizontal"/>
+
+        <button label="Show" onClick="controller.showReport(report)" />
+
+        <jasperreport id="report" />
+
+    </window>
+
+</zk>
diff --git a/pom.xml b/pom.xml
index 2f4321d2e..f1ea49e9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,12 @@
     <!-- Dependency management -->
     <dependencyManagement>
         <dependencies>
+            <!-- Jasper Reports -->
+            <dependency>
+              <groupId>jasperreports</groupId>
+              <artifactId>jasperreports</artifactId>
+              <version>3.7.0</version>
+            </dependency>
             <!-- Gettext commons -->
             <dependency>
                 <groupId>org.xnap.commons</groupId>