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

ItEr34S16CUVistaRecursosTempoEmpresaItEr30S11: Moved method "groupDayAssignmentsByDayAndResource" to class LoadChartFiller.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-12 22:41:17 +01:00 • committed by Javier Moran Rua
parent 0e2ff0bec2
commit 8cc92cee0f
3 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -415,33 +415,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
return convertAsNeededByZoom(map);
}
private SortedMap<LocalDate, Map<Resource, Integer>> groupDayAssignmentsByDayAndResource(
List<DayAssignment> dayAssignments) {
SortedMap<LocalDate, Map<Resource, Integer>> map = new TreeMap<LocalDate, Map<Resource, Integer>>();
for (DayAssignment dayAssignment : dayAssignments) {
LocalDate day = dayAssignment.getDay();
if (map.get(day) == null) {
HashMap<Resource, Integer> resourcesMap = new HashMap<Resource, Integer>();
resourcesMap.put(dayAssignment.getResource(), dayAssignment
.getHours());
map.put(day, resourcesMap);
} else {
if (map.get(day).get(dayAssignment.getResource()) == null) {
map.get(day).put(dayAssignment.getResource(),
dayAssignment.getHours());
} else {
Integer hours = map.get(day).get(
dayAssignment.getResource());
hours += dayAssignment.getHours();
map.get(day).put(dayAssignment.getResource(), hours);
}
}
}
return map;
}
private Plotinfo getCalendarMaximumAvailabilityPlotInfo(Date start,
Date finish) {
SortedMap<LocalDate, Integer> mapDayAssignments = calculateHoursAdditionByDay(

10
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java
View file

@ -20,6 +20,13 @@
package org.navalplanner.web.planner.loadchart;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import org.joda.time.LocalDate;
import org.navalplanner.business.planner.entities.DayAssignment;
import org.navalplanner.business.resources.entities.Resource;
import org.zkforge.timeplot.Timeplot;
import org.zkforge.timeplot.geometry.TimeGeometry;
import org.zkforge.timeplot.geometry.ValueGeometry;
@ -41,4 +48,7 @@ public interface ILoadChartFiller {
ValueGeometry getValueGeometry(Integer maximum);
SortedMap<LocalDate, Map<Resource, Integer>> groupDayAssignmentsByDayAndResource(
List<DayAssignment> dayAssignments);
}

31
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
View file

@ -25,6 +25,9 @@ import java.io.PrintWriter;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.Map.Entry;
@ -347,4 +350,32 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
return valueGeometry;
}
@Override
public SortedMap<LocalDate, Map<Resource, Integer>> groupDayAssignmentsByDayAndResource(
List<DayAssignment> dayAssignments) {
SortedMap<LocalDate, Map<Resource, Integer>> map = new TreeMap<LocalDate, Map<Resource, Integer>>();
for (DayAssignment dayAssignment : dayAssignments) {
LocalDate day = dayAssignment.getDay();
if (map.get(day) == null) {
HashMap<Resource, Integer> resourcesMap = new HashMap<Resource, Integer>();
resourcesMap.put(dayAssignment.getResource(), dayAssignment
.getHours());
map.put(day, resourcesMap);
} else {
if (map.get(day).get(dayAssignment.getResource()) == null) {
map.get(day).put(dayAssignment.getResource(),
dayAssignment.getHours());
} else {
Integer hours = map.get(day).get(
dayAssignment.getResource());
hours += dayAssignment.getHours();
map.get(day).put(dayAssignment.getResource(), hours);
}
}
}
return map;
}
}