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

ItEr31S12ValidacionEProbasFuncionaisItEr30S17: Added year margin to advanced resourceload allocation spreadsheet to fit graphical component width

Browse source 
* Pending to review behaviour with week granularity
This commit is contained in:
Lorenzo Tilve 2009-10-22 09:23:22 +02:00 • committed by Javier Moran Rua
parent 1966a5efb1
commit c8b02d6db1
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
View file

@ -44,7 +44,6 @@ import org.navalplanner.web.common.IMessagesForUser;
import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.ViewSwitcher;
import org.navalplanner.web.planner.allocation.AllocationResult;
import org.navalplanner.web.resourceload.ResourceLoadModel;
import org.zkoss.ganttz.timetracker.ICellForDetailItemRenderer;
import org.zkoss.ganttz.timetracker.IConvertibleToColumn;
@ -54,6 +53,8 @@ import org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane;
import org.zkoss.ganttz.timetracker.TimeTracker;
import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
import org.zkoss.ganttz.timetracker.zoom.DetailItem;
import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
import org.zkoss.ganttz.util.Interval;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
@ -229,17 +230,22 @@ public class AdvancedAllocationController extends GenericForwardComposer {
insertComponentsInLayout();
timeTrackerComponent.afterCompose();
table.afterCompose();
Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
}
private void createComponents() {
timeTracker = new TimeTracker(intervalFromData());
timeTracker = new TimeTracker(addYearMarginTointerval());
timeTrackerComponent = new TimeTrackerComponentWithoutColumns(
timeTracker, "timeTracker");
TimeTrackedTableWithLeftPane<Row, Row> timeTrackedTableWithLeftPane = new TimeTrackedTableWithLeftPane<Row, Row>(
getDataSource(), getColumnsForLeft(), getLeftRenderer(),
getRightRenderer(), timeTracker);
timeTracker.addZoomListener(new IZoomLevelChangedListener() {
@Override
public void zoomLevelChanged(ZoomLevel detailLevel) {
Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();");
}
});
table = timeTrackedTableWithLeftPane.getRightPane();
leftPane = timeTrackedTableWithLeftPane.getLeftPane();
}
@ -404,6 +410,13 @@ public class AdvancedAllocationController extends GenericForwardComposer {
}
}
private Interval addYearMarginTointerval() {
Interval interval = intervalFromData();
return new Interval(new DateTime(interval.getStart()).minusYears(1)
.toDate(), new DateTime(interval.getFinish()).plusYears(1)
.toDate());
}
private LocalDate getEnd(List<ResourceAllocation<?>> all) {
ArrayList<ResourceAllocation<?>> reversed = reverse(all);
LocalDate end = reversed.get(0).getEndDate();

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

@ -560,6 +560,17 @@ div.z-tree {
border-collapse: collapse;
}
.advancedallocationlayout .second_level_ th {
width:150px;
}
.advancedallocationlayout .taskspanelgap td.z-row-inner {
padding:0 !important;
}
.advancedallocationlayout .taskspanelgap td.z-row-inner input {
padding-top:2px;
padding-bottom:2px;
}
.taskspanelgap table {
border-collapse: collapse;
}