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

ItEr29S13CUVistaRecursosTempoEmpresa: Using TimeTracker interval to draw the chart.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-10-06 16:03:04 +02:00 • committed by Javier Moran Rua
parent 4a4ba53c8e
commit 771f6f161a
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
View file

@ -24,6 +24,7 @@ import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.common.ViewSwitcher;
import org.navalplanner.web.planner.allocation.ResourceAllocationController;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
/**
@ -33,6 +34,8 @@ public interface IOrderPlanningModel {
public interface IConfigurationOnTransaction {
public void use(PlannerConfiguration<TaskElement> configuration);
public Planner getPlannerBeingConfigured();
}
void createConfiguration(Order order, ViewSwitcher viewSwitcher,

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
View file

@ -98,6 +98,11 @@ public class OrderPlanningController implements
public void use(PlannerConfiguration<TaskElement> configuration) {
planner.setConfiguration(configuration);
}
@Override
public Planner getPlannerBeingConfigured() {
return planner;
}
});
}

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

@ -48,8 +48,10 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.adapters.IStructureNavigator;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.util.Interval;
import org.zkoss.zul.Chart;
import org.zkoss.zul.SimpleXYModel;
import org.zkoss.zul.XYModel;
@ -131,9 +133,32 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
.setCalendarAllocationController(calendarAllocationController);
configuration.addCommandOnTask(calendarAllocationCommand);
configuration.setChartComponent(getChartComponent(orderReloaded));
Chart chartComponent = new Chart();
configuration.setChartComponent(chartComponent);
onTransaction.use(configuration);
withChartFilling(onTransaction, orderReloaded, chartComponent).use(
configuration);
}
private IConfigurationOnTransaction withChartFilling(
final IConfigurationOnTransaction onTransaction,
final Order order,
final Chart chartComponent) {
return new IConfigurationOnTransaction() {
@Override
public Planner getPlannerBeingConfigured() {
return onTransaction.getPlannerBeingConfigured();
}
@Override
public void use(PlannerConfiguration<TaskElement> configuration) {
onTransaction.use(configuration);
Planner planner = getPlannerBeingConfigured();
Interval interval = planner.getTimeTracker().getRealInterval();
fillChart(order, chartComponent, interval);
}
};
}
private PlannerConfiguration<TaskElement> createConfiguration(
@ -225,19 +250,16 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
}
}
private Chart getChartComponent(Order order) {
private void fillChart(Order order, Chart chart, Interval interval) {
XYModel xymodel = new SimpleXYModel();
addLoad(order, xymodel);
addCalendarMaximumAvailability(order, xymodel);
Chart chart = new Chart();
chart.setType("time_series");
chart.setWidth("1600px");
chart.setHeight("175px");
chart.setModel(xymodel);
return chart;
}
private void addLoad(Order order, XYModel xymodel) {