Author: glorieux Date: 2009-12-17 09:51:11 +0100 (Thu, 17 Dec 2009) New Revision: 2758 Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java Log: Modification of ConvertPeriod to allow multiple year periods Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java =================================================================== --- trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java 2009-12-17 08:50:27 UTC (rev 2757) +++ trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java 2009-12-17 08:51:11 UTC (rev 2758) @@ -23,6 +23,7 @@ import java.util.Calendar; import java.util.List; +import org.apache.commons.beanutils.converters.DateConverter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.dto.PeriodDTO; @@ -55,10 +56,8 @@ periodLima.setBegin(periodCallao.getBeginPeriod()); periodLima.setEnd(periodCallao.getEndPeriod()); // Récupère l'année - Calendar cal = Calendar.getInstance(); - cal.setTime(periodCallao.getBeginPeriod()); - String year = Integer.toString(cal.get(Calendar.YEAR)); - periodLima.setIdName(year); + String periodName = periodCallao.getBeginPeriod().getYear() != periodCallao.getEndPeriod().getYear() ? (ServiceHelper.dateToYear(periodCallao.getBeginPeriod())+"-"+ServiceHelper.dateToYear(periodCallao.getEndPeriod())) : ServiceHelper.dateToYear(periodCallao.getBeginPeriod()); + periodLima.setIdName(periodName); periodLima.setParent(null); // Si la période est bloquée if ( periodCallao.isLocked() ) @@ -82,7 +81,7 @@ periodChildLima.setIdSeq(timeSpanCallao.getId()); periodChildLima.setBegin(timeSpanCallao.getBeginTimeSpan()); periodChildLima.setEnd(timeSpanCallao.getEndTimeSpan()); - periodChildLima.setIdName(ServiceHelper.dateToMonth(timeSpanCallao.getBeginTimeSpan())+" "+year); + periodChildLima.setIdName(ServiceHelper.dateToMonth(timeSpanCallao.getBeginTimeSpan())+" "+ServiceHelper.dateToYear(timeSpanCallao.getBeginTimeSpan())); periodChildLima.setParent(periodLima); periodChildLima.setStatus(null); // Si la période est bloquée