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

ItEr41S16ImplantacionAplicacionItEr40S21: [Bug #53] Fixed problem with calendars creating new resources.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-12-29 14:08:35 +01:00 • committed by Javier Moran Rua
parent d1bddfa6a2
commit 430ce0535d
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
View file

@ -148,6 +148,7 @@ public class MachineCRUDController extends GenericForwardComposer {
resourcesCostCategoryAssignmentController.setResource(machineModel.getMachine());
selectMachineDataTab();
showEditWindow(_("Create machine"));
resourceCalendarModel.cancel();
}
private void showEditWindow(String title) {
@ -349,9 +350,11 @@ public class MachineCRUDController extends GenericForwardComposer {
@Override
public void save() {
machineModel
.setCalendarOfMachine((ResourceCalendar) resourceCalendarModel
.getBaseCalendar());
ResourceCalendar calendar = (ResourceCalendar) resourceCalendarModel
.getBaseCalendar();
if (calendar != null) {
machineModel.setCalendarOfMachine(calendar);
}
reloadWindow();
}

31
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
View file

@ -223,16 +223,15 @@ public class WorkerCRUDController extends GenericForwardComposer implements
}
public void goToCreateForm() {
getBookmarker().goToCreateForm();
workerModel.prepareForCreate();
if (workerModel.getCalendar() == null) {
createCalendar();
}
createAsignedCriterions();
resourcesCostCategoryAssignmentController.setResource(workerModel.getWorker());
editWindow.setTitle(_("Create Worker"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
getBookmarker().goToCreateForm();
workerModel.prepareForCreate();
createAsignedCriterions();
resourcesCostCategoryAssignmentController.setResource(workerModel
.getWorker());
editWindow.setTitle(_("Create Worker"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
resourceCalendarModel.cancel();
}
@Override
@ -403,9 +402,11 @@ public class WorkerCRUDController extends GenericForwardComposer implements
@Override
public void save() {
Integer capacity = workerModel.getCapacity();
workerModel
.setCalendar((ResourceCalendar) resourceCalendarModel
.getBaseCalendar());
ResourceCalendar calendar = (ResourceCalendar) resourceCalendarModel
.getBaseCalendar();
if (calendar != null) {
workerModel.setCalendar(calendar);
}
reloadCurrentWindow();
workerModel.setCapacity(capacity);
}
@ -442,15 +443,13 @@ public class WorkerCRUDController extends GenericForwardComposer implements
public void goToCreateVirtualWorkerForm() {
workerModel.prepareForCreate(true);
if (workerModel.getCalendar() == null) {
createCalendar();
}
createAsignedCriterions();
resourcesCostCategoryAssignmentController.setResource(workerModel
.getWorker());
editWindow.setTitle(_("Create virtual resource"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
resourceCalendarModel.cancel();
}
public boolean isVirtualWorker() {