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

ItEr36S19CUCalculoValorGanado: Removed chart legend, because of it is going to be part of the "insertionPointChart".

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-26 21:28:59 +01:00 • committed by Javier Moran Rua
parent 68a0634407
commit 1b59b4fdb1
5 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,10 +175,6 @@ public class Planner extends HtmlMacroComponent {
setAt("insertionPointChart", chartComponent);
}
Component chartLegend = configuration.getChartLegend();
if (chartLegend != null) {
setAt("insertionPointChartLegend", chartLegend);
}
}
private void setAt(String insertionPointId, Component component) {

10
ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java
View file

@ -84,8 +84,6 @@ public class PlannerConfiguration<T> implements IDisabilityConfiguration {
private Component chartComponent;
private Component chartLegend;
private boolean addingDependenciesEnabled = true;
private boolean movingTasksEnabled = true;
@ -166,14 +164,6 @@ public class PlannerConfiguration<T> implements IDisabilityConfiguration {
return chartComponent;
}
public void setChartLegend(Component chartLegend) {
this.chartLegend = chartLegend;
}
public Component getChartLegend() {
return chartLegend;
}
public void setAddingDependenciesEnabled(boolean addingDependenciesEnabled) {
this.addingDependenciesEnabled = addingDependenciesEnabled;
}

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

@ -66,12 +66,6 @@ planner = self;
</center>
<south height="150px" collapsible="true" title="Resources load graph">
<borderlayout>
<west width="284px" flex="true" collapsible="true"
splittable="true" sclass="legend-gap">
<vbox pack="center" align="center">
<div id="insertionPointChartLegend" />
</vbox>
</west>
<center sclass="plannergraph">
<vbox>
<div id="insertionPointChart" />

13
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -69,8 +69,6 @@ import org.zkoss.ganttz.timetracker.TimeTracker;
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.Executions;
import org.zkoss.zul.Div;
/**
@ -128,8 +126,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
disableSomeFeatures(configuration);
configuration.setChartLegend(getChartLegend());
planner.setConfiguration(configuration);
setupChart(chartComponent, planner.getTimeTracker());
@ -255,15 +251,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
// spring method injection
protected abstract ITaskElementAdapter getTaskElementAdapter();
private org.zkoss.zk.ui.Component getChartLegend() {
Div div = new Div();
Executions.createComponents("/planner/_legendCompanyPlanner.zul", div,
null);
return div;
}
private class CompanyLoadChartFiller extends LoadChartFiller {
@Override

13
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -73,8 +73,6 @@ import org.zkoss.ganttz.timetracker.TimeTracker;
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.Executions;
import org.zkoss.zul.Div;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
@ -144,8 +142,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
Timeplot chartComponent = new Timeplot();
configuration.setChartComponent(chartComponent);
configuration.setChartLegend(getChartLegend());
planner.setConfiguration(configuration);
LoadChart loadChart = setupChart(orderReloaded, chartComponent, planner
@ -321,15 +317,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
}
}
private org.zkoss.zk.ui.Component getChartLegend() {
Div div = new Div();
Executions.createComponents("/planner/_legendOrderPlanner.zul", div,
null);
return div;
}
private class OrderLoadChartFiller extends LoadChartFiller {
private final Order order;