Author: bleny Date: 2014-04-02 12:10:28 +0200 (Wed, 02 Apr 2014) New Revision: 1801 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1801 Log: restore methods wrongly removed Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 09:54:55 UTC (rev 1800) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 10:10:28 UTC (rev 1801) @@ -29,6 +29,7 @@ import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.util.DateUtil; import java.io.Serializable; import java.text.NumberFormat; @@ -464,10 +465,6 @@ return sampleRowId; } - public Date getLatestSampleLogCreateDate() { - return latestSampleLogCreateDate; - } - public Date getFirstSampleMonthDate() { return firstSampleMonthDate; } @@ -476,10 +473,6 @@ return lastSampleMonthDate; } - public Date getLastSampleMonthEndOfMonth() { - return lastSampleMonthEndOfMonth; - } - public int getNbObservants() { return nbObservants; } @@ -636,6 +629,16 @@ public boolean isElligibleBoatsProvided() { return elligibleBoatsProvided; } + + public boolean isRecentlyUpdated() { + boolean isRecentlyUpdated = DateUtil.getDifferenceInDays(latestSampleLogCreateDate, new Date()) <= 2 * 7; + return isRecentlyUpdated; + } + + public boolean isNewContactCreatable() { + boolean isNewContactCreatable = new Date().before(lastSampleMonthEndOfMonth); + return isNewContactCreatable; + } } public static class ObsMerSamplingPlanStatistics implements Serializable {