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

ItEr59S24AdaptacionsFinaisEscenarios: Show only the orders of master scenario in the list of subcontracted tasks.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-06-09 15:51:08 +02:00
parent 2eb7cca768
commit 1a5ba8dc88
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ISubcontractedTaskDataDAO.java
View file

@ -39,4 +39,6 @@ public interface ISubcontractedTaskDataDAO extends
void removeOrphanedSubcontractedTaskData();
List<SubcontractedTaskData> getAllForMasterScenario();
}

28
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/SubcontractedTaskDataDAO.java
View file

@ -20,12 +20,18 @@
package org.navalplanner.business.planner.daos;
import java.util.ArrayList;
import java.util.List;
import org.hibernate.criterion.Restrictions;
import org.navalplanner.business.common.daos.GenericDAOHibernate;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.planner.entities.SubcontractedTaskData;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.scenarios.bootstrap.PredefinedScenarios;
import org.navalplanner.business.scenarios.entities.Scenario;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Repository;
@ -72,4 +78,24 @@ public class SubcontractedTaskDataDAO extends
}
}
@Override
public List<SubcontractedTaskData> getAllForMasterScenario() {
Scenario masterScenario = PredefinedScenarios.MASTER.getScenario();
List<SubcontractedTaskData> result = new ArrayList<SubcontractedTaskData>();
for (Order order : masterScenario.getOrders().keySet()) {
order.useSchedulingDataFor(masterScenario);
for (OrderElement orderElement : order.getAllOrderElements()) {
for (TaskElement taskElement : orderElement.getTaskElements()) {
if (taskElement.isSubcontracted()) {
result.add(((Task) taskElement)
.getSubcontractedTaskData());
}
}
}
}
return result;
}
}

3
navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java
View file

@ -84,7 +84,8 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel {
@Override
@Transactional(readOnly = true)
public List<SubcontractedTaskData> getSubcontractedTasks() {
List<SubcontractedTaskData> result = subcontractedTaskDataDAO.getAll();
List<SubcontractedTaskData> result = subcontractedTaskDataDAO
.getAllForMasterScenario();
for (SubcontractedTaskData subcontractedTaskData : result) {
forceLoadExternalCompany(subcontractedTaskData);
}