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

ItEr27S06CUAsignacionGrupoRecursosAPlanificacionItEr26S07: Extracting class ResourceAllocationsBeingEdited from ResourceAllocationModel

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-22 13:38:03 +02:00
parent 4c71efc174
commit 157eb18337
2 changed files with 77 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -1,7 +1,5 @@
package org.navalplanner.web.planner.allocation;
import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -57,10 +55,10 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private org.zkoss.ganttz.data.Task ganttTask;
private List<AllocationDTO> currentAllocations;
private PlanningState planningState;
private ResourceAllocationsBeingEdited resourceAllocationsBeingEdited;
@Override
public Task getTask() {
return task;
@ -69,25 +67,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
@Override
@Transactional(readOnly = true)
public void addSpecificResourceAllocation(Worker worker) throws Exception {
if (alreadyExistsAllocationFor(worker)) {
throw new IllegalArgumentException(_(
"{0} already assigned to resource allocation list", worker
.getName()));
}
SpecificAllocationDTO allocation = SpecificAllocationDTO
.forResource(worker);
currentAllocations.add(allocation);
}
private boolean alreadyExistsAllocationFor(Worker worker) {
return !getAllocationsFor(worker).isEmpty();
}
private List<SpecificAllocationDTO> getAllocationsFor(Worker worker) {
List<SpecificAllocationDTO> found = SpecificAllocationDTO.withResource(
SpecificAllocationDTO.getSpecific(currentAllocations), worker);
return found;
resourceAllocationsBeingEdited.addSpecificResorceAllocationFor(worker);
}
@Override
@ -98,30 +78,32 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
@Override
public List<AllocationDTO> getAllocations() {
if (currentAllocations == null) {
if (resourceAllocationsBeingEdited == null) {
return Collections.emptyList();
}
return currentAllocations;
return resourceAllocationsBeingEdited.getCurrentAllocations();
}
@Override
public void removeSpecificResourceAllocation(
SpecificAllocationDTO allocation) {
currentAllocations.remove(allocation);
if (allocation.isModifying()) {
task.removeResourceAllocation(allocation.getOrigin());
}
resourceAllocationsBeingEdited.remove(allocation);
}
@Override
public void cancel() {
currentAllocations = null;
resourceAllocationsBeingEdited = null;
}
@Override
@Transactional(readOnly = true)
public void save() {
planningState.reassociateResourcesWithSession(resourceDAO);
Set<ResourceAllocation<?>> allocationsRequestedToRemove = resourceAllocationsBeingEdited
.getAllocationsRequestedToRemove();
for (ResourceAllocation<?> resourceAllocation : allocationsRequestedToRemove) {
task.removeResourceAllocation(resourceAllocation);
}
mergeDTOsToTask();
}
@ -140,7 +122,8 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private List<ResourceAllocationWithDesiredResourcesPerDay> toResourceAllocations() {
List<ResourceAllocationWithDesiredResourcesPerDay> result = new ArrayList<ResourceAllocationWithDesiredResourcesPerDay>();
for (AllocationDTO allocation : currentAllocations) {
for (AllocationDTO allocation : resourceAllocationsBeingEdited
.getCurrentAllocations()) {
result.add(createOrModify(allocation).withDesiredResourcesPerDay(
allocation.getResourcesPerDay()));
}
@ -204,8 +187,10 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
hoursGroupDAO.save(this.task.getHoursGroup());
reattachHoursGroup(this.task.getHoursGroup());
reattachCriterions(this.task.getHoursGroup().getCriterions());
currentAllocations = addDefaultGenericIfNeeded(asDTOs(this.task
List<AllocationDTO> currentAllocations = addDefaultGenericIfNeeded(asDTOs(this.task
.getResourceAllocations()));
resourceAllocationsBeingEdited = new ResourceAllocationsBeingEdited(
currentAllocations);
}
private void reattachResourceAllocations(

60
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java Normal file
View file

@ -0,0 +1,60 @@
package org.navalplanner.web.planner.allocation;
import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.resources.entities.Worker;
public class ResourceAllocationsBeingEdited {
private final List<AllocationDTO> currentAllocations;
private final Set<ResourceAllocation<?>> requestedToRemove = new HashSet<ResourceAllocation<?>>();
public ResourceAllocationsBeingEdited(List<AllocationDTO> initialAllocations) {
this.currentAllocations = new ArrayList<AllocationDTO>(
initialAllocations);
}
public void addSpecificResorceAllocationFor(Worker worker) {
if (alreadyExistsAllocationFor(worker)) {
throw new IllegalArgumentException(_(
"{0} already assigned to resource allocation list", worker
.getName()));
}
SpecificAllocationDTO allocation = SpecificAllocationDTO
.forResource(worker);
currentAllocations.add(allocation);
}
public List<AllocationDTO> getCurrentAllocations() {
return new ArrayList<AllocationDTO>(currentAllocations);
}
private boolean alreadyExistsAllocationFor(Worker worker) {
return !getAllocationsFor(worker).isEmpty();
}
private List<SpecificAllocationDTO> getAllocationsFor(Worker worker) {
List<SpecificAllocationDTO> found = SpecificAllocationDTO.withResource(
SpecificAllocationDTO.getSpecific(currentAllocations), worker);
return found;
}
public void remove(SpecificAllocationDTO allocation) {
currentAllocations.remove(allocation);
if (allocation.isModifying()) {
requestedToRemove.add(allocation.getOrigin());
}
}
public Set<ResourceAllocation<?>> getAllocationsRequestedToRemove() {
return requestedToRemove;
}
}