From af65a684bd93e041233be9b8d271422e89cb3248 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 27 May 2010 10:14:26 +0200 Subject: [PATCH] ItEr58S19CUDesconsolidacion: Removed unneeded entity PendingConsolidatedHoursPerResourceAllocation. --- .../CalculatedConsolidatedValue.java | 14 +-- .../consolidations/ConsolidatedValue.java | 29 +---- .../NonCalculatedConsolidatedValue.java | 25 ++-- ...onsolidatedHoursPerResourceAllocation.java | 115 ------------------ .../entities/AdvanceConsolidations.hbm.xml | 8 -- .../AdvanceConsolidationModel.java | 16 +-- .../tabs/AdvancedAllocationTabCreator.java | 6 +- 7 files changed, 17 insertions(+), 196 deletions(-) delete mode 100644 navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/PendingConsolidatedHoursPerResourceAllocation.java diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/CalculatedConsolidatedValue.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/CalculatedConsolidatedValue.java index d23e54224..de01412b5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/CalculatedConsolidatedValue.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/CalculatedConsolidatedValue.java @@ -21,7 +21,6 @@ package org.navalplanner.business.planner.entities.consolidations; import java.math.BigDecimal; -import java.util.Set; import org.joda.time.LocalDate; @@ -38,17 +37,12 @@ public class CalculatedConsolidatedValue extends ConsolidatedValue { } public static CalculatedConsolidatedValue create(LocalDate date, - BigDecimal value, - Set pendingConsolidatedHours) { - return create(new CalculatedConsolidatedValue(date, value, - pendingConsolidatedHours)); + BigDecimal value) { + return create(new CalculatedConsolidatedValue(date, value)); } - protected CalculatedConsolidatedValue( - LocalDate date, - BigDecimal value, - Set pendingConsolidatedHours) { - super(date, value, pendingConsolidatedHours); + protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value) { + super(date, value); } protected CalculatedConsolidatedValue() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/ConsolidatedValue.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/ConsolidatedValue.java index e5506fe2e..9fd50659f 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/ConsolidatedValue.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/ConsolidatedValue.java @@ -21,13 +21,9 @@ package org.navalplanner.business.planner.entities.consolidations; import java.math.BigDecimal; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; import org.joda.time.LocalDate; import org.navalplanner.business.common.BaseEntity; -import org.navalplanner.business.planner.entities.ResourceAllocation; /** * @author Susana Montes Pedreira @@ -37,7 +33,6 @@ public abstract class ConsolidatedValue extends BaseEntity { private LocalDate date; private BigDecimal value; - private Set pendingConsolidatedHours = new HashSet(); public abstract boolean isCalculated(); @@ -47,11 +42,9 @@ public abstract class ConsolidatedValue extends BaseEntity { protected ConsolidatedValue( LocalDate date, - BigDecimal value, - Set pendingConsolidatedHours) { + BigDecimal value) { this.date = date; this.value = value; - this.pendingConsolidatedHours = pendingConsolidatedHours; } public void setValue(BigDecimal value) { @@ -70,24 +63,4 @@ public abstract class ConsolidatedValue extends BaseEntity { return date; } - public void setPendingConsolidatedHours(Set pendingConsolidatedHours) { - this.pendingConsolidatedHours = pendingConsolidatedHours; - } - - public Set getPendingConsolidatedHours() { - return pendingConsolidatedHours; - } - - public static Set createPendingConsolidatedHours( - LocalDate consolidatedDate, BigDecimal consolidatedValue, - Collection allocations) { - Set pendingConsolidatedHours = new HashSet(); - for (ResourceAllocation allocation : allocations) { - pendingConsolidatedHours - .add(PendingConsolidatedHoursPerResourceAllocation.create( - consolidatedDate, consolidatedValue, allocation)); - } - return pendingConsolidatedHours; - } - } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/NonCalculatedConsolidatedValue.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/NonCalculatedConsolidatedValue.java index bc03cd5fc..4ecfc7b71 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/NonCalculatedConsolidatedValue.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/NonCalculatedConsolidatedValue.java @@ -21,7 +21,6 @@ package org.navalplanner.business.planner.entities.consolidations; import java.math.BigDecimal; -import java.util.Set; import org.joda.time.LocalDate; import org.navalplanner.business.advance.entities.AdvanceMeasurement; @@ -41,32 +40,24 @@ public class NonCalculatedConsolidatedValue extends ConsolidatedValue { } public static NonCalculatedConsolidatedValue create(LocalDate date, - BigDecimal value, - Set pendingConsolidatedHours) { - return create(new NonCalculatedConsolidatedValue(date, value, - pendingConsolidatedHours)); + BigDecimal value) { + return create(new NonCalculatedConsolidatedValue(date, value)); } public static NonCalculatedConsolidatedValue create(LocalDate date, - BigDecimal value, - AdvanceMeasurement advanceMeasurement, - Set pendingConsolidatedHours) { + BigDecimal value, AdvanceMeasurement advanceMeasurement) { return create(new NonCalculatedConsolidatedValue(date, value, - advanceMeasurement, pendingConsolidatedHours)); + advanceMeasurement)); } protected NonCalculatedConsolidatedValue(LocalDate date, BigDecimal value, - AdvanceMeasurement advanceMeasurement, - Set pendingConsolidatedHours) { - this(date, value, pendingConsolidatedHours); + AdvanceMeasurement advanceMeasurement) { + this(date, value); this.advanceMeasurement = advanceMeasurement; } - protected NonCalculatedConsolidatedValue( - LocalDate date, - BigDecimal value, - Set pendingConsolidatedHours) { - super(date, value, pendingConsolidatedHours); + protected NonCalculatedConsolidatedValue(LocalDate date, BigDecimal value) { + super(date, value); } protected NonCalculatedConsolidatedValue() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/PendingConsolidatedHoursPerResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/PendingConsolidatedHoursPerResourceAllocation.java deleted file mode 100644 index e01db9306..000000000 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/PendingConsolidatedHoursPerResourceAllocation.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of NavalPlan - * - * 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 . - */ - -package org.navalplanner.business.planner.entities.consolidations; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Collection; - -import org.hibernate.validator.NotNull; -import org.joda.time.LocalDate; -import org.navalplanner.business.common.BaseEntity; -import org.navalplanner.business.planner.entities.DayAssignment; -import org.navalplanner.business.planner.entities.ResourceAllocation; - -/** - * Represents the number of hours per {@link ResourceAllocation} that are not - * consolidated. - * @author Susana Montes Pedreira - */ - -public class PendingConsolidatedHoursPerResourceAllocation extends BaseEntity { - - private Integer pendingConsolidatedHours; - - private ResourceAllocation resourceAllocation; - - public static PendingConsolidatedHoursPerResourceAllocation create( - LocalDate consolidatedDate, BigDecimal consolidatedValue, - ResourceAllocation resourceAllocation) { - return create(new PendingConsolidatedHoursPerResourceAllocation( - consolidatedDate, consolidatedValue, resourceAllocation)); - } - - public static PendingConsolidatedHoursPerResourceAllocation create( - Integer pendingConsolidatedHours, - ResourceAllocation resourceAllocation) { - return create(new PendingConsolidatedHoursPerResourceAllocation( - pendingConsolidatedHours, resourceAllocation)); - } - - protected PendingConsolidatedHoursPerResourceAllocation( - LocalDate consolidatedDate, BigDecimal consolidatedValue, - ResourceAllocation resourceAllocation) { - this.setResourceAllocation(resourceAllocation); - this.setPendingConsolidatedHours(calculatePendingConsolidatedHours( - consolidatedDate, consolidatedValue, resourceAllocation - .getAssignments())); - } - - protected PendingConsolidatedHoursPerResourceAllocation( - Integer pendingConsolidatedHours, - ResourceAllocation resourceAllocation) { - this.setResourceAllocation(resourceAllocation); - this.setPendingConsolidatedHours(pendingConsolidatedHours); - } - - protected PendingConsolidatedHoursPerResourceAllocation() { - - } - - private Integer calculatePendingConsolidatedHours( - LocalDate consolidatedDate, BigDecimal consolidatedValue, - Collection assignments) { - for (DayAssignment dayAssignment : assignments) { - if ((dayAssignment.getDay().compareTo(consolidatedDate)) <= 0) { - dayAssignment.setConsolidated(true); - } - } - - int originalTotalAssigment = resourceAllocation - .getOriginalTotalAssigment(); - return BigDecimal.ONE - .subtract( - consolidatedValue.divide(new BigDecimal(100), - RoundingMode.DOWN)).multiply( - new BigDecimal(originalTotalAssigment)).intValue(); - } - - public void setPendingConsolidatedHours(Integer pendingConsolidatedHours) { - this.pendingConsolidatedHours = pendingConsolidatedHours; - } - - @NotNull(message = "pending consolidated hours not specified") - public Integer getPendingConsolidatedHours() { - return pendingConsolidatedHours; - } - - public void setResourceAllocation(ResourceAllocation resourceAllocation) { - this.resourceAllocation = resourceAllocation; - } - - @NotNull(message = "resource allocation not specified") - public ResourceAllocation getResourceAllocation() { - return resourceAllocation; - } - -} diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/AdvanceConsolidations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/AdvanceConsolidations.hbm.xml index b8cf8d21e..9e4c9aa87 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/AdvanceConsolidations.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/AdvanceConsolidations.hbm.xml @@ -14,14 +14,6 @@ - - - - - - - - diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java index e761604af..5ebdf6cd6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java @@ -48,7 +48,6 @@ import org.navalplanner.business.planner.entities.consolidations.ConsolidatedVal import org.navalplanner.business.planner.entities.consolidations.Consolidation; import org.navalplanner.business.planner.entities.consolidations.NonCalculatedConsolidatedValue; import org.navalplanner.business.planner.entities.consolidations.NonCalculatedConsolidation; -import org.navalplanner.business.planner.entities.consolidations.PendingConsolidatedHoursPerResourceAllocation; import org.navalplanner.web.planner.order.PlanningState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -255,19 +254,13 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel { AdvanceConsolidationDTO dto) { if (consolidation != null && task != null) { - Set pendingConsolidatedHours = ConsolidatedValue - .createPendingConsolidatedHours(LocalDate - .fromDateFields(dto.getDate()), dto.getValue(), - task.getAllResourceAllocations()); - if (consolidation.isCalculated()) { return CalculatedConsolidatedValue.create(LocalDate - .fromDateFields(dto.getDate()), dto.getValue(), - pendingConsolidatedHours); + .fromDateFields(dto.getDate()), dto.getValue()); } else { return NonCalculatedConsolidatedValue.create(LocalDate .fromDateFields(dto.getDate()), dto.getValue(), dto - .getAdvanceMeasurement(), pendingConsolidatedHours); + .getAdvanceMeasurement()); } } return null; @@ -346,10 +339,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel { spreadAdvance = orderElement.getReportGlobalAdvanceAssignment(); consolidation = task.getConsolidation(); if (consolidation != null) { - for (ConsolidatedValue consolidatedValue : consolidation - .getConsolidatedValues()) { - consolidatedValue.getPendingConsolidatedHours().size(); - } + consolidation.getConsolidatedValues().size(); } if (spreadAdvance != null) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java index 5308462a5..1001ae7b0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java @@ -43,7 +43,6 @@ import org.navalplanner.business.planner.entities.DayAssignment; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.TaskElement; -import org.navalplanner.business.planner.entities.consolidations.ConsolidatedValue; import org.navalplanner.business.planner.entities.consolidations.Consolidation; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Resource; @@ -93,10 +92,7 @@ public class AdvancedAllocationTabCreator { private void loadConsolidationRelatedData(Task task) { Consolidation consolidation = task.getConsolidation(); if (consolidation != null) { - for (ConsolidatedValue consolidatedValue : consolidation - .getConsolidatedValues()) { - consolidatedValue.getPendingConsolidatedHours().size(); - } + consolidation.getConsolidatedValues().size(); } }