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

Extract copy and pasted code to utilities class

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-05-01 23:13:45 +02:00
parent 78aaae3ec5
commit 13bec81499
5 changed files with 146 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CommonQueries.java Normal file
View file

@ -0,0 +1,91 @@
/*
* This file is part of NavalPlan
*
* Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
* Copyright (C) 2010-2011 Igalia, S.L.
*
* 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.List;
import org.navalplanner.business.labels.entities.Label;
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.entities.Task;
import org.navalplanner.business.resources.entities.Criterion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository
@Scope(BeanDefinition.SCOPE_SINGLETON)
public class CommonQueries implements ICommonQueries {
@Autowired
IOrderDAO orderDAO;
@Override
@Transactional(readOnly = true)
public List<Task> filteredTaskElements(Order order, List<Label> labels,
List<Criterion> criterions) {
List<OrderElement> orderElements = order.getAllChildren();
// Filter by labels
List<OrderElement> filteredOrderElements = filteredOrderElementsByLabels(
orderElements, labels);
return orderDAO.getFilteredTask(filteredOrderElements, criterions);
}
private List<OrderElement> filteredOrderElementsByLabels(
List<OrderElement> orderElements, List<Label> labels) {
if (labels != null && !labels.isEmpty()) {
List<OrderElement> filteredOrderElements = new ArrayList<OrderElement>();
for (OrderElement orderElement : orderElements) {
List<Label> inheritedLabels = getInheritedLabels(orderElement);
if (containsAny(labels, inheritedLabels)) {
filteredOrderElements.add(orderElement);
}
}
return filteredOrderElements;
} else {
return orderElements;
}
}
private boolean containsAny(List<Label> labelsA, List<Label> labelsB) {
for (Label label : labelsB) {
if (labelsA.contains(label)) {
return true;
}
}
return false;
}
private List<Label> getInheritedLabels(OrderElement orderElement) {
List<Label> result = new ArrayList<Label>();
OrderElement current = orderElement;
while (current != null) {
result.addAll(current.getLabels());
current = current.getParent();
}
return result;
}
}

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

@ -69,6 +69,9 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
@Autowired
ITaskElementDAO taskDAO;
@Autowired
private ICommonQueries commonQueries;
@Autowired
private IScenarioManager scenarioManager;
@ -130,7 +133,9 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
order.useSchedulingDataFor(scenarioManager.getCurrent());
LocalDate deadlineLocalDate = new LocalDate(deadline);
final List<Task> tasks = filteredTaskElements(order, labels, criterions);
reattachLabels();
final List<Task> tasks = commonQueries.filteredTaskElements(order,
labels, criterions);
final List<CompletedEstimatedHoursPerTaskDTO> completedEstimatedHoursPerTaskList =
new ArrayList<CompletedEstimatedHoursPerTaskDTO>();
for (TaskElement task: tasks) {
@ -144,56 +149,6 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
}
}
@Transactional(readOnly = true)
private List<Task> filteredTaskElements(Order order,
List<Label> labels, List<Criterion> criterions) {
List<OrderElement> orderElements = order.getAllChildren();
// Filter by labels
List<OrderElement> filteredOrderElements = filteredOrderElementsByLabels(
orderElements, labels);
return orderDAO.getFilteredTask(filteredOrderElements, criterions);
}
private List<OrderElement> filteredOrderElementsByLabels(
List<OrderElement> orderElements, List<Label> labels) {
if (labels != null && !labels.isEmpty()) {
List<OrderElement> filteredOrderElements = new ArrayList<OrderElement>();
for (OrderElement orderElement : orderElements) {
List<Label> inheritedLabels = getInheritedLabels(orderElement);
if (containsAny(labels, inheritedLabels)) {
filteredOrderElements.add(orderElement);
}
}
return filteredOrderElements;
} else {
return orderElements;
}
}
private boolean containsAny(List<Label> labelsA, List<Label> labelsB) {
for (Label label : labelsB) {
if (labelsA.contains(label)) {
return true;
}
}
return false;
}
@Transactional(readOnly = true)
public List<Label> getInheritedLabels(OrderElement orderElement) {
List<Label> result = new ArrayList<Label>();
if (orderElement != null) {
reattachLabels();
result.addAll(orderElement.getLabels());
OrderElement parent = orderElement.getParent();
while (parent != null) {
result.addAll(parent.getLabels());
parent = parent.getParent();
}
}
return result;
}
private void reattachLabels() {
for (Label label : getAllLabels()) {
labelDAO.reattach(label);

37
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/ICommonQueries.java Normal file
View file

@ -0,0 +1,37 @@
/*
* This file is part of NavalPlan
*
* Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
* Copyright (C) 2010-2011 Igalia, S.L.
*
* 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.List;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.resources.entities.Criterion;
import org.springframework.transaction.annotation.Transactional;
public interface ICommonQueries {
@Transactional(readOnly = true)
List<Task> filteredTaskElements(Order order, List<Label> labels,
List<Criterion> criterions);
}

57
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderModel.java
View file

@ -79,6 +79,9 @@ public class WorkingArrangementsPerOrderModel implements
@Autowired
IWorkReportLineDAO workReportLineDAO;
@Autowired
private ICommonQueries commonQueries;
@Autowired
private IScenarioManager scenarioManager;
@ -149,7 +152,9 @@ Order order,
List<WorkingArrangementPerOrderDTO> workingArrangementPerOrderList =
new ArrayList<WorkingArrangementPerOrderDTO>();
final List<Task> tasks = filteredTaskElements(order, labels, criterions);
reattachLabels();
final List<Task> tasks = commonQueries.filteredTaskElements(order,
labels, criterions);
final List<Task> sortTasks = sortTasks(order, tasks);
final Date deadLineOrder = order.getDeadline();
@ -359,56 +364,6 @@ Order order,
return result;
}
@Transactional(readOnly = true)
private List<Task> filteredTaskElements(Order order, List<Label> labels,
List<Criterion> criterions) {
List<OrderElement> orderElements = order.getAllChildren();
// Filter by labels
List<OrderElement> filteredOrderElements = filteredOrderElementsByLabels(
orderElements, labels);
return orderDAO.getFilteredTask(filteredOrderElements, criterions);
}
private List<OrderElement> filteredOrderElementsByLabels(
List<OrderElement> orderElements, List<Label> labels) {
if (labels != null && !labels.isEmpty()) {
List<OrderElement> filteredOrderElements = new ArrayList<OrderElement>();
for (OrderElement orderElement : orderElements) {
List<Label> inheritedLabels = getInheritedLabels(orderElement);
if (containsAny(labels, inheritedLabels)) {
filteredOrderElements.add(orderElement);
}
}
return filteredOrderElements;
} else {
return orderElements;
}
}
private boolean containsAny(List<Label> labelsA, List<Label> labelsB) {
for (Label label : labelsB) {
if (labelsA.contains(label)) {
return true;
}
}
return false;
}
@Transactional(readOnly = true)
public List<Label> getInheritedLabels(OrderElement orderElement) {
List<Label> result = new ArrayList<Label>();
if (orderElement != null) {
reattachLabels();
result.addAll(orderElement.getLabels());
OrderElement parent = orderElement.getParent();
while (parent != null) {
result.addAll(parent.getLabels());
parent = parent.getParent();
}
}
return result;
}
private void reattachLabels() {
for (Label label : getAllLabels()) {
labelDAO.reattach(label);

57
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java
View file

@ -68,6 +68,9 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
@Autowired
private ILabelDAO labelDAO;
@Autowired
private ICommonQueries commonQueries;
@Autowired
private IScenarioManager scenarioManager;
@ -108,7 +111,9 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
final List<WorkingProgressPerTaskDTO> workingHoursPerWorkerList =
new ArrayList<WorkingProgressPerTaskDTO>();
final List<Task> tasks = filteredTaskElements(order, labels, criterions);
reattachLabels();
final List<Task> tasks = commonQueries.filteredTaskElements(order,
labels, criterions);
final List<Task> sortTasks = sortTasks(order, tasks);
for (Task task : sortTasks) {
workingHoursPerWorkerList.add(new WorkingProgressPerTaskDTO(task,
@ -156,56 +161,6 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
loadAllCriterions();
}
@Transactional(readOnly = true)
private List<Task> filteredTaskElements(Order order, List<Label> labels,
List<Criterion> criterions) {
List<OrderElement> orderElements = order.getAllChildren();
// Filter by labels
List<OrderElement> filteredOrderElements = filteredOrderElementsByLabels(
orderElements, labels);
return orderDAO.getFilteredTask(filteredOrderElements, criterions);
}
private List<OrderElement> filteredOrderElementsByLabels(
List<OrderElement> orderElements, List<Label> labels) {
if (labels != null && !labels.isEmpty()) {
List<OrderElement> filteredOrderElements = new ArrayList<OrderElement>();
for (OrderElement orderElement : orderElements) {
List<Label> inheritedLabels = getInheritedLabels(orderElement);
if (containsAny(labels, inheritedLabels)) {
filteredOrderElements.add(orderElement);
}
}
return filteredOrderElements;
} else {
return orderElements;
}
}
private boolean containsAny(List<Label> labelsA, List<Label> labelsB) {
for (Label label : labelsB) {
if (labelsA.contains(label)) {
return true;
}
}
return false;
}
@Transactional(readOnly = true)
public List<Label> getInheritedLabels(OrderElement orderElement) {
List<Label> result = new ArrayList<Label>();
if (orderElement != null) {
reattachLabels();
result.addAll(orderElement.getLabels());
OrderElement parent = orderElement.getParent();
while (parent != null) {
result.addAll(parent.getLabels());
parent = parent.getParent();
}
}
return result;
}
private void reattachLabels() {
for (Label label : getAllLabels()) {
labelDAO.reattach(label);