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

Fix problem in constraint only one work report line per day and task

Browse source 
It was checking only one work report line per day, but it should allow to have
several work report lines in the same day if they are for different tasks.

FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-06-05 17:32:52 +02:00
parent 342a1c32d2
commit ef19628690
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
View file

@ -23,7 +23,9 @@ package org.libreplan.business.workreports.entities;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
@ -468,19 +470,24 @@ public class WorkReport extends IntegrationEntity implements
return result;
}
@AssertTrue(message = "only one work report line per day is allowed in monthly timesheets")
public boolean checkConstraintOnlyOneWorkReportLinePerDayInMonthlyTimesheet() {
@AssertTrue(message = "only one work report line per day and task is allowed in monthly timesheets")
public boolean checkConstraintOnlyOneWorkReportLinePerDayAndOrderElementInMonthlyTimesheet() {
if (!getWorkReportType().isMonthlyTimesheetsType()) {
return true;
}
Set<LocalDate> days = new HashSet<LocalDate>();
Map<OrderElement, Set<LocalDate>> map = new HashMap<OrderElement, Set<LocalDate>>();
for (WorkReportLine line : workReportLines) {
OrderElement orderElement = line.getOrderElement();
if (map.get(orderElement) == null) {
map.put(orderElement, new HashSet<LocalDate>());
}
LocalDate date = LocalDate.fromDateFields(line.getDate());
if (days.contains(date)) {
if (map.get(orderElement).contains(date)) {
return false;
}
days.add(date);
map.get(orderElement).add(date);
}
return true;
}