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

Provide PlanningState to ResourceLoadModel

Browse source 
FEA: ItEr75S11PreventLooseChanges
This commit is contained in:
Óscar González Fernández 2011-07-20 16:12:50 +02:00
parent 561ad86a4a
commit 7638720136
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/IResourceLoadModel.java
View file

@ -29,6 +29,7 @@ import org.navalplanner.business.planner.entities.DayAssignment;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.web.planner.order.PlanningStateCreator.PlanningState;
import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
import org.zkoss.ganttz.util.Interval;
@ -37,7 +38,7 @@ public interface IResourceLoadModel {
void initGlobalView(boolean filterByResources);
void initGlobalView(Order filterBy, boolean filterByResources);
void initGlobalView(PlanningState filterBy, boolean filterByResources);
List<LoadTimeLine> getLoadTimeLines();

12
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -31,10 +31,10 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.Map.Entry;
import org.apache.commons.lang.Validate;
import org.joda.time.LocalDate;
@ -56,6 +56,8 @@ import org.navalplanner.web.planner.chart.ChartFiller;
import org.navalplanner.web.planner.company.CompanyPlanningModel;
import org.navalplanner.web.planner.order.BankHolidaysMarker;
import org.navalplanner.web.planner.order.IOrderPlanningGate;
import org.navalplanner.web.planner.order.PlanningStateCreator;
import org.navalplanner.web.planner.order.PlanningStateCreator.PlanningState;
import org.navalplanner.web.security.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
@ -114,10 +116,13 @@ public class ResourceLoadController implements Composer {
private List<IToolbarCommand> commands = new ArrayList<IToolbarCommand>();
private Order filterBy;
private PlanningState filterBy;
private org.zkoss.zk.ui.Component parent;
@Autowired
private PlanningStateCreator planningStateCreator;
private ResourcesLoadPanel resourcesLoadPanel;
private TimeTracker timeTracker;
@ -490,7 +495,8 @@ public class ResourceLoadController implements Composer {
}
public void filterBy(Order order) {
this.filterBy = order;
this.filterBy = order == null ? null : planningStateCreator
.retrieveOrCreate(parent.getDesktop(), order);
}
public void setPlanningControllerEntryPoints(

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -68,6 +68,7 @@ import org.navalplanner.business.users.entities.OrderAuthorizationType;
import org.navalplanner.business.users.entities.User;
import org.navalplanner.business.users.entities.UserRole;
import org.navalplanner.web.calendars.BaseCalendarModel;
import org.navalplanner.web.planner.order.PlanningStateCreator.PlanningState;
import org.navalplanner.web.security.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
@ -162,9 +163,8 @@ public class ResourceLoadModel implements IResourceLoadModel {
@Override
@Transactional(readOnly = true)
public void initGlobalView(Order filterBy, boolean filterByResources) {
this.filterBy = orderDAO.findExistingEntity(filterBy.getId());
this.filterBy.useSchedulingDataFor(scenarioManager.getCurrent());
public void initGlobalView(PlanningState filterBy, boolean filterByResources) {
this.filterBy = filterBy.getOrder();
this.filterByResources = filterByResources;
doGlobalView();
}