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 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 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 {
*/
@Transactional(readOnly = true)
List getWorkers();
+
+ /**
+ *
+ */
+ List getWorkingHoursPerWorker(List 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 Worker entity.
@@ -74,4 +78,48 @@ public class WorkerDAO extends GenericDAOHibernate
"nif", containsName))).list();
}
+ @Override
+ @Transactional(readOnly = true)
+ public List getWorkingHoursPerWorker(List 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 @@
+
+
+
+
+ org.codehaus.mojo
+ jasperreports-maven-plugin
+ 1.0-beta-2
+
+ ${project.build.sourceDirectory}/../jasper
+ ${project.build.sourceDirectory}/../../../target/classes
+ true
+
+
+
+
+ compile-reports
+
+ compile
+
+
+
+
+
+ jasperreports
+ jasperreports
+ 3.7.0
+
+
+
+
+
+
+ jasperreports
+ jasperreports
+
org.xnap.commons
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
+ *
+ */
+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 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 getParameters() {
+ Map result = new HashMap();
+
+ result.put("startingDate", getStartingDate());
+ result.put("endingDate", getEndingDate());
+
+ return result;
+ }
+
+ private List getSelectedWorkers() {
+ List result = new ArrayList();
+
+ final Set 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
+ *
+ */
+@Service
+@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+public class HoursWorkedPerWorkerModel implements IHoursWorkedPerWorkerModel {
+
+ @Autowired
+ private IWorkerDAO workerDAO;
+
+ @Transactional(readOnly = true)
+ public JRDataSource getWorkerReport(List workers, Date startingDate, Date endingDate) {
+ final List 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 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
+ *
+ */
+public interface IHoursWorkedPerWorkerModel {
+
+ JRDataSource getWorkerReport(List workers, Date startingDate, Date endingDate);
+
+ List 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
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 2f4321d2e..f1ea49e9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,12 @@
+
+
+ jasperreports
+ jasperreports
+ 3.7.0
+
org.xnap.commons