diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java index 0b6e1229c..ae5e89061 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java @@ -134,17 +134,6 @@ public class CalendarExceptionType extends IntegrationEntity { return capacity.getStandardEffort(); } - public String getStandardEffortStr() { - return asString(getCapacity().getStandardEffort()); - } - - public String getExtraEffortStr() { - if (getCapacity().getAllowedExtraEffort() == null) { - return _("unlimited"); - } - return asString(getCapacity().getAllowedExtraEffort()); - } - private String asString(EffortDuration duration) { if (duration == null) { return ""; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java index ab889bbf6..c8a643f08 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java @@ -19,10 +19,15 @@ package org.navalplanner.business.calendars.entities; +import static org.navalplanner.business.i18n.I18nHelper._; + +import java.util.EnumMap; + import org.apache.commons.lang.Validate; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.navalplanner.business.workingday.EffortDuration; +import org.navalplanner.business.workingday.EffortDuration.Granularity; /** * This class is intended as a Hibernate component. It's formed by two @@ -92,6 +97,28 @@ public class Capacity { } } + public String getStandardEffortString() { + return asString(getStandardEffort()); + } + + public String getExtraEffortString() { + if (getAllowedExtraEffort() == null) { + return _("unlimited"); + } + return asString(getAllowedExtraEffort()); + } + + private static String asString(EffortDuration duration) { + if (duration == null) { + return ""; + } + EnumMap values = duration.decompose(); + Integer hours = values.get(Granularity.HOURS); + Integer minutes = values.get(Granularity.MINUTES); + Integer seconds = values.get(Granularity.SECONDS); + return hours + ":" + minutes + ":" + seconds; + } + @Override public boolean equals(Object obj) { if (obj instanceof Capacity) { diff --git a/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul b/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul index f8a6d135d..69d501ae3 100644 --- a/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul +++ b/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul @@ -38,8 +38,8 @@