From 1a5ba8dc881628a4eb4e156d75896b42bc0754e4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 9 Jun 2010 15:51:08 +0200
Subject: [PATCH] ItEr59S24AdaptacionsFinaisEscenarios: Show only the orders of
 master scenario in the list of subcontracted tasks.

---
 .../daos/ISubcontractedTaskDataDAO.java       |  2 ++
 .../daos/SubcontractedTaskDataDAO.java        | 28 ++++++++++++++++++-
 .../subcontract/SubcontractedTasksModel.java  |  3 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ISubcontractedTaskDataDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ISubcontractedTaskDataDAO.java
index cf6727ee8..88a59b159 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ISubcontractedTaskDataDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ISubcontractedTaskDataDAO.java
@@ -39,4 +39,6 @@ public interface ISubcontractedTaskDataDAO extends
 
     void removeOrphanedSubcontractedTaskData();
 
+    List<SubcontractedTaskData> getAllForMasterScenario();
+
 }
\ No newline at end of file
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/SubcontractedTaskDataDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/SubcontractedTaskDataDAO.java
index 339fb8f5b..68b326e3e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/SubcontractedTaskDataDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/SubcontractedTaskDataDAO.java
@@ -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;
+    }
+
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java
index d978c9fc2..1d74908d5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java
@@ -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);
         }