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

Fix bug create or edit resource should start on first tab

Browse source 
FEA: ItEr70S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-02-21 10:21:53 +01:00
parent d08a768e98
commit de1d37ee61
1 changed files with 50 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,6 +133,12 @@ public class WorkerCRUDController extends GenericForwardComposer implements
private boolean isEditingWorkes;
private Tab personalDataTab;
private Tab assignedCriteriaTab;
private Tab costCategoryAssignmentTab;
public WorkerCRUDController() {
}
@ -215,17 +221,20 @@ public class WorkerCRUDController extends GenericForwardComposer implements
}
private void validateConstraints() {
Tab tab = (Tab) editWindow.getFellowIfAny("personalDataTab");
Tab selectedTab = personalDataTab;
try {
validatePersonalDataTab();
tab = (Tab) editWindow.getFellowIfAny("assignedCriteriaTab");
criterionsController.validateConstraints();
tab = (Tab) editWindow.getFellowIfAny("costCategoryAssignmentTab");
resourcesCostCategoryAssignmentController.validateConstraints();
selectedTab = assignedCriteriaTab;
validateAssignedCriteriaTab();
selectedTab = costCategoryAssignmentTab;
validateCostCategoryAssigmentTab();
//TODO: check 'calendar' tab
}
catch(WrongValueException e) {
tab.setSelected(true);
catch (WrongValueException e) {
selectedTab.setSelected(true);
throw e;
}
}
@ -234,6 +243,14 @@ public class WorkerCRUDController extends GenericForwardComposer implements
ConstraintChecker.isValid(editWindow.getFellowIfAny("personalDataTabpanel"));
}
private void validateAssignedCriteriaTab() {
criterionsController.validateConstraints();
}
private void validateCostCategoryAssigmentTab() {
resourcesCostCategoryAssignmentController.validateConstraints();
}
public void cancel() {
goToList();
}
@ -245,16 +262,15 @@ public class WorkerCRUDController extends GenericForwardComposer implements
public void goToEditForm(Worker worker) {
setEditingWorkes(true);
getBookmarker().goToEditForm(worker);
workerModel.prepareEditFor(worker);
resourcesCostCategoryAssignmentController.setResource(workerModel.getWorker());
if (isCalendarNotNull()) {
editCalendar();
}
editAsignedCriterions();
editWindow.setTitle(_("Edit Worker"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
getBookmarker().goToEditForm(worker);
workerModel.prepareEditFor(worker);
resourcesCostCategoryAssignmentController.setResource(workerModel
.getWorker());
if (isCalendarNotNull()) {
editCalendar();
}
editAsignedCriterions();
showEditWindow(_("Edit Worker"));
}
public void goToEditVirtualWorkerForm(Worker worker) {
@ -266,9 +282,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
editCalendar();
}
editAsignedCriterions();
editWindow.setTitle(_("Edit Virtual Workers Group"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
showEditWindow(_("Edit Virtual Workers Group"));
}
public void goToEditForm() {
@ -276,9 +290,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
if (isCalendarNotNull()) {
editCalendar();
}
editWindow.setTitle(_("Edit Worker"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
showEditWindow(_("Edit Worker"));
}
public void goToCreateForm() {
@ -288,10 +300,15 @@ public class WorkerCRUDController extends GenericForwardComposer implements
createAsignedCriterions();
resourcesCostCategoryAssignmentController.setResource(workerModel
.getWorker());
editWindow.setTitle(_("Create Worker"));
showEditWindow(_("Create Worker"));
resourceCalendarModel.cancel();
}
private void showEditWindow(String title) {
personalDataTab.setSelected(true);
editWindow.setTitle(title);
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
resourceCalendarModel.cancel();
}
@Override
@ -314,6 +331,13 @@ public class WorkerCRUDController extends GenericForwardComposer implements
getVisibility().showOnly(listWindow);
initFilterComponent();
setupFilterLimitingResourceListbox();
initializeTabs();
}
private void initializeTabs() {
personalDataTab = (Tab) editWindow.getFellow("personalDataTab");
assignedCriteriaTab = (Tab) editWindow.getFellow("assignedCriteriaTab");
costCategoryAssignmentTab = (Tab) editWindow.getFellow("costCategoryAssignmentTab");
}
private void initFilterComponent() {
@ -531,9 +555,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
createAsignedCriterions();
resourcesCostCategoryAssignmentController.setResource(workerModel
.getWorker());
editWindow.setTitle(_("Create Virtual Workers Group"));
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
showEditWindow(_("Create Virtual Workers Group"));
resourceCalendarModel.cancel();
}