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

ItEr13S13CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballo: Added editable hours cell for leaf nodes at TaskWork tree.

Browse source 
Changed to Intbox the hours cell of TaskWork.
This commit is contained in:
Manuel Rego Casasnovas 2009-06-17 18:09:16 +02:00 • committed by Javier Moran Rua
parent b4ddc83377
commit 525dd65022
3 changed files with 77 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/workorders/entities/TaskWorkContainer.java
View file

@ -56,4 +56,14 @@ public class TaskWorkContainer extends TaskWork implements ITaskWorkContainer {
children.add(position, task);
}
@Override
public Integer getWorkHours() {
int result = 0;
List<TaskWork> children = getChildren();
for (TaskWork taskWork : children) {
result += taskWork.getWorkHours();
}
return result;
}
}

17
navalplanner-business/src/main/java/org/navalplanner/business/workorders/entities/TaskWorkLeaf.java
View file

@ -33,4 +33,21 @@ public class TaskWorkLeaf extends TaskWork {
public void replace(TaskWork old, TaskWork newTask) {
throw new UnsupportedOperationException();
}
public void setWorkHours(Integer workingHours) {
List<ActivityWork> activities = getActivities();
// FIXME For the moment we have just one activity for each TaksWorkLeaf
if (activities.isEmpty()) {
ActivityWork activity = new ActivityWork();
activity.setWorkingHours(workingHours);
activities.add(activity);
} else {
ActivityWork activity = activities.get(0);
activity.setWorkingHours(workingHours);
}
setActivities(activities);
}
}

50
navalplanner-webapp/src/main/java/org/navalplanner/web/workorders/TaskWorksTreeController.java
View file

@ -7,6 +7,7 @@ import java.util.Set;
import org.navalplanner.business.workorders.entities.ProjectWork;
import org.navalplanner.business.workorders.entities.TaskWork;
import org.navalplanner.business.workorders.entities.TaskWorkLeaf;
import org.navalplanner.web.common.Util;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.DropEvent;
@ -15,6 +16,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.InputEvent;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.SimpleTreeNode;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.Treecell;
@ -200,6 +202,28 @@ public class TaskWorksTreeController extends GenericForwardComposer {
return textBox;
}
private static Intbox bind(Intbox intBox, Getter<Integer> getter) {
intBox.setValue(getter.get());
intBox.setDisabled(true);
return intBox;
}
private static Intbox bind(final Intbox intBox,
final Getter<Integer> getter, final Setter<Integer> setter) {
intBox.setValue(getter.get());
intBox.addEventListener("onChange", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
InputEvent newInput = (InputEvent) event;
String value = newInput.getValue();
setter.set(Integer.valueOf(value));
intBox.setValue(getter.get());
}
});
return intBox;
}
private static Datebox bind(final Datebox dateBox,
final Getter<Date> getter, final Setter<Date> setter) {
dateBox.setValue(getter.get());
@ -244,13 +268,33 @@ public class TaskWorksTreeController extends GenericForwardComposer {
}
}));
Treecell cellForHours = new Treecell();
cellForHours.appendChild(bind(new Textbox(), new Getter<String>() {
if (taskWork instanceof TaskWorkLeaf) {
// If it's a leaf hours cell is editable
cellForHours.appendChild(bind(new Intbox(),
new Getter<Integer>() {
@Override
public String get() {
return taskWork.getWorkHours() + "";
public Integer get() {
return taskWork.getWorkHours();
}
}, new Setter<Integer>() {
@Override
public void set(Integer value) {
((TaskWorkLeaf) taskWork).setWorkHours(value);
}
}));
} else {
// If it's a container hours cell is not editable
cellForHours.appendChild(bind(new Intbox(),
new Getter<Integer>() {
@Override
public Integer get() {
return taskWork.getWorkHours();
}
}));
}
Treecell tcDateStart = new Treecell();
tcDateStart.appendChild(bind(new Datebox(), new Getter<Date>() {