RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr58S16RFAdaptacionInformesItEr55S14: Adapted the report 'Completed estimated hours per task'.

Browse source 
Now it's implemented in the XXModel. The DAO operation has been removed.
This commit is contained in:
Jacobo Aragunde Pérez 2010-06-09 22:22:35 +02:00 • committed by Javier Moran Rua
parent 03199cdb68
commit efe6eea20c
3 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ITaskElementDAO.java
View file

@ -28,7 +28,6 @@ import org.navalplanner.business.common.daos.IGenericDAO;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.business.reports.dtos.CompletedEstimatedHoursPerTaskDTO;
import org.navalplanner.business.reports.dtos.WorkingProgressPerTaskDTO;
/**
@ -41,9 +40,6 @@ public interface ITaskElementDAO extends IGenericDAO<TaskElement, Long> {
List<WorkingProgressPerTaskDTO> getWorkingProgressPerTaskReport(
Order order, LocalDate deadline);
List<CompletedEstimatedHoursPerTaskDTO> getCompletedEstimatedHoursPerTaskReport(
Order order, LocalDate deadline);
List<TaskElement> listFilteredByDate(Date start, Date end);
}

14
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java
View file

@ -36,7 +36,6 @@ import org.navalplanner.business.planner.entities.SpecificDayAssignment;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.business.reports.dtos.CompletedEstimatedHoursPerTaskDTO;
import org.navalplanner.business.reports.dtos.WorkingProgressPerTaskDTO;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -141,19 +140,6 @@ public class TaskElementDAO extends GenericDAOHibernate<TaskElement, Long>
return query.list();
}
@Override
public List<CompletedEstimatedHoursPerTaskDTO> getCompletedEstimatedHoursPerTaskReport(
Order order, LocalDate deadline) {
List<CompletedEstimatedHoursPerTaskDTO> result = new ArrayList<CompletedEstimatedHoursPerTaskDTO>();
final List<Task> tasks = getTasksByOrderAndDate(order, deadline);
for (Task task: tasks) {
result.add(new CompletedEstimatedHoursPerTaskDTO(task, deadline));
}
return result;
}
@Override
@SuppressWarnings("unchecked")
public List<TaskElement> listFilteredByDate(Date start, Date end) {

18
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.web.reports;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -32,6 +33,8 @@ import org.navalplanner.business.orders.daos.IOrderDAO;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.reports.dtos.CompletedEstimatedHoursPerTaskDTO;
import org.navalplanner.business.scenarios.IScenarioManager;
import org.springframework.beans.factory.annotation.Autowired;
@ -83,10 +86,19 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
public JRDataSource getCompletedEstimatedHoursReportPerTask(
Order order, Date deadline) {
reattachmentOrder(order);
final List<CompletedEstimatedHoursPerTaskDTO> completedEstimatedHoursPerTaskList =
taskDAO.getCompletedEstimatedHoursPerTaskReport(order, new LocalDate(deadline));
order.useSchedulingDataFor(scenarioManager.getCurrent());
LocalDate deadlineLocalDate = new LocalDate(deadline);
if (completedEstimatedHoursPerTaskList != null && !completedEstimatedHoursPerTaskList.isEmpty()) {
final List<TaskElement> tasks = order.getAllChildrenAssociatedTaskElements();
final List<CompletedEstimatedHoursPerTaskDTO> completedEstimatedHoursPerTaskList =
new ArrayList<CompletedEstimatedHoursPerTaskDTO>();
for (TaskElement task: tasks) {
if(task instanceof Task) {
completedEstimatedHoursPerTaskList.add(
new CompletedEstimatedHoursPerTaskDTO((Task)task, deadlineLocalDate));
}
}
if (!completedEstimatedHoursPerTaskList.isEmpty()) {
return new JRBeanCollectionDataSource(completedEstimatedHoursPerTaskList);
} else {
return new JREmptyDataSource();