From d97bc603d7c052a3464b859b10201cefad701e8c Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Tue, 30 Jun 2009 20:31:08 +0200 Subject: [PATCH] ItEr14S13RFComportamentoGraficoPlanificador: Adjust scroll positions and sizes based on screen size recalculated with javascript * Two separate vertical and horizontal scrollbars have been defined to be positioned permanently on the navigator right and bottom window borders. * Taskdetails and timetracker legend are now permanently shown while scrolling. * Pending fixes on watermark height recalculation. * Delete/add task behaviour to be reviewed unless changed for a tree. --- .../java/org/zkoss/ganttz/ListDetails.java | 13 +- .../resources/web/ganttz/dependencylist.dsp | 2 + .../main/resources/web/ganttz/ganttpanel.dsp | 9 +- .../src/main/resources/web/ganttz/planner.dsp | 2 +- .../main/resources/web/ganttz/tasklist.dsp | 2 +- .../resources/web/ganttz/zul/listdetails.zul | 13 +- .../resources/web/ganttz/zul/taskdetail.zul | 2 +- .../resources/web/ganttz/zul/timetracker.zul | 10 +- .../src/main/resources/web/js/ganttz/task.js | 30 ++-- .../main/resources/web/js/ganttz/tasklist.js | 80 ++++++++- .../web/planner/DataForPlanner.java | 2 +- .../main/webapp/common/layout/template.zul | 2 +- .../main/webapp/orders/_orderElementTree.zul | 1 - .../planner/css/productionmanagement.css | 162 +++++++++++++----- .../src/main/webapp/planner/main.zul | 2 +- 15 files changed, 257 insertions(+), 75 deletions(-) diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java index 95858f9d4..d711121f3 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java @@ -7,6 +7,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.zkoss.ganttz.util.TaskBean; +import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.HtmlMacroComponent; public class ListDetails extends HtmlMacroComponent { @@ -26,7 +27,7 @@ public class ListDetails extends HtmlMacroComponent { } private List getTaskDetails() { - List children = getChildren(); + List children = getInsertionPoint().getChildren(); return Planner.findComponentsOfType(TaskDetail.class, children); } @@ -42,7 +43,7 @@ public class ListDetails extends HtmlMacroComponent { } private void removeDetail(TaskDetail taskDetail) { - getChildren().remove(taskDetail); + getInsertionPoint().getChildren().remove(taskDetail); } public void addTask() { @@ -73,9 +74,13 @@ public class ListDetails extends HtmlMacroComponent { private TaskDetail addTask(TaskBean taskBean) { TaskDetail taskDetail = TaskDetail.create(taskBean); - appendChild(taskDetail); + getInsertionPoint().appendChild(taskDetail); taskDetail.afterCompose(); return taskDetail; } -} + private Component getInsertionPoint() { + return getFellow("insertionPoint"); + } + +} \ No newline at end of file diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependencylist.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependencylist.dsp index 93adbb27c..a0b69ef25 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependencylist.dsp +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/dependencylist.dsp @@ -11,4 +11,6 @@ + + \ No newline at end of file diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp index a92e16668..9adad452d 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/ganttpanel.dsp @@ -9,4 +9,11 @@ ${z:redraw(child, null)} - \ No newline at end of file + + +
+ +
+
+
+
\ No newline at end of file diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/planner.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/planner.dsp index d4952d2b7..ebe4ea885 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/planner.dsp +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/planner.dsp @@ -9,7 +9,7 @@ /*]]> */ -
+
${z:redraw(child, null)} diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp b/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp index 71000e598..0e96976ea 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/tasklist.dsp @@ -28,7 +28,7 @@ document.body.class = "yui-skin-sam"; var myLogReader = new YAHOO.widget.LogReader(myContainer);*/ - +
diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/listdetails.zul b/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/listdetails.zul index 8bb7f0316..ce43eaf23 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/listdetails.zul +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/listdetails.zul @@ -1,6 +1,9 @@ - -