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

ItEr28S12ClasificacionTraballoItEr27S12: Add isDeleted property to CriterionSatisfaction entity.

Browse source
This commit is contained in:
Susana Montes Pedreira 2009-10-01 16:03:00 +02:00 • committed by Javier Moran Rua
parent 5ffe3b53fd
commit ac1eb27c06
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java
View file

@ -100,6 +100,8 @@ public class CriterionSatisfaction extends BaseEntity {
private Resource resource;
private Boolean isDeleted = false;
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
@ -177,6 +179,14 @@ public class CriterionSatisfaction extends BaseEntity {
startDate = date;
}
public void setIsDeleted(boolean isDeleted) {
this.isDeleted = isDeleted;
}
public boolean isIsDeleted() {
return isDeleted == null ? false : isDeleted;
}
public boolean overlapsWith(Interval interval) {
return getInterval().overlapsWith(interval);
}

1
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java
View file

@ -220,7 +220,6 @@ public class CriterionTreeModel implements ICriterionTreeModel{
@Override
public void move(CriterionDTO toBeMoved, CriterionDTO destination,int position) {
if(isGreatInHierarchy(toBeMoved,destination)){
System.out.println("******************************* RETURN ********************************");
return;
}
if(criterionType.allowHierarchy()){