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

ItEr28S07CUVistaRecursosTempoPorProxectoItEr27S08: Fixing bug at view of resource load when there are no assignments yet

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-01 23:07:31 +02:00
parent 514dfea42f
commit b3ceb7a70d
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimelinesGroup.java
View file

@ -32,6 +32,7 @@ import org.zkoss.ganttz.util.Interval;
public class LoadTimelinesGroup {
public static Interval getIntervalFrom(List<LoadTimelinesGroup> timeLines) {
Validate.notEmpty(timeLines);
LocalDate start = null;
LocalDate end = null;
for (LoadTimelinesGroup loadTimelinesGroup : timeLines) {

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

@ -24,6 +24,8 @@ import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
@ -66,7 +68,18 @@ public class ResourceLoadModel implements IResourceLoadModel {
@Transactional(readOnly = true)
public void initGlobalView() {
loadTimeLines = calculateLoadTimelinesGroups();
viewInterval = LoadTimelinesGroup.getIntervalFrom(loadTimeLines);
if (!loadTimeLines.isEmpty()) {
viewInterval = LoadTimelinesGroup.getIntervalFrom(loadTimeLines);
} else {
viewInterval = new Interval(new Date(), plusFiveYears(new Date()));
}
}
private Date plusFiveYears(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.YEAR, 5);
return calendar.getTime();
}
private List<LoadTimelinesGroup> calculateLoadTimelinesGroups() {