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

ItEr26S07CUAsignacionGrupoRecursosAPlanificacionItEr25S07: Replacing setTasks method for init method

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-14 20:33:47 +02:00
parent 6a6c738f4e
commit 36c198c841
3 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
View file

@ -73,22 +73,6 @@ public interface IResourceAllocationModel {
void removeSpecificResourceAllocation(
SpecificResourceAllocation resourceAllocation);
/**
* Sets the current Gantt {@link org.zkoss.ganttz.data.Task ganttTask},
* where the user is allocating resources.
*
* @param ganttTask
*/
void setGanttTask(org.zkoss.ganttz.data.Task ganttTask);
/**
* Sets the current {@link Task}, where the user is allocating resources.
*
* @param task
* A {@link Task}
*/
void setTask(Task task);
/**
* Cancel operation
*/
@ -99,4 +83,11 @@ public interface IResourceAllocationModel {
*/
void save();
/**
* Starts the use case
* @param task
* @param ganttTask
*/
void initAllocationsFor(Task task, org.zkoss.ganttz.data.Task ganttTask);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
View file

@ -71,9 +71,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
* @param ganttTask
*/
public void showWindow(Task task, org.zkoss.ganttz.data.Task ganttTask) {
resourceAllocationModel.setTask(task);
resourceAllocationModel.setGanttTask(ganttTask);
resourceAllocationModel.initAllocationsFor(task, ganttTask);
resourceAllocationModel
.addGenericResourceAllocationIfNoAllocationExists();
Util.reloadBindings(window);

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

@ -57,20 +57,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
return task;
}
@Override
@Transactional(readOnly = true)
public void setTask(Task task) {
if (!taskElementDAO.exists(task.getId())) {
this.task = task;
return;
}
this.task = findFromDB(task);
reattachResourceAllocations(this.task.getResourceAllocations());
hoursGroupDAO.save(this.task.getHoursGroup());
reattachHoursGroup(this.task.getHoursGroup());
reattachCriterions(this.task.getHoursGroup().getCriterions());
}
private Task findFromDB(Task task) {
try {
return (Task) taskElementDAO.find(task.getId());
@ -223,11 +209,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
}
}
@Override
public void setGanttTask(org.zkoss.ganttz.data.Task ganttTask) {
this.ganttTask = ganttTask;
}
@Override
public void cancel() {
task.clearResourceAllocations();
@ -239,4 +220,19 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
taskElementDAO.save(task);
}
@Override
public void initAllocationsFor(Task task,
org.zkoss.ganttz.data.Task ganttTask) {
this.ganttTask = ganttTask;
if (!taskElementDAO.exists(task.getId())) {
this.task = task;
return;
}
this.task = findFromDB(task);
reattachResourceAllocations(this.task.getResourceAllocations());
hoursGroupDAO.save(this.task.getHoursGroup());
reattachHoursGroup(this.task.getHoursGroup());
reattachCriterions(this.task.getHoursGroup().getCriterions());
}
}