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

fixes the functions which are used to check out if the cost category and

Browse source 
the hour cost are active in the specified work report line.

FEA: ItEr76S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2012-06-06 11:25:45 +01:00
parent 193a4315b7
commit e06ebb6c4c
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/CostCategoryDAO.java
View file

@ -102,8 +102,7 @@ public class CostCategoryDAO extends IntegrationEntityDAO<CostCategory>
for (ResourcesCostCategoryAssignment each : resource
.getResourcesCostCategoryAssignments()) {
if ((date.isAfter(each.getInitDate()))
&& (!date.isBefore(each.getInitDate()))) {
if (each.isActiveAtDate(date)) {
for (HourCost hourCost : each.getCostCategory().getHourCosts()) {
if (hourCost.isActiveAtDate(date)
&& hourCost.getType().getCode().equals(type)) {

11
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java
View file

@ -136,13 +136,20 @@ public class HourCost extends IntegrationEntity {
}
public boolean isActiveAtDate(LocalDate date) {
if ((date.isAfter(this.getInitDate()))
&& (!date.isBefore(this.getInitDate()))) {
if (isEqualOrAfter(date) && isEqualOrBefore(date)) {
return true;
}
return false;
}
private boolean isEqualOrAfter(LocalDate date) {
return (!date.isBefore(this.getInitDate()));
}
private boolean isEqualOrBefore(LocalDate date) {
return (this.getEndDate() == null || !date.isAfter(this.getEndDate()));
}
@AssertTrue(message="The end date cannot be before the init date")
public boolean checkPositiveTimeInterval() {
if (initDate == null) {

14
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java
View file

@ -168,4 +168,18 @@ public class ResourcesCostCategoryAssignment extends IntegrationEntity {
return Registry.getResourcesCostCategoryAssignmentDAO();
}
public boolean isActiveAtDate(LocalDate date) {
if (isEqualOrAfter(date) && isEqualOrBefore(date)) {
return true;
}
return false;
}
private boolean isEqualOrAfter(LocalDate date) {
return (!date.isBefore(this.getInitDate()));
}
private boolean isEqualOrBefore(LocalDate date) {
return (this.getEndDate() == null || !date.isAfter(this.getEndDate()));
}
}