diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java index 7ac48b7f5..ec5defa26 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java @@ -150,7 +150,7 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { @Override public void remove(CriterionSatisfactionDTO criterionSatisfactionDTO){ - if(criterionSatisfactionDTO.isIsNewObject()){ + if(criterionSatisfactionDTO.isNewObject()){ criterionSatisfactionDTOs.remove(criterionSatisfactionDTO); }else{ criterionSatisfactionDTO.setIsDeleted(true); @@ -309,7 +309,7 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { Set newList = new HashSet(); for(CriterionSatisfactionDTO satisfactionDTO :criterionSatisfactionDTOs){ CriterionSatisfaction satisfaction; - if(satisfactionDTO.isIsNewObject()){ + if(satisfactionDTO.isNewObject()){ Criterion criterion = satisfactionDTO.getCriterionWithItsType().getCriterion(); Interval interval = satisfactionDTO.getInterval(); satisfaction = CriterionSatisfaction.create(criterion, worker, interval); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java index 816e0d5dc..6f87dc2c8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java @@ -5,12 +5,12 @@ package org.navalplanner.web.resources.worker; -import java.util.Calendar; -import java.util.Comparator; import java.util.Date; + import org.hibernate.validator.NotNull; -import org.navalplanner.business.resources.entities.CriterionSatisfaction; +import org.navalplanner.business.INewObject; import org.navalplanner.business.resources.entities.Criterion; +import org.navalplanner.business.resources.entities.CriterionSatisfaction; import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.resources.entities.CriterionWithItsType; import org.navalplanner.business.resources.entities.Interval; @@ -19,7 +19,7 @@ import org.navalplanner.business.resources.entities.Interval; * DTO represents the handled data in the form of assigning satisfaction criterions. * @author Susana Montes Pedreira */ -public class CriterionSatisfactionDTO { +public class CriterionSatisfactionDTO implements INewObject { public static final String START_DATE = "startDate"; @@ -39,12 +39,12 @@ public class CriterionSatisfactionDTO { private Boolean isDeleted = false; - private Boolean isNewObject = false; + private Boolean newObject = false; private CriterionSatisfaction criterionSatisfaction; public CriterionSatisfactionDTO(){ - this.setIsNewObject(true); + this.setNewObject(true); this.state = ""; this.criterionAndType = ""; this.startDate = new Date(); @@ -77,16 +77,13 @@ public class CriterionSatisfactionDTO { this.state = state; } - public void setIsNewObject(Boolean isNewObject) { - this.isNewObject = isNewObject; + public void setNewObject(Boolean isNewObject) { + this.newObject = isNewObject; } - public Boolean isIsNewObject() { - return isNewObject == null ? false : isNewObject; - } - public Boolean isIsOldObject(){ - return !isIsNewObject(); + public Boolean isOldObject(){ + return !isNewObject(); } public CriterionWithItsType getCriterionWithItsType() { @@ -156,7 +153,7 @@ public class CriterionSatisfactionDTO { } public boolean isPreviousStartDate(Date startDate){ - if(isNewObject) return true; + if(newObject) return true; if((getStartDate() == null) || (startDate == null)) return true; if(startDate.compareTo(getCriterionSatisfaction().getStartDate()) <= 0) @@ -172,7 +169,7 @@ public class CriterionSatisfactionDTO { } public boolean isPostEndDate(Date endDate){ - if(isNewObject) return true; + if(newObject) return true; if((getEndDate() == null) || (endDate == null)) return true; if(getCriterionSatisfaction().getEndDate() == null) @@ -187,4 +184,9 @@ public class CriterionSatisfactionDTO { return criterionWithItsType.getNameAndType(); } + + @Override + public boolean isNewObject() { + return newObject == null ? false : newObject; + } } diff --git a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul index 73c723695..27d388fe4 100644 --- a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul +++ b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul @@ -19,12 +19,12 @@ --> - - - - + + + @@ -50,7 +50,7 @@ - + diff --git a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul index aee7c8568..b86800253 100644 --- a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul +++ b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul @@ -19,11 +19,11 @@ --> - - - + + @@ -41,6 +41,6 @@ - + \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul index 2e3261812..97ef580ef 100644 --- a/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul +++ b/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul @@ -13,20 +13,20 @@ - - - - - - + + + + + - @@ -65,6 +65,6 @@ - + diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul index ad0da953f..236edcfcc 100644 --- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul +++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul @@ -19,13 +19,13 @@ --> - - - - - + + + + @@ -42,7 +42,7 @@ - + diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul index becac7a01..bb0822de6 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul @@ -19,14 +19,14 @@ --> - - - - - - + + + + + @@ -50,5 +50,5 @@ - +