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

ItEr30S11CUVistaRecursosTempoEmpresaItEr29S13: Moved another shared method to LoadChartFiller.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-10-16 18:25:36 +02:00 • committed by Javier Moran Rua
parent 22da9b275a
commit c696c7bb2d
4 changed files with 28 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -285,7 +285,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
if (loadChartFiller.zoomByDay()) {
return map;
} else {
return groupByWeek(map);
return loadChartFiller.groupByWeek(map);
}
}
@ -314,31 +314,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
if (loadChartFiller.zoomByDay()) {
return map;
} else {
return groupByWeek(map);
return loadChartFiller.groupByWeek(map);
}
}
private SortedMap<LocalDate, Integer> groupByWeek(
SortedMap<LocalDate, Integer> map) {
SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
for (LocalDate day : map.keySet()) {
LocalDate key = loadChartFiller.getThursdayOfThisWeek(day);
if (result.get(key) == null) {
result.put(key, map.get(day));
} else {
result.put(key, result.get(key) + map.get(day));
}
}
for (LocalDate day : result.keySet()) {
result.put(day, result.get(day) / 7);
}
return result;
}
private org.zkoss.zk.ui.Component getChartLegend() {
Div div = new Div();

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

@ -48,6 +48,6 @@ public interface ILoadChartFiller {
boolean zoomByDay();
LocalDate getThursdayOfThisWeek(LocalDate date);
SortedMap<LocalDate, Integer> groupByWeek(SortedMap<LocalDate, Integer> map);
}

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

@ -25,6 +25,7 @@ import java.io.PrintWriter;
import java.util.Collections;
import java.util.Date;
import java.util.SortedMap;
import java.util.TreeMap;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@ -122,8 +123,7 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
}
}
@Override
public LocalDate getThursdayOfThisWeek(LocalDate date) {
private LocalDate getThursdayOfThisWeek(LocalDate date) {
return date.dayOfWeek().withMinimumValue().plusDays(DAYS_TO_THURSDAY);
}
@ -185,4 +185,26 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
return maximunValueForChart;
}
@Override
public SortedMap<LocalDate, Integer> groupByWeek(
SortedMap<LocalDate, Integer> map) {
SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
for (LocalDate day : map.keySet()) {
LocalDate key = getThursdayOfThisWeek(day);
if (result.get(key) == null) {
result.put(key, map.get(day));
} else {
result.put(key, result.get(key) + map.get(day));
}
}
for (LocalDate day : result.keySet()) {
result.put(day, result.get(day) / 7);
}
return result;
}
}

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

@ -420,31 +420,10 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
if (loadChartFiller.zoomByDay()) {
return map;
} else {
return groupByWeek(map);
return loadChartFiller.groupByWeek(map);
}
}
private SortedMap<LocalDate, Integer> groupByWeek(
SortedMap<LocalDate, Integer> map) {
SortedMap<LocalDate, Integer> result = new TreeMap<LocalDate, Integer>();
for (LocalDate day : map.keySet()) {
LocalDate key = loadChartFiller.getThursdayOfThisWeek(day);
if (result.get(key) == null) {
result.put(key, map.get(day));
} else {
result.put(key, result.get(key) + map.get(day));
}
}
for (LocalDate day : result.keySet()) {
result.put(day, result.get(day) / 7);
}
return result;
}
private org.zkoss.zk.ui.Component getChartLegend() {
Div div = new Div();