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

ItEr55S11RFAspectosGraficosRecursoLimitantesItEr54S12: Created LimitingResource Model

Browse source
This commit is contained in:
Lorenzo Tilve 2010-04-26 09:45:19 +02:00 • committed by Javier Moran Rua
parent a5e631e548
commit 87b9b7c0d5
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -194,7 +194,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
if (filter()) {
return resourcesForActiveTasks();
} else {
return allResources();
return allLimitingResources();
}
}
@ -218,8 +218,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
return result;
}
private List<Resource> allResources() {
// return Resource.sortByName(resourcesDAO.list(Resource.class));
private List<Resource> allLimitingResources() {
return Resource.sortByName(resourcesDAO.getAllLimitingResources());
}

17
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
View file

@ -29,7 +29,6 @@ import java.util.List;
import org.apache.commons.lang.Validate;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.web.planner.order.BankHolidaysMarker;
import org.navalplanner.web.resourceload.IResourceLoadModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -43,7 +42,7 @@ import org.zkoss.zk.ui.util.Composer;
import org.zkoss.zul.Messagebox;
/**
* Controller for global limitingresources view
* Controller for limiting resources view
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
*/
@Component
@ -51,7 +50,7 @@ import org.zkoss.zul.Messagebox;
public class LimitingResourcesController implements Composer {
@Autowired
private IResourceLoadModel resourceLoadModel;
private ILimitingResourceQueueModel limitingResourceQueueModel;
private List<IToolbarCommand> commands = new ArrayList<IToolbarCommand>();
@ -88,9 +87,10 @@ public class LimitingResourcesController implements Composer {
private void reload(boolean filterByResources) {
try {
if (filterBy == null) {
resourceLoadModel.initGlobalView(filterByResources);
limitingResourceQueueModel.initGlobalView(filterByResources);
} else {
resourceLoadModel.initGlobalView(filterBy, filterByResources);
limitingResourceQueueModel.initGlobalView(filterBy,
filterByResources);
}
timeTracker = buildTimeTracker();
limitingResourcesPanel = buildLimitingResourcesPanel();
@ -131,14 +131,15 @@ public class LimitingResourcesController implements Composer {
}
private TimeTracker buildTimeTracker() {
return timeTracker = new TimeTracker(resourceLoadModel
.getViewInterval(), resourceLoadModel
return timeTracker = new TimeTracker(limitingResourceQueueModel
.getViewInterval(), limitingResourceQueueModel
.calculateInitialZoomLevel(), SeveralModificators.create(),
SeveralModificators.create(new BankHolidaysMarker()), parent);
}
private LimitingResourcesPanel buildLimitingResourcesPanel() {
return new LimitingResourcesPanel(resourceLoadModel.getLoadTimeLines(),
return new LimitingResourcesPanel(limitingResourceQueueModel
.getLoadTimeLines(),
timeTracker);
}