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

ItEr30S05RFComportamentoGraficoPlanificadorItEr23S12: Added timetracker and taskdetails headers in planner layout

Browse source
This commit is contained in:
Lorenzo Tilve 2009-10-14 09:10:05 +02:00 • committed by Javier Moran Rua
parent 8614b6f737
commit 195d910484
5 changed files with 103 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
View file

@ -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);

11
ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul
View file

@ -19,12 +19,11 @@
-->
<div>
<div height="22px"></div>
<tree id="tasksTree">
<treecols sizable="false">
<treecol label="Name"/>
<treecol label="Start"/>
<treecol label="End"/>
<tree id="tasksTree" fixedLayout="true">
<treecols sizable="false" width="300px" sclass="taskTreeCols">
<treecol label="Name" sclass="tree-text"/>
<treecol label="Start" sclass="tree-datecolumn"/>
<treecol label="End" sclass="tree-datecolumn"/>
</treecols>
</tree>
</div>

16
ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
View file

@ -35,15 +35,15 @@ planner = self;
splittable="true" autoscroll="true">
<borderlayout >
<north border="0" height="38px" flex="true" collapsible="true">
<north border="0" height="32px" flex="true" collapsible="true">
<vbox pack="center" align="center">
Task details column headers
<!-- tree fixedLayout="true">
<treecols>
<treecol label="Name" height="29px"/>
<tree fixedLayout="false">
<treecols sizable="false">
<treecol label="Name" height="32px" sclass="tree-text" />
<treecol label="Start" sclass="tree-datecolumn" />
<treecol label="End" sclass="tree-datecolumn" />
</treecols>
</tree-->
</tree>
</vbox>
</north>
<center border="0" style="overflow-x:scroll">
@ -54,7 +54,7 @@ planner = self;
<center sclass="taskspanel">
<borderlayout>
<north border="0"><div sclass="timetrackergap" height="33px" id="insertionPointTimetracker"></div></north>
<north border="0"><div sclass="timetrackergap" height="31px" id="insertionPointTimetracker"></div></north>
<center autoscroll="true" border="0" sclass="rightpanellayout">
<div id="insertionPointRightPanel" sclass="taskspanelgap"></div>
</center>

19
navalplanner-webapp/src/main/webapp/js/advanceAllocations.js
View file

@ -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 <http://www.gnu.org/licenses/>.
*/

63
navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
View file

@ -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;
}
}
#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;
}