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

ItEr23S10CUAsignacionGrupoRecursosAPlanificacionItEr22S10: Moving timetracker related classes to its own package

Browse source
This commit is contained in:
Óscar González Fernández 2009-08-26 11:28:22 +02:00
parent 9820644ac7
commit 5f84ba3391
15 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
View file

@ -10,6 +10,8 @@ import org.apache.commons.logging.LogFactory;
import org.zkoss.ganttz.data.Dependency;
import org.zkoss.ganttz.data.DependencyType;
import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
import org.zkoss.ganttz.util.MenuBuilder;
import org.zkoss.ganttz.util.MenuBuilder.ItemAction;
import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;

1
ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
View file

@ -21,6 +21,7 @@ import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.data.TaskContainer;
import org.zkoss.ganttz.data.TaskLeaf;
import org.zkoss.ganttz.extensions.IContext;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.util.Interval;
import org.zkoss.ganttz.util.zoom.TimeTrackerState;
import org.zkoss.zk.ui.Component;

2
ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java
View file

@ -3,6 +3,8 @@ package org.zkoss.ganttz;
import java.util.List;
import org.zkoss.ganttz.data.GanttDiagramGraph;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
import org.zkoss.zk.au.out.AuInvoke;
import org.zkoss.zk.ui.ext.AfterCompose;
import org.zkoss.zul.impl.XulElement;

2
ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
View file

@ -11,6 +11,8 @@ import org.zkoss.ganttz.data.Dependency;
import org.zkoss.ganttz.data.DependencyType;
import org.zkoss.ganttz.data.Position;
import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
import org.zkoss.ganttz.util.MenuBuilder;
import org.zkoss.ganttz.util.MenuBuilder.ItemAction;
import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;

2
ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java
View file

@ -1,8 +1,8 @@
package org.zkoss.ganttz.extensions;
import org.zkoss.ganttz.TimeTracker;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.data.Position;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.zk.ui.Component;
/**

2
ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java
View file

@ -1,9 +1,9 @@
package org.zkoss.ganttz.extensions;
import org.zkoss.ganttz.TimeTracker;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.data.Position;
import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.zk.ui.Component;
/**

2
ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java
View file

@ -2,12 +2,12 @@ package org.zkoss.ganttz.extensions;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.TaskComponent;
import org.zkoss.ganttz.TimeTracker;
import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties;
import org.zkoss.ganttz.adapters.IStructureNavigator;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.data.Position;
import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.zk.ui.Component;
/**

2
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
View file

@ -5,9 +5,9 @@ import java.util.List;
import org.joda.time.LocalDate;
import org.zkoss.ganttz.IDatesMapper;
import org.zkoss.ganttz.TimeTracker;
import org.zkoss.ganttz.data.resourceload.LoadPeriod;
import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
import org.zkoss.ganttz.util.zoom.ZoomLevel;
import org.zkoss.zul.Div;

2
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
View file

@ -3,9 +3,9 @@ package org.zkoss.ganttz.resourceload;
import java.util.ArrayList;
import java.util.List;
import org.zkoss.ganttz.TimeTracker;
import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
import org.zkoss.ganttz.data.resourceload.LoadTimelinesGroup;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
import org.zkoss.ganttz.util.zoom.ZoomLevel;
import org.zkoss.zk.au.out.AuInvoke;

4
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
View file

@ -3,9 +3,9 @@ package org.zkoss.ganttz.resourceload;
import java.util.List;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.TimeTracker;
import org.zkoss.ganttz.TimeTrackerComponent;
import org.zkoss.ganttz.data.resourceload.LoadTimelinesGroup;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
import org.zkoss.zk.au.out.AuInvoke;
import org.zkoss.zk.ui.ext.AfterCompose;
import org.zkoss.zul.impl.XulElement;

4
ganttzk/src/main/java/org/zkoss/ganttz/TimeTracker.java → ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java
View file

@ -1,4 +1,4 @@
package org.zkoss.ganttz;
package org.zkoss.ganttz.timetracker;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@ -6,6 +6,8 @@ import java.util.Collection;
import java.util.Date;
import org.joda.time.LocalDate;
import org.zkoss.ganttz.DatesMapperOnInterval;
import org.zkoss.ganttz.IDatesMapper;
import org.zkoss.ganttz.data.Task;
import org.zkoss.ganttz.util.Interval;
import org.zkoss.ganttz.util.WeakReferencedListeners;

2
ganttzk/src/main/java/org/zkoss/ganttz/TimeTrackerComponent.java → ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
View file

@ -1,4 +1,4 @@
package org.zkoss.ganttz;
package org.zkoss.ganttz.timetracker;
import java.util.Collection;

4
ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
View file

@ -127,8 +127,8 @@
<component>
<component-name>timetracker</component-name>
<component-class>org.zkoss.ganttz.TimeTrackerComponent</component-class>
<macro-uri>~./ganttz/zul/timetracker.zul</macro-uri>
<component-class>org.zkoss.ganttz.timetracker.TimeTrackerComponent</component-class>
<macro-uri>~./ganttz/zul/timetracker/timetracker.zul</macro-uri>
</component>
</language-addon>

0
ganttzk/src/main/resources/web/ganttz/zul/timetracker.zul → ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetracker.zul
View file

30
ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul Normal file
View file

@ -0,0 +1,30 @@
<zk xmlns:n="http://www.zkoss.org/2005/zk/native">
<n:div class="z-grid-header">
<n:table style="width: ${top.horizontalSize+2}px;" class="second_level_">
<n:tr class="z-columns">
<n:th class="z-column" forEach="${top.detailsSecondLevel}"
style="width: ${each.size}px">
${each.name}
</n:th>
</n:tr>
<n:tr id="watermark" style="height:100px">
<n:td class="timetracker_column${((each.even and (top.zoomLevel != 'DETAIL_FOUR'))?'_even':'')}
${(each.bankHoliday?'bankHoliday':'')}
${(each.currentPeriod?'timetracker_column_today':'')}"
forEach="${top.detailsSecondLevel}"
style="background-position: ${each.currentDayOffset}px">
<n:table class="week_element" width="100%" height="100%" if="${top.zoomLevel == 'DETAIL_FOUR'}">
<n:tr>
<n:td/><n:td/><n:td/><n:td/><n:td/>
<n:td class="weekend" />
<n:td class="weekend" />
</n:tr>
</n:table>
</n:td>
</n:tr>
</n:table>
</n:div>
</zk>