Author: bleny Date: 2014-02-26 12:02:04 +0100 (Wed, 26 Feb 2014) New Revision: 1689 Url: http://codelutin.com/projects/wao/repository/revisions/1689 Log: add SampleRow#getSampleMonth(date) Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-persistence/src/main/xmi/wao.zargo Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2014-02-26 10:17:06 UTC (rev 1688) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2014-02-26 11:02:04 UTC (rev 1689) @@ -24,15 +24,23 @@ package fr.ifremer.wao.entity; +import fr.ifremer.wao.WaoUtils; + +import java.util.Date; + /** - * SampleMonthImpl - * - * Created: 2 déc. 2009 - * - * @author fdesbois <fdesbois@codelutin.com> + * Répresente un mois dans l'année et l'effor d'observation associé (pour ObsMer et ObsVente) */ public class SampleMonthImpl extends SampleMonthAbstract { private static final long serialVersionUID = 1L; + @Override + public boolean isPeriodDatesContains(Date date) { + Date month = getPeriodDate(); + // XXX brendan 26/02/14 trick + boolean periodDatesContains = WaoUtils.formatMonth(month).equals(WaoUtils.formatMonth(date)); + return periodDatesContains; + } + } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-02-26 10:17:06 UTC (rev 1688) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-02-26 11:02:04 UTC (rev 1689) @@ -24,10 +24,12 @@ package fr.ifremer.wao.entity; +import com.google.common.base.Preconditions; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.Date; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -251,6 +253,19 @@ } @Override + public SampleMonth getSampleMonth(Date date) { + Preconditions.checkState( + ! getObsProgram().equals(ObsProgram.OBSDEB), + "opération non prévue pour ObsDeb"); + for (SampleMonth sampleMonth : getSampleMonth()) { + if (sampleMonth.isPeriodDatesContains(date)) { + return sampleMonth; + } + } + return null; + } + + @Override public String toString() { StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append(getCode()).append(" (").append(getObsProgram()); Modified: trunk/wao-persistence/src/main/xmi/wao.zargo =================================================================== (Binary files differ)