Author: bleny Date: 2014-04-02 10:27:37 +0200 (Wed, 02 Apr 2014) New Revision: 1793 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1793 Log: refs #4483 show link to eligble boats only when elligble boats are provided Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.js 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 08:07:31 UTC (rev 1792) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-02 08:27:37 UTC (rev 1793) @@ -357,6 +357,8 @@ */ protected Date lastSampleMonthEndOfMonth; + protected boolean elligibleBoatsProvided; + public ObsMerSamplingPlanSampleRowPart(Locale locale, Map<Date, ObsMerSamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, @@ -451,6 +453,7 @@ lastSampleMonthDate = sampleMonth.get(sampleMonth.size() - 1).getPeriodDate(); lastSampleMonthEndOfMonth = WaoUtils.getEndOfMonth(lastSampleMonthDate); + elligibleBoatsProvided = sampleRow.isElligibleBoatNotEmpty(); } public String getSamplingStrategy() { @@ -629,6 +632,10 @@ // boolean validMonth = month.before(current) || WaoUtils.isCurrentMonth(month); // return validMonth && getNbTidesEstimated(month) != null; // } + + public boolean isElligibleBoatsProvided() { + return elligibleBoatsProvided; + } } public static class ObsMerSamplingPlanStatistics implements Serializable { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 08:07:31 UTC (rev 1792) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 08:27:37 UTC (rev 1793) @@ -455,15 +455,17 @@ <!--i class="icon-time"></i--> <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> + <s:if test="elligibleBoatsProvided"> + <li> + <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:param name="filter.elligibleBoatsFilter.sampleRowCodes" value="code" /> + </s:url> + <s:a href="%{viewElligibleBoatsUrl}"> + <s:text name="wao.ui.action.viewElligibleBoats" /> + </s:a> + </li> + </s:if> <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> - <s:param name="sampleRowIds" value="sampleRowId" /> - </s:url> - <s:a href="%{viewElligibleBoatsUrl}"> - <s:text name="wao.ui.action.viewElligibleBoats" /> - </s:a> - </li> - <li> <s:url action="contacts" id="viewAssociatedContactsUrl"> <s:param name="sampleRowIds" value="sampleRowId" /> </s:url> Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-02 08:07:31 UTC (rev 1792) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-02 08:27:37 UTC (rev 1793) @@ -47,7 +47,7 @@ this.model = sampleRowsFilterModel; this.$filtersForm = $filtersForm; this.$selects = $filtersForm.find('select'); - this.$inputs = $filtersForm.find('input[type=text]'); + this.$inputs = $filtersForm.find('input[type="text"]'); this.getFilter = function () { var filter = {}; @@ -88,7 +88,7 @@ $select.find('option[value="' + selectedOption + '"]').prop('selected', 'selected'); }); }); - this.$filtersForm.effect( "highlight", "slow" ); + this.$filtersForm.effect('highlight', 'slow'); }; $(this.model).on('updated', function () {