From 195d9104849a6519949fd55d7b8013d10f5030c2 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Wed, 14 Oct 2009 09:10:05 +0200 Subject: [PATCH] ItEr30S05RFComportamentoGraficoPlanificadorItEr23S12: Added timetracker and taskdetails headers in planner layout --- .../main/java/org/zkoss/ganttz/Planner.java | 14 +++++ .../web/ganttz/zul/leftTasksTree.zul | 11 ++-- .../web/ganttz/zul/plannerLayout.zul | 16 ++--- .../src/main/webapp/js/advanceAllocations.js | 19 ++++++ .../src/main/webapp/planner/css/ganttzk.css | 63 +++++++++++++++++-- 5 files changed, 103 insertions(+), 20 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 4d50358ad..03199dbe1 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -34,6 +34,8 @@ import org.zkoss.ganttz.extensions.ICommand; import org.zkoss.ganttz.extensions.ICommandOnTask; import org.zkoss.ganttz.extensions.IContext; import org.zkoss.ganttz.timetracker.TimeTracker; +import org.zkoss.ganttz.timetracker.TimeTrackerComponent; +import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns; import org.zkoss.ganttz.util.ComponentsFinder; import org.zkoss.ganttz.util.OnZKDesktopRegistry; import org.zkoss.ganttz.util.script.IScriptsRegister; @@ -154,6 +156,18 @@ public class Planner extends HtmlMacroComponent { setAt("insertionPointRightPanel", ganttPanel); ganttPanel.afterCompose(); + // TimeTrackerComponent timetrackerheader = (TimeTrackerComponent) + // ganttPanel + // .getTimeTrackerComponent().clone(); + // timetrackerheader.afterCompose(); + + TimeTrackerComponent timetrackerheader = new TimeTrackerComponentWithoutColumns( + ganttPanel +.getTimeTracker(), "timetrackerheader"); + + setAt("insertionPointTimetracker", timetrackerheader); + timetrackerheader.afterCompose(); + Component chartComponent = configuration.getChartComponent(); if (chartComponent != null) { setAt("insertionPointChart", chartComponent); diff --git a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul index bf72428c0..9eafa3579 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul @@ -19,12 +19,11 @@ -->
-
- - - - - + + + + +
\ No newline at end of file diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul index 3b67e4049..c7cc5095c 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul @@ -35,15 +35,15 @@ planner = self; splittable="true" autoscroll="true"> - + - Task details column headers - - +
@@ -54,7 +54,7 @@ planner = self;
-
+
diff --git a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js b/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js index e69de29bb..07350f679 100644 --- a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js +++ b/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js @@ -0,0 +1,19 @@ +/* + * This file is part of ###PROJECT_NAME### + * + * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e + * Desenvolvemento Tecnolóxico de Galicia + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index 51e350d3a..6f17ed04e 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -35,7 +35,6 @@ #listdetails_container { position: relative; - border-bottom: 1px solid #86A4BE; } .listdetails img { @@ -252,6 +251,10 @@ min-width:200px; border-collapse: collapse; } +#timetrackerheader table { + border-collapse: collapse; +} + #timetracker .second_level_ tr { height: 14px; } @@ -291,7 +294,7 @@ table { } #scroll_container { - margin-top: 47px; + margin-top: 0px; float: left; position: absolute; } @@ -465,6 +468,17 @@ tr.z-vbox-sep { margin: 0px; } +#ganttpanel #timetracker th { + display:none; +} +#ganttpanel #timetracker { + margin-top:-20px; +} + +#timetrackerheader table { + border-collapse: collapse; +} + .resourceloadleftpane div.z-tree-cell-cnt { paddding-top: 2px; border-bottom: 1px dotted #CCCCCC; @@ -507,8 +521,12 @@ tr.z-vbox-sep { position: relative; } -.taskdetails_name { - min-width: 150px; +.tree-datecolumn { + width: 100px; +} + +.tree-text { + width: 150px; } .listdetails div.z-tree-cell-cnt { @@ -524,7 +542,7 @@ div.z-tree { } .plannerlayout, .resourcesloadlayout, .advancedallocationlayout { - height:500px; + height:350px; } .task_tooltip { @@ -572,4 +590,37 @@ div.z-tree { .advancedallocationlayout .leftpanelgap input { height:19px; -} \ No newline at end of file +} + + +#tasksTree div.z-tree-header, #tasksTree div.z-tree-header tr, #tasksTree div.z-tree-footer { + overflow:visible; +} + +#listdetails_container div.z-tree-body, +#listdetails_container div.z-dottree-body, +#listdetails_container div.z-filetree-body, #listdetails_container div.z-vfiletree-body { + overflow:visible; +} + +.listdetails th { + display:visible; + margin-top:10px; +} +.listdetails { + position:relative; + top:-18px; +} + + +.plannerlayout div.z-tree, .plannerlayout div.z-grid { + border: 0; +} + +#timetrackerheader table { +height:15px; +} + +#timetrackerheader .z-grid-body { +display:none; +}