- Wao-commits - mailman.cloud.codelutin.com

r1762 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by tchemit＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: tchemit Date: 2014-03-26 18:16:44 +0100 (Wed, 26 Mar 2014) New Revision: 1762 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1762 Log: use I18nAble in FilterValues Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-03-26 17:14:02 UTC (rev 1761) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-03-26 17:16:44 UTC (rev 1762) @@ -53,11 +53,9 @@ terrestrialDistricts.put(terrestrialDistrict.getTopiaId(), terrestrialDistrict.getDescription()); } for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { - String i18nKey = "fr.ifremer.wao.entity.FishingGearDCF." + dcf5Code.getFishingGearDCF().getCode(); - fishingGearDcfs.put(dcf5Code.getFishingGearDCF().getTopiaId(), i18nKey); + fishingGearDcfs.put(dcf5Code.getFishingGearDCF().getTopiaId(), dcf5Code.getFishingGearDCF().getI18nKey()); if (dcf5Code.getTargetSpeciesDCF() != null) { - i18nKey = "fr.ifremer.wao.entity.TargetSpeciesDCF." + dcf5Code.getTargetSpeciesDCF().getCode(); - targetSpeciesDcfs.put(dcf5Code.getTargetSpeciesDCF().getTopiaId(), i18nKey); + targetSpeciesDcfs.put(dcf5Code.getTargetSpeciesDCF().getTopiaId(), dcf5Code.getTargetSpeciesDCF().getI18nKey()); } } }

1 0

r1761 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: tchemit Date: 2014-03-26 18:14:02 +0100 (Wed, 26 Mar 2014) New Revision: 1761 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1761 Log: refs-40 #4483 (fix full-view compact-view) Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 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-03-26 17:12:39 UTC (rev 1760) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-26 17:14:02 UTC (rev 1761) @@ -163,7 +163,7 @@ <td><s:text name="wao.ui.entity.FishingZone"/></td> <s:if test="fullView"> <td class="only-visible-fullview"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dCF5Code"/></td> + <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></td> <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.meshSize"/></td> <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.size"/></td> <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.other"/></td> @@ -173,8 +173,8 @@ <td class="only-visible-fullview"><s:text name="wao.ui.field.SampleRow.periodEnd"/></td> </s:if> <s:else> - <td><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dCF5Code"/></td> - <td><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></td> + <td class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></td> + <td class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></td> </s:else>  @@ -216,12 +216,14 @@ <td><s:property value="#sampleRow.programName" /></td> <s:if test="fullView"> <td class="only-visible-fullview"><s:property value="#sampleRow.company.name" /></td> +</s:if> <td class="only-visible-fullview"><s:property value="#samplingPlanRow.fishingZones" /></td> +<s:if test="fullView"> <td class="only-visible-fullview"><s:property value="#sampleRow.fishingZonesInfos" /></td> <td class="only-visible-fullview"> - <s:iterator value="sampleRow.dcf5code" var="dcf5code"> + <s:iterator value="%{#sampleRow.getdCF5Code()}" var="dcf5code"> <span> - <s:property /> + <s:property value="code"/> </span> </s:iterator> </td> @@ -234,15 +236,17 @@ <td class="only-visible-fullview"><s:property value="%{formatMonth(#sampleRow.periodEnd)}" /></td> </s:if> <s:else> - <td><s:property value="#samplingPlanRow.fishingZones" /></td> - <td> - <s:iterator value="sampleRow.dcf5code" var="dcf5code"> + <td class="only-visible-compactview"> + <s:iterator value="%{#sampleRow.getdCF5Code()}" var="dcf5code"> <span> - <s:property /> + <s:property value="code"/> </span> </s:iterator> <s:property value="#sampleRow.professionDescriptionWithoutDCF5" /> </td> + <td class="only-visible-compactview"> + <s:property value="#row.profession.libelle" /> + </td> </s:else>  <s:iterator value="samplingPlan.months" var="month">

1 0

r1760 - in trunk/wao-persistence/src/main: java/fr/ifremer/wao/entity xmi
by tchemit＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: tchemit Date: 2014-03-26 18:12:39 +0100 (Wed, 26 Mar 2014) New Revision: 1760 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1760 Log: I18nAble Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/I18nAble.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2014-03-26 15:36:29 UTC (rev 1759) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2014-03-26 17:12:39 UTC (rev 1760) @@ -25,11 +25,81 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import static org.nuiton.i18n.I18n.n; + /** * @author bleny */ public class FishingGearDCFImpl extends FishingGearDCFAbstract { + static { + //To detect all i18n keys + n("fr.ifremer.wao.entity.FishingGearDCF."); + n("fr.ifremer.wao.entity.FishingGearDCF.DRB"); + n("fr.ifremer.wao.entity.FishingGearDCF.DRH"); + n("fr.ifremer.wao.entity.FishingGearDCF.FAR"); + n("fr.ifremer.wao.entity.FishingGearDCF.FCN"); + n("fr.ifremer.wao.entity.FishingGearDCF.FG"); + n("fr.ifremer.wao.entity.FishingGearDCF.FIX"); + n("fr.ifremer.wao.entity.FishingGearDCF.FPN"); + n("fr.ifremer.wao.entity.FishingGearDCF.FPO"); + n("fr.ifremer.wao.entity.FishingGearDCF.FSN"); + n("fr.ifremer.wao.entity.FishingGearDCF.FWR"); + n("fr.ifremer.wao.entity.FishingGearDCF.FYK"); + n("fr.ifremer.wao.entity.FishingGearDCF.GEN"); + n("fr.ifremer.wao.entity.FishingGearDCF.GES"); + n("fr.ifremer.wao.entity.FishingGearDCF.GN"); + n("fr.ifremer.wao.entity.FishingGearDCF.GNC"); + n("fr.ifremer.wao.entity.FishingGearDCF.GND"); + n("fr.ifremer.wao.entity.FishingGearDCF.GNF"); + n("fr.ifremer.wao.entity.FishingGearDCF.GNS"); + n("fr.ifremer.wao.entity.FishingGearDCF.GT"); + n("fr.ifremer.wao.entity.FishingGearDCF.GTN"); + n("fr.ifremer.wao.entity.FishingGearDCF.GTR"); + n("fr.ifremer.wao.entity.FishingGearDCF.HAR"); + n("fr.ifremer.wao.entity.FishingGearDCF.HMD"); + n("fr.ifremer.wao.entity.FishingGearDCF.HMP"); + n("fr.ifremer.wao.entity.FishingGearDCF.HMX"); + n("fr.ifremer.wao.entity.FishingGearDCF.LA"); + n("fr.ifremer.wao.entity.FishingGearDCF.LHM"); + n("fr.ifremer.wao.entity.FishingGearDCF.LHP"); + n("fr.ifremer.wao.entity.FishingGearDCF.LL"); + n("fr.ifremer.wao.entity.FishingGearDCF.LLD"); + n("fr.ifremer.wao.entity.FishingGearDCF.LLS"); + n("fr.ifremer.wao.entity.FishingGearDCF.LN"); + n("fr.ifremer.wao.entity.FishingGearDCF.LNB"); + n("fr.ifremer.wao.entity.FishingGearDCF.LNP"); + n("fr.ifremer.wao.entity.FishingGearDCF.LNS"); + n("fr.ifremer.wao.entity.FishingGearDCF.LTL"); + n("fr.ifremer.wao.entity.FishingGearDCF.LX"); + n("fr.ifremer.wao.entity.FishingGearDCF.MIS"); + n("fr.ifremer.wao.entity.FishingGearDCF.NK"); + n("fr.ifremer.wao.entity.FishingGearDCF.OT"); + n("fr.ifremer.wao.entity.FishingGearDCF.OTB"); + n("fr.ifremer.wao.entity.FishingGearDCF.OTM"); + n("fr.ifremer.wao.entity.FishingGearDCF.OTT"); + n("fr.ifremer.wao.entity.FishingGearDCF.PS"); + n("fr.ifremer.wao.entity.FishingGearDCF.PS1"); + n("fr.ifremer.wao.entity.FishingGearDCF.PS2"); + n("fr.ifremer.wao.entity.FishingGearDCF.PT"); + n("fr.ifremer.wao.entity.FishingGearDCF.PTB"); + n("fr.ifremer.wao.entity.FishingGearDCF.PTM"); + n("fr.ifremer.wao.entity.FishingGearDCF.RG"); + n("fr.ifremer.wao.entity.FishingGearDCF.SB"); + n("fr.ifremer.wao.entity.FishingGearDCF.SDN"); + n("fr.ifremer.wao.entity.FishingGearDCF.SPR"); + n("fr.ifremer.wao.entity.FishingGearDCF.SSC"); + n("fr.ifremer.wao.entity.FishingGearDCF.SV"); + n("fr.ifremer.wao.entity.FishingGearDCF.SW"); + n("fr.ifremer.wao.entity.FishingGearDCF.TB"); + n("fr.ifremer.wao.entity.FishingGearDCF.TBB"); + n("fr.ifremer.wao.entity.FishingGearDCF.TBN"); + n("fr.ifremer.wao.entity.FishingGearDCF.TBS"); + n("fr.ifremer.wao.entity.FishingGearDCF.TM"); + n("fr.ifremer.wao.entity.FishingGearDCF.TMS"); + n("fr.ifremer.wao.entity.FishingGearDCF.TX"); + } + public FishingGearDCFImpl() { super(); } @@ -54,4 +124,9 @@ public String toString() { return ReflectionToStringBuilder.toString(this); } + + @Override + public String getI18nKey() { + return "fr.ifremer.wao.entity.FishingGearDCF." + getCode(); + } } Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/I18nAble.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/I18nAble.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/I18nAble.java 2014-03-26 17:12:39 UTC (rev 1760) @@ -0,0 +1,12 @@ +package fr.ifremer.wao.entity; + +/** + * Created on 3/26/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 4.0 + */ +public interface I18nAble { + + String getI18nKey(); +} Property changes on: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/I18nAble.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2014-03-26 15:36:29 UTC (rev 1759) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2014-03-26 17:12:39 UTC (rev 1760) @@ -25,11 +25,33 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import static org.nuiton.i18n.I18n.n; + /** * @author bleny */ public class TargetSpeciesDCFImpl extends TargetSpeciesDCFAbstract { + { + //To detect all i18n keys + n("fr.ifremer.wao.entity.TargetSpeciesDCF."); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.ALG"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.ANA"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.CAT"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.CRU"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.CRW"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.DEF"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.DWS"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.FIF"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.FIN"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.LPF"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.MOL"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.SPF"); + n("fr.ifremer.wao.entity.TerrestrialDivision"); + n("fr.ifremer.wao.entity.TerrestrialLocation"); + } + public TargetSpeciesDCFImpl() { super(); } @@ -54,4 +76,9 @@ public String toString() { return ReflectionToStringBuilder.toString(this); } + + @Override + public String getI18nKey() { + return "fr.ifr.mer.wao.entity.TargetSpeciesDCF." + getCode(); + } } Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ)

1 0

r1759 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: tchemit Date: 2014-03-26 16:36:29 +0100 (Wed, 26 Mar 2014) New Revision: 1759 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1759 Log: refs-60 #4483 fix total values + sampleRowsFilter query Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-03-26 15:09:58 UTC (rev 1758) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-03-26 15:36:29 UTC (rev 1759) @@ -95,7 +95,7 @@ query.addWhereClause("sr." + SampleRow.PROPERTY_EXPECTED_DATE + " <= :periodTo", ImmutableMap.of("periodTo", (Object) filter.getPeriodTo())); } else { Date periodToMonth = DateUtils.truncate(filter.getPeriodTo(), Calendar.MONTH); - query.addWhereClause("sr." + SampleRow.PROPERTY_PERIOD_END + " <= :periodToMonth", ImmutableMap.of("periodToMonth", (Object) periodToMonth)); + query.addWhereClause("sr." + SampleRow.PROPERTY_PERIOD_BEGIN + " <= :periodToMonth", ImmutableMap.of("periodToMonth", (Object) periodToMonth)); } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java 2014-03-26 15:09:58 UTC (rev 1758) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java 2014-03-26 15:36:29 UTC (rev 1759) @@ -23,6 +23,8 @@ import com.google.common.base.Function; +import java.util.Date; + public class SampleRows { public static Function<SampleRow, String> getCode() { @@ -36,4 +38,34 @@ return input.getCode(); } } + + public static Integer getExpectedTidesValue(SampleRow sampleRow, Date month) { + Integer result = null; + SampleMonth sampleMonth = sampleRow.getSampleMonth(month); + if (sampleMonth != null) { + int tidesValue = sampleMonth.getExpectedTidesValue(); + result = tidesValue; + } + return result; + } + + public static Integer getRealTidesValue(SampleRow sampleRow, Date month) { + Integer result = null; + SampleMonth sampleMonth = sampleRow.getSampleMonth(month); + if (sampleMonth != null) { + int tidesValue = sampleMonth.getRealTidesValue(); + result = tidesValue; + } + return result; + } + + public static Integer getEstimatedTidesValue(SampleRow sampleRow, Date month) { + Integer result = null; + SampleMonth sampleMonth = sampleRow.getSampleMonth(month); + if (sampleMonth != null) { + int tidesValue = sampleMonth.getEstimatedTidesValue(); + result = tidesValue; + } + return result; + } } 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-03-26 15:09:58 UTC (rev 1758) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-26 15:36:29 UTC (rev 1759) @@ -23,8 +23,8 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.FishingZone; -import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRows; import java.io.Serializable; import java.text.NumberFormat; @@ -275,6 +275,21 @@ protected SampleRow sampleRow; /** + * Total of expected tides. + */ + protected int totalTidesExpected; + + /** + * Total of real tides. + */ + protected int totalTidesReal; + + /** + * Total of estimated tides. + */ + protected int totalTidesEstimated; + + /** * Expected Times of observation days. * <p/> * FIXME Voir si on doit garder un *D*ouble @@ -297,10 +312,16 @@ public ObsMerSamplingPlanSampleRowPart(SampleRow sampleRow, + int totalTidesExpected, + int totalTidesReal, + int totalTidesEstimated, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated) { this.sampleRow = sampleRow; + this.totalTidesExpected = totalTidesExpected; + this.totalTidesReal = totalTidesReal; + this.totalTidesEstimated = totalTidesEstimated; this.observationTimesInDaysExpected = observationTimesInDaysExpected; this.observationTimesInDaysReal = observationTimesInDaysReal; this.observationTimesInDaysEstimated = observationTimesInDaysEstimated; @@ -310,30 +331,30 @@ return sampleRow; } + public int getTotalTidesExpected() { + return totalTidesExpected; + } + + public int getTotalTidesReal() { + return totalTidesReal; + } + + public int getTotalTidesEstimated() { + return totalTidesEstimated; + } + public Integer getNbTidesExpected(Date month) { - Integer result = null; - SampleMonth sampleMonth = sampleRow.getSampleMonth(month); - if (sampleMonth != null) { - result = sampleMonth.getExpectedTidesValue(); - } + Integer result = SampleRows.getExpectedTidesValue(sampleRow, month); return result; } public Integer getNbTidesReal(Date month) { - Integer result = null; - SampleMonth sampleMonth = sampleRow.getSampleMonth(month); - if (sampleMonth != null) { - result = sampleMonth.getRealTidesValue(); - } + Integer result = SampleRows.getRealTidesValue(sampleRow, month); return result; } public Integer getNbTidesEstimated(Date month) { - Integer result = null; - SampleMonth sampleMonth = sampleRow.getSampleMonth(month); - if (sampleMonth != null) { - result = sampleMonth.getEstimatedTidesValue(); - } + Integer result = SampleRows.getEstimatedTidesValue(sampleRow, month); return result; } @@ -341,7 +362,7 @@ public String getTotalPercentage() { String result; if (sampleRow.getTotalTidesExpected() > 0) { - double percentage = (double) sampleRow.getTotalTidesReal() / (double) sampleRow.getTotalTidesExpected(); + double percentage = (double) totalTidesReal / (double) totalTidesExpected; result = NumberFormat.getPercentInstance().format(percentage); } else { result = "- %"; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-26 15:09:58 UTC (rev 1758) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-26 15:36:29 UTC (rev 1759) @@ -25,6 +25,7 @@ import com.google.common.collect.Ordering; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRows; import org.apache.commons.lang3.mutable.MutableDouble; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.mutable.MutableLong; @@ -148,6 +149,12 @@ PeriodDates periodDates = new PeriodDates(sampleRowsFilter.getPeriodFrom(), sampleRowsFilter.getPeriodTo()); this.months = periodDates.getMonths(); + + for (Date month : months) { + totalExpectedForMonths.put(month, new MutableInt()); + totalRealForMonths.put(month, new MutableInt()); + totalEstimatedForMonths.put(month, new MutableInt()); + } } public ObsMerSamplingPlanBuilder addSampleRow(SampleRow sampleRow, @@ -170,16 +177,22 @@ // get sector context ServiceContext sectorPart = facadeContext.getOrAddSectorContext(sectors); + // compute nb expected tides for sample row + int totalTidesExpected = getNbTidesExpected(sampleRow); + // compute nb real tides for sample row + int totalTidesReal = getNbTidesReal(sampleRow); + // compute nb estimated tides for sample row + int totalTidesEstimated = getNbTidesEstimated(sampleRow); + // add sample row - ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart = - sectorPart.addSampleRow(sampleRow, - observationTimesInDaysExpected, - observationTimesInDaysReal, - observationTimesInDaysEstimated); + sectorPart.addSampleRow(sampleRow, + totalTidesExpected, + totalTidesReal, + totalTidesEstimated, + observationTimesInDaysExpected, + observationTimesInDaysReal, + observationTimesInDaysEstimated); - // update totals - updateTotals(sampleRowPart); - // Sum total observation times in days observationTimesInDaysTotalExpected.add(observationTimesInDaysExpected); observationTimesInDaysTotalReal.add(observationTimesInDaysReal); @@ -233,45 +246,43 @@ return result; } - protected void updateTotals(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + protected int getNbTidesExpected(SampleRow sampleRow) { + int result = 0; for (Date month : months) { - - Integer expected = sampleRowPart.getNbTidesExpected(month); - Integer real = sampleRowPart.getNbTidesReal(month); - Integer estimated = sampleRowPart.getNbTidesEstimated(month); - - if (expected != null) { - - MutableInt total = totalExpectedForMonths.get(month); - if (total == null) { - total = new MutableInt(); - totalExpectedForMonths.put(month, total); - } - total.add(expected); - highTotalExpected.add(total); + Integer tidesValue = SampleRows.getExpectedTidesValue(sampleRow, month); + if (tidesValue != null) { + result += tidesValue; + totalExpectedForMonths.get(month).add(tidesValue); } + } + highTotalExpected.add(result); + return result; + } - if (estimated != null) { - - MutableInt total = totalEstimatedForMonths.get(month); - if (total == null) { - total = new MutableInt(); - totalEstimatedForMonths.put(month, total); - } - total.add(expected); - highTotalEstimated.add(total); + protected int getNbTidesReal(SampleRow sampleRow) { + int result = 0; + for (Date month : months) { + Integer tidesValue = SampleRows.getRealTidesValue(sampleRow, month); + if (tidesValue != null) { + result += tidesValue; + totalRealForMonths.get(month).add(tidesValue); } + } + highTotalReal.add(result); + return result; + } - if (real != null) { - MutableInt total = totalRealForMonths.get(month); - if (total == null) { - total = new MutableInt(); - totalRealForMonths.put(month, total); - } - total.add(real); - highTotalReal.add(total); + protected int getNbTidesEstimated(SampleRow sampleRow) { + int result = 0; + for (Date month : months) { + Integer tidesValue = SampleRows.getEstimatedTidesValue(sampleRow, month); + if (tidesValue != null) { + result += tidesValue; + totalEstimatedForMonths.get(month).add(tidesValue); } } + highTotalEstimated.add(result); + return result; } protected static class FacadeContext { @@ -328,12 +339,18 @@ } protected ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart addSampleRow(SampleRow row, + int totalTidesExpected, + int totalTidesReal, + int totalTidesEstimated, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated) { ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart rowPart = new ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart(row, + totalTidesExpected, + totalTidesReal, + totalTidesEstimated, observationTimesInDaysExpected, observationTimesInDaysReal, observationTimesInDaysEstimated); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-03-26 15:09:58 UTC (rev 1758) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-03-26 15:36:29 UTC (rev 1759) @@ -21,12 +21,14 @@ * #L% */ +import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import com.google.common.collect.Range; import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.SampleRowsFilter; @@ -79,7 +81,6 @@ import org.nuiton.util.DateUtil; import java.io.InputStream; -import java.nio.charset.Charset; import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; @@ -375,13 +376,36 @@ SampleRowTopiaDao dao = getSampleRowDao(); + // recuperation des lignes du plan List<SampleRow> sampleRows = dao.findAll(sampleRowsFilter); + + // creation du plan d'echantillonnage ObsMerSamplingPlanBuilder builder = new ObsMerSamplingPlanBuilder(sampleRowsFilter); + + Date periodFrom = sampleRowsFilter.getPeriodFrom(); + Date periodTo = sampleRowsFilter.getPeriodTo(); + for (SampleRow sampleRow : sampleRows) { - Double observationTimesInDaysExpected = getObservationTimesInDayExpected(sampleRow); - Pair<Long, Long> realAndEstimated = getObservationTimesInDayRealAndEstimated(sampleRowsFilter, sampleRow); + + // calcul effort plannifie + Double observationTimesInDaysExpected = + getObservationTimesInDayExpected(periodFrom, + periodTo, + sampleRow); + + // calcul effort réalisé et estimé + SampleRowsFilter sampleRowsFilter1 = new SampleRowsFilter(); + sampleRowsFilter1.setObsProgram(sampleRowsFilter.getObsProgram()); + sampleRowsFilter1.setPeriodFrom(periodFrom); + sampleRowsFilter1.setPeriodTo(periodTo); + sampleRowsFilter1.setSampleRowIds(ImmutableSet.of(sampleRow.getTopiaId())); + + Pair<Long, Long> realAndEstimated = + getSampleRowObservationTimesInDayRealAndEstimated(sampleRowsFilter1); Long observationTimesInDaysReal = realAndEstimated.getLeft(); Long observationTimesInDaysEstimated = realAndEstimated.getRight(); + + // ajout de la ligne au build de plan builder.addSampleRow(sampleRow, observationTimesInDaysExpected, observationTimesInDaysReal, @@ -555,9 +579,9 @@ try { - String csvContent = export.toString(Charset.forName("UTF-8")); + String csvContent = export.toString(Charsets.UTF_8); - InputStream csvInputStream = IOUtils.toInputStream(csvContent, "UTF-8"); + InputStream csvInputStream = IOUtils.toInputStream(csvContent, Charsets.UTF_8); return csvInputStream; @@ -567,7 +591,21 @@ } - protected double getObservationTimesInDayExpected(SampleRow sampleRow) { + /** + * Récupérer l'effort d'observation en nombre de jours plannifié poru + * le sample row donné pendant la période donnée. + * + * @param periodFrom début de période où rechercher les contacts + * @param periodTo fin de période où rechercher les contacts + * @param sampleRow la ligne à filtrer + * @return l'effort plannifié calculé + */ + public double getObservationTimesInDayExpected(Date periodFrom, + Date periodTo, + SampleRow sampleRow) { + + Range<Date> period = Range.closed(periodFrom, periodTo); + double expected; // On prend le nombre d'observation prévue pour cette ligne du plan @@ -575,7 +613,11 @@ // chaque mois. int expectedObservationCount = 0; for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { - expectedObservationCount += sampleMonth.getExpectedTidesValue(); + Date periodDate = sampleMonth.getPeriodDate(); + + if (period.contains(periodDate)) { + expectedObservationCount += sampleMonth.getExpectedTidesValue(); + } } // le prévisionnel est égal au nombre d'observations attendues × // le nombre de jours moyen d'une observation @@ -583,20 +625,26 @@ return expected; } - protected Pair<Long, Long> getObservationTimesInDayRealAndEstimated(SampleRowsFilter sampleRowFilter, - SampleRow sampleRow) { + /** + * Récupérer l'effort d'observation en nombre de jours réalisé (partie gauche) et estimé (partie droite) + * pour le filtre d'échantillonnage donné. + * + * @param sampleRowsFilter la filtre du plan d'échantillonnage + * @return la paire (effort réalisé - effort estimé) calculée + */ + public Pair<Long, Long> getSampleRowObservationTimesInDayRealAndEstimated(SampleRowsFilter sampleRowsFilter) { // D'abord, on a besoin de récupérer toutes les observations réalisées // pour cette ligne du plan ContactsFilter contactFilter = new ContactsFilter(); - sampleRowFilter.setSampleRowIds(ImmutableSet.of(sampleRow.getTopiaId())); contactFilter.setFilterOnObservationBeginDate(true); - contactFilter.setPeriodFrom(sampleRowFilter.getPeriodFrom()); - contactFilter.setPeriodTo(sampleRowFilter.getPeriodTo()); + contactFilter.setPeriodFrom(sampleRowsFilter.getPeriodFrom()); + contactFilter.setPeriodTo(sampleRowsFilter.getPeriodTo()); + contactFilter.setSampleRowFilter(sampleRowsFilter); - contactFilter.setSampleRowFilter(sampleRowFilter); + contactFilter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); // on exclue les contacts qui sont invalidés par le programme contactFilter.setProgramAcceptations(Sets.newHashSet(true, null)); @@ -627,9 +675,6 @@ // estimated observation estimated += contactInDays; } - - sampleRowFilter.setSampleRowIds(null); - return Pair.of(real, estimated); } 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-03-26 15:09:58 UTC (rev 1758) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-26 15:36:29 UTC (rev 1759) @@ -256,9 +256,9 @@ </s:iterator> <td> <span> - <s:property value="#sampleRow.totalTidesExpected" /> + <s:property value="#samplingPlanRow.totalTidesExpected" /> <s:if test="!authenticatedWaoUser.guest"> - <em>(<s:property value="#sampleRow.totalTidesReal" />)</em> + <em>(<s:property value="#samplingPlanRow.totalTidesReal" />)</em> <br/> <strong><s:property value="#samplingPlanRow.totalPercentage" /></strong> </s:if> @@ -368,7 +368,7 @@ </td> </s:iterator> <td> - <s:property value="#samplingPlan.highTotalExpected" /> + <s:property value="samplingPlan.highTotalExpected" /> <s:if test="!authenticatedWaoUser.guest"> <em>(<s:property value="samplingPlan.highTotalReal" />)</em> <strong><s:property value="samplingPlan.highTotalRatio" /></strong>

1 0

r1758 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action/json java/fr/ifremer/wao/web/action/obsmer resources/template/bootstrap resources/template/bootstrap/simple webapp/WEB-INF/content/obsmer webapp/WEB-INF/decorators webapp/js
by bleny＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: bleny Date: 2014-03-26 16:09:58 +0100 (Wed, 26 Mar 2014) New Revision: 1758 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1758 Log: refs #4483 add all fields in ui for samplerows filter, dynamically reload content Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java trunk/wao-web/src/main/resources/template/bootstrap/simple/ trunk/wao-web/src/main/resources/template/bootstrap/simple/select.ftl Removed: trunk/wao-web/src/main/resources/template/bootstrap/select.ftl Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/js/wao.js Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-26 11:16:22 UTC (rev 1757) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-26 15:09:58 UTC (rev 1758) @@ -22,7 +22,12 @@ */ import fr.ifremer.wao.web.WaoActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; +@Results({ + @Result(name="success", type="json") +}) public class WaoJsonActionSupport extends WaoActionSupport { private static final long serialVersionUID = 1L; Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java 2014-03-26 15:09:58 UTC (rev 1758) @@ -0,0 +1,52 @@ +package fr.ifremer.wao.web.action.obsmer; + +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; +import fr.ifremer.wao.services.service.SampleRowsFilterValues; +import fr.ifremer.wao.web.action.json.WaoJsonActionSupport; + +public class SampleRowsFilterValuesJsonAction extends WaoJsonActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + protected transient ObsMerSamplingPlanService service; + + protected transient SampleRowsFilter filter; + + protected SampleRowsFilterValues filterValues; + + public void setService(ObsMerSamplingPlanService service) { + this.service = service; + } + + public SampleRowsFilter getFilter() { + if (filter == null) { + prepare(); + } + return filter; + } + + @Override + public void prepare() { + + filter = service.newSampleRowsFilter(session.getAuthenticatedWaoUser()); + + } + + @Override + public String execute() { + + ObsMerSamplingPlan samplingPlan = service.getSamplingPlan(filter); + + filterValues = samplingPlan.getFilterValues(); + + return SUCCESS; + } + + public SampleRowsFilterValues getFilterValues() { + return filterValues; + } + +} Deleted: trunk/wao-web/src/main/resources/template/bootstrap/select.ftl =================================================================== --- trunk/wao-web/src/main/resources/template/bootstrap/select.ftl 2014-03-26 11:16:22 UTC (rev 1757) +++ trunk/wao-web/src/main/resources/template/bootstrap/select.ftl 2014-03-26 15:09:58 UTC (rev 1758) @@ -1,141 +0,0 @@ -<#-- -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ ---> -<#setting number_format="#.#####"> -TOTO -<select<#rt/> - name="${parameters.name?default("")?html}"<#rt/> -<#if parameters.get("size")??> - size="${parameters.get("size")?html}"<#rt/> -</#if> -<#if parameters.disabled?default(false)> - disabled="disabled"<#rt/> -</#if> -<#if parameters.tabindex??> - tabindex="${parameters.tabindex?html}"<#rt/> -</#if> -<#if parameters.id??> - id="${parameters.id?html}"<#rt/> -</#if> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> -<#if parameters.title??> - title="${parameters.title?html}"<#rt/> -</#if> -<#if parameters.multiple?default(false)> - multiple="multiple"<#rt/> -</#if> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> -> -<#if parameters.headerKey?? && parameters.headerValue??> - <option value="${parameters.headerKey?html}" - <#if tag.contains(parameters.nameValue, parameters.headerKey) == true> - selected="selected" - </#if> - >${parameters.headerValue?html}</option> -</#if> -<#if parameters.emptyOption?default(false)> - <option value=""></option> -</#if> -<@s.iterator value="parameters.list"> - <#if parameters.listKey??> - <#if stack.findValue(parameters.listKey)??> - <#assign itemKey = stack.findValue(parameters.listKey)/> - <#assign itemKeyStr = stack.findString(parameters.listKey)/> - <#else> - <#assign itemKey = ''/> - <#assign itemKeyStr = ''/> - </#if> - <#else> - <#assign itemKey = stack.findValue('top')/> - <#assign itemKeyStr = stack.findString('top')> - </#if> - <#if parameters.listValue??> - <#if stack.findString(parameters.listValue)??> - <#assign itemValue = stack.findString(parameters.listValue)/> - <#else> - <#assign itemValue = ''/> - </#if> - <#else> - <#assign itemValue = stack.findString('top')/> - </#if> - <#if parameters.listCssClass??> - <#if stack.findString(parameters.listCssClass)??> - <#assign itemCssClass= stack.findString(parameters.listCssClass)/> - <#else> - <#assign itemCssClass = ''/> - </#if> - </#if> - <#if parameters.listCssStyle??> - <#if stack.findString(parameters.listCssStyle)??> - <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/> - <#else> - <#assign itemCssStyle = ''/> - </#if> - </#if> - <#if parameters.listTitle??> - <#if stack.findString(parameters.listTitle)??> - <#assign itemTitle= stack.findString(parameters.listTitle)/> - <#else> - <#assign itemTitle = ''/> - </#if> - </#if> - <option value="${itemKeyStr?html}"<#rt/> - <#if tag.contains(parameters.nameValue, itemKey) == true> - selected="selected"<#rt/> - </#if> - <#if itemCssClass?if_exists != ""> - class="${itemCssClass?html}"<#rt/> - </#if> - <#if itemCssStyle?if_exists != ""> - style="${itemCssStyle?html}"<#rt/> - </#if> - <#if itemTitle?if_exists != ""> - title="${itemTitle?html}"<#rt/> - </#if> - >${itemValue?html}</option><#lt/> -</(a)s.iterator> - -<#include "/${parameters.templateDir}/${parameters.expandTheme}/optgroup.ftl" /> - -</select> - -<#if parameters.multiple?default(false)> - <#if (parameters.id?? && parameters.name??)> - <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" value=""<#rt/> - </#if> - <#if (parameters.id?? && !parameters.name??)> - <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/> - </#if> - <#if ( !parameters.id?? && parameters.name??)> - <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/> - </#if> - <#if ( !parameters.id?? && !parameters.name??)> - <input type="hidden" id="" name="" value="" <#rt/> - </#if> - -<#if parameters.disabled?default(false)> - disabled="disabled"<#rt/> -</#if> - /> -</#if> Copied: trunk/wao-web/src/main/resources/template/bootstrap/simple/select.ftl (from rev 1757, trunk/wao-web/src/main/resources/template/bootstrap/select.ftl) =================================================================== --- trunk/wao-web/src/main/resources/template/bootstrap/simple/select.ftl (rev 0) +++ trunk/wao-web/src/main/resources/template/bootstrap/simple/select.ftl 2014-03-26 15:09:58 UTC (rev 1758) @@ -0,0 +1,143 @@ +<#-- +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#setting number_format="#.#####"> +<select<#rt/> + name="${parameters.name?default("")?html}"<#rt/> +<#if parameters.get("size")??> + size="${parameters.get("size")?html}"<#rt/> +</#if> +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> +</#if> +<#if parameters.tabindex??> + tabindex="${parameters.tabindex?html}"<#rt/> +</#if> +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.dataBinding??> + data-binding="${parameters.dataBinding?html}"<#rt/> +</#if> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> +</#if> +<#if parameters.multiple?default(false)> + multiple="multiple"<#rt/> +</#if> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> +> +<#if parameters.headerKey?? && parameters.headerValue??> + <option value="${parameters.headerKey?html}" + <#if tag.contains(parameters.nameValue, parameters.headerKey) == true> + selected="selected" + </#if> + >${parameters.headerValue?html}</option> +</#if> +<#if parameters.emptyOption?default(false)> + <option value=""></option> +</#if> +<@s.iterator value="parameters.list"> + <#if parameters.listKey??> + <#if stack.findValue(parameters.listKey)??> + <#assign itemKey = stack.findValue(parameters.listKey)/> + <#assign itemKeyStr = stack.findString(parameters.listKey)/> + <#else> + <#assign itemKey = ''/> + <#assign itemKeyStr = ''/> + </#if> + <#else> + <#assign itemKey = stack.findValue('top')/> + <#assign itemKeyStr = stack.findString('top')> + </#if> + <#if parameters.listValue??> + <#if stack.findString(parameters.listValue)??> + <#assign itemValue = stack.findString(parameters.listValue)/> + <#else> + <#assign itemValue = ''/> + </#if> + <#else> + <#assign itemValue = stack.findString('top')/> + </#if> + <#if parameters.listCssClass??> + <#if stack.findString(parameters.listCssClass)??> + <#assign itemCssClass= stack.findString(parameters.listCssClass)/> + <#else> + <#assign itemCssClass = ''/> + </#if> + </#if> + <#if parameters.listCssStyle??> + <#if stack.findString(parameters.listCssStyle)??> + <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/> + <#else> + <#assign itemCssStyle = ''/> + </#if> + </#if> + <#if parameters.listTitle??> + <#if stack.findString(parameters.listTitle)??> + <#assign itemTitle= stack.findString(parameters.listTitle)/> + <#else> + <#assign itemTitle = ''/> + </#if> + </#if> + <option value="${itemKeyStr?html}"<#rt/> + <#if tag.contains(parameters.nameValue, itemKey) == true> + selected="selected"<#rt/> + </#if> + <#if itemCssClass?if_exists != ""> + class="${itemCssClass?html}"<#rt/> + </#if> + <#if itemCssStyle?if_exists != ""> + style="${itemCssStyle?html}"<#rt/> + </#if> + <#if itemTitle?if_exists != ""> + title="${itemTitle?html}"<#rt/> + </#if> + >${itemValue?html}</option><#lt/> +</(a)s.iterator> + +<#include "/${parameters.templateDir}/${parameters.expandTheme}/optgroup.ftl" /> + +</select> + +<#if parameters.multiple?default(false)> + <#if (parameters.id?? && parameters.name??)> + <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" value=""<#rt/> + </#if> + <#if (parameters.id?? && !parameters.name??)> + <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/> + </#if> + <#if ( !parameters.id?? && parameters.name??)> + <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/> + </#if> + <#if ( !parameters.id?? && !parameters.name??)> + <input type="hidden" id="" name="" value="" <#rt/> + </#if> + +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> +</#if> + /> +</#if> 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-03-26 11:16:22 UTC (rev 1757) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-26 15:09:58 UTC (rev 1758) @@ -28,11 +28,19 @@ <s:text name="wao.ui.page.SamplingPlan.title" /> </title> - <style> - .currentMonth{ - background-color: yellow; - } - </style> + <script> + + var SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url action="sample-rows-filter-values-json" />'; + + $(document).ready(function () { + + var sampleRowsFilterController = new SampleRowsFilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL); + sampleRowsFilterController.init(); + + }); + + </script> + </head> <h1> @@ -62,44 +70,51 @@ label="%{getText('wao.ui.entity.Company')}" list="samplingPlan.filterValues.companies" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="companies" + cssClass="input-xlarge" /> <s:select name="filter.programNames" label="%{getText('wao.ui.field.SampleRow.programName')}" list="samplingPlan.filterValues.programNames" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="programNames" + cssClass="input-xlarge" /> <s:select name="filter.fishingZoneFacadeNames" label="%{getText('wao.ui.field.FishingZone.facadeName')}" list="samplingPlan.filterValues.fishingZoneFacadeNames" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="fishingZoneFacadeNames" + cssClass="input-xlarge" /> <s:select name="filter.fishingZoneSectorNames" label="%{getText('wao.ui.field.FishingZone.sectorName')}" list="samplingPlan.filterValues.fishingZoneSectorNames" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="fishingZoneSectorNames" + cssClass="input-xlarge" /> <s:select name="filter.sampleRowCodes" label="%{getText('wao.ui.field.SampleRow.code')}" list="samplingPlan.filterValues.sampleRowCodes" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="sampleRowCodes" + cssClass="input-xlarge" /> <s:select name="filter.fishingGearDcfIds" label="%{getText('wao.ui.entity.fishingGearDCF')}" list="samplingPlan.filterValues.fishingGearDcfs" value="%getText(#value)" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="fishingGearDcfs" + cssClass="input-xlarge" /> <s:select name="filter.targetSpeciesDcfIds" label="%{getText('wao.ui.entity.targetSpeciesDCF')}" list="samplingPlan.filterValues.targetSpeciesDcfs" multiple="true" - cssClass="input-xxlarge" /> + dataBinding="targetSpeciesDcfs" + cssClass="input-xlarge" /> <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-26 11:16:22 UTC (rev 1757) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-26 15:09:58 UTC (rev 1758) @@ -28,7 +28,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><decorator:title default="Wao"/> - Wao</title> - <sj:head locale="fr" jqueryui="true" loadAtOnce="true" jquerytheme="start" /> + <sj:head locale="fr" jqueryui="true" /> <sb:head /> <script type="text/javascript" src="<s:url value='/js/moment-js-2.5.1/moment-with-langs.js' />"></script> <script type="text/javascript" src="<s:url value='/js/select2-3.4.5/select2.min.js' />"></script> Modified: trunk/wao-web/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/js/wao.js 2014-03-26 11:16:22 UTC (rev 1757) +++ trunk/wao-web/src/main/webapp/js/wao.js 2014-03-26 15:09:58 UTC (rev 1758) @@ -18,6 +18,107 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ + +var SampleRowsFilterModel = function (filterValuesUrl) { + + var self = this; + + this.filterValues = {}; + this.filterValuesUrl = filterValuesUrl; + + this.setFilterValues = function (filterValues) { + this.filterValues = filterValues; + $(this).trigger('updated'); + }; + + this.updateFilterValues = function(filter) { + var successCallback = function (data) { + self.setFilterValues(data.filterValues) + }; + $.get(this.filterValuesUrl, filter, successCallback); + } + +}; + +var SampleRowsFilterView = function (sampleRowsFilterModel) { + + var self = this; + + this.model = sampleRowsFilterModel; + + this.getFilter = function () { + var filter = {}; + $('select').each(function (index, select) { + var $select = $(select); + var parameterName = $select.prop('name'); + var parameterValues = []; + $select.find('option:selected').each(function (index, option) { + parameterValues.push($(option).prop('value')); + }); + filter[parameterName] = parameterValues; + }); + $('input[type=text]').each(function (index, input) { + var $input = $(input); + var parameterName = $(input).prop('name'); + var parameterValue = $(input).prop('value'); + filter[parameterName] = parameterValue; + }); + return filter; + }; + + this.refreshFilterValues = function() { + // store options selected by user to re-select them after update + var filter = this.getFilter(); + var filterValues = this.model.filterValues; + $('select').each(function (index, select) { + var $select = $(select).empty(); + var name = $select.prop('name'); + // FIXME brendan 26/03/14 should be data-binding but freemarker break the template :-( + var binding = $select.attr('databinding'); + var options = filterValues[binding]; + $.each(options, function (value, label) { + if (typeof value == "number") { + value = label; + } + var optionHtml = '<option value="' + value + '">' + label + '</option>'; + $select.append(optionHtml); + }); + var selectedOptions = filter[name]; + $.each(selectedOptions, function (index, selectedOption) { + $select.find('option[value="' + selectedOption + '"]').prop('selected', 'selected'); + }); + }); + } + + $(this.model).on('updated', function () { + self.refreshFilterValues(); + }); + +}; + +var SampleRowsFilterController = function (filterValuesUrl) { + + var self = this; + + this.model = new SampleRowsFilterModel(filterValuesUrl); + this.view = new SampleRowsFilterView(this.model); + + this.onFilterChange = function () { + var filter = this.view.getFilter(); + this.model.updateFilterValues(filter); + }; + + this.init = function () { + $('input').change(function () { + self.onFilterChange(); + }); + $('select').change(function () { + self.onFilterChange(); + }); + } + +}; + $(document).ready(function () { $('select').select2();

1 0

r1757 - in trunk/wao-web/src/main/resources: . template template/bootstrap
by bleny＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: bleny Date: 2014-03-26 12:16:22 +0100 (Wed, 26 Mar 2014) New Revision: 1757 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1757 Log: copy select.ftl in classpath to override it Added: trunk/wao-web/src/main/resources/template/ trunk/wao-web/src/main/resources/template/bootstrap/ trunk/wao-web/src/main/resources/template/bootstrap/select.ftl Added: trunk/wao-web/src/main/resources/template/bootstrap/select.ftl =================================================================== --- trunk/wao-web/src/main/resources/template/bootstrap/select.ftl (rev 0) +++ trunk/wao-web/src/main/resources/template/bootstrap/select.ftl 2014-03-26 11:16:22 UTC (rev 1757) @@ -0,0 +1,141 @@ +<#-- +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#setting number_format="#.#####"> +TOTO +<select<#rt/> + name="${parameters.name?default("")?html}"<#rt/> +<#if parameters.get("size")??> + size="${parameters.get("size")?html}"<#rt/> +</#if> +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> +</#if> +<#if parameters.tabindex??> + tabindex="${parameters.tabindex?html}"<#rt/> +</#if> +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> +</#if> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" /> +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> +</#if> +<#if parameters.multiple?default(false)> + multiple="multiple"<#rt/> +</#if> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> +> +<#if parameters.headerKey?? && parameters.headerValue??> + <option value="${parameters.headerKey?html}" + <#if tag.contains(parameters.nameValue, parameters.headerKey) == true> + selected="selected" + </#if> + >${parameters.headerValue?html}</option> +</#if> +<#if parameters.emptyOption?default(false)> + <option value=""></option> +</#if> +<@s.iterator value="parameters.list"> + <#if parameters.listKey??> + <#if stack.findValue(parameters.listKey)??> + <#assign itemKey = stack.findValue(parameters.listKey)/> + <#assign itemKeyStr = stack.findString(parameters.listKey)/> + <#else> + <#assign itemKey = ''/> + <#assign itemKeyStr = ''/> + </#if> + <#else> + <#assign itemKey = stack.findValue('top')/> + <#assign itemKeyStr = stack.findString('top')> + </#if> + <#if parameters.listValue??> + <#if stack.findString(parameters.listValue)??> + <#assign itemValue = stack.findString(parameters.listValue)/> + <#else> + <#assign itemValue = ''/> + </#if> + <#else> + <#assign itemValue = stack.findString('top')/> + </#if> + <#if parameters.listCssClass??> + <#if stack.findString(parameters.listCssClass)??> + <#assign itemCssClass= stack.findString(parameters.listCssClass)/> + <#else> + <#assign itemCssClass = ''/> + </#if> + </#if> + <#if parameters.listCssStyle??> + <#if stack.findString(parameters.listCssStyle)??> + <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/> + <#else> + <#assign itemCssStyle = ''/> + </#if> + </#if> + <#if parameters.listTitle??> + <#if stack.findString(parameters.listTitle)??> + <#assign itemTitle= stack.findString(parameters.listTitle)/> + <#else> + <#assign itemTitle = ''/> + </#if> + </#if> + <option value="${itemKeyStr?html}"<#rt/> + <#if tag.contains(parameters.nameValue, itemKey) == true> + selected="selected"<#rt/> + </#if> + <#if itemCssClass?if_exists != ""> + class="${itemCssClass?html}"<#rt/> + </#if> + <#if itemCssStyle?if_exists != ""> + style="${itemCssStyle?html}"<#rt/> + </#if> + <#if itemTitle?if_exists != ""> + title="${itemTitle?html}"<#rt/> + </#if> + >${itemValue?html}</option><#lt/> +</(a)s.iterator> + +<#include "/${parameters.templateDir}/${parameters.expandTheme}/optgroup.ftl" /> + +</select> + +<#if parameters.multiple?default(false)> + <#if (parameters.id?? && parameters.name??)> + <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" value=""<#rt/> + </#if> + <#if (parameters.id?? && !parameters.name??)> + <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/> + </#if> + <#if ( !parameters.id?? && parameters.name??)> + <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/> + </#if> + <#if ( !parameters.id?? && !parameters.name??)> + <input type="hidden" id="" name="" value="" <#rt/> + </#if> + +<#if parameters.disabled?default(false)> + disabled="disabled"<#rt/> +</#if> + /> +</#if>

1 0

26 Mar '14

Author: tchemit Date: 2014-03-26 11:27:25 +0100 (Wed, 26 Mar 2014) New Revision: 1756 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1756 Log: respect Serializable contract Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,12 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; -public class AuthenticatedWaoUser { +import java.io.Serializable; +public class AuthenticatedWaoUser implements Serializable{ + + private static final long serialVersionUID = 1L; + protected WaoUser waoUser; protected UserProfile userProfile; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -35,6 +35,7 @@ import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.PeriodDates; +import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -42,8 +43,10 @@ import java.util.Map; import java.util.Set; -public class UpdateSampleRowCommand { +public class UpdateSampleRowCommand implements Serializable{ + private static final long serialVersionUID = 1L; + protected DateFormat monthFormat = new SimpleDateFormat("yyyyMM"); protected boolean creation; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -21,14 +21,17 @@ * #L% */ +import java.io.Serializable; import java.util.Date; /** * Répresente l'état d'une référential à un instant donné. (Date de dernière * mise à jour par exemple). */ -public class ReferentialState { +public class ReferentialState implements Serializable{ + private static final long serialVersionUID = 1L; + protected String referentialName; protected long size; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -30,8 +30,12 @@ import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.lang3.StringUtils; -public class UpdateWaoUserCommand { +import java.io.Serializable; +public class UpdateWaoUserCommand implements Serializable{ + + private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; protected WaoUser waoUser; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -27,6 +27,8 @@ public class WaoActionSupport extends BaseAction { + private static final long serialVersionUID = 1L; + protected WaoApplicationConfig applicationConfig; protected WaoSession session; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -137,6 +137,8 @@ } I18nInitializer initializer = new DefaultI18nInitializer("wao"); + // to show none translated sentences + initializer.setMissingKeyReturnNull(true); I18n.init(initializer, Locale.FRANCE); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class WaoJspActionSupport extends WaoActionSupport { + private static final long serialVersionUID = 1L; + protected WaoSession getSession() { return session; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -29,6 +29,8 @@ public class WaoSession implements Serializable { + private static final long serialVersionUID = 1L; + public static final String SESSION_PARAMETER = "waoSession"; protected Collection<String> messages; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -21,6 +21,7 @@ * #L% */ +import com.opensymphony.xwork2.ObjectFactory; import fr.ifremer.wao.WaoEntityEnum; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,8 +30,10 @@ import java.util.Map; -public class WaoStrutsObjectFactory extends StrutsObjectFactory { +public class WaoStrutsObjectFactory extends ObjectFactory { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(WaoStrutsObjectFactory.class); @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -38,6 +38,8 @@ ) public abstract class AbstractDownloadCsvAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM_HHhmm"); public abstract String getFileName(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -37,12 +37,14 @@ public abstract class AbstractImportCsvAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(AbstractImportCsvAction.class); protected static final ImmutableSet<String> CSV_CONTENT_TYPES = ImmutableSet.of("text/csv", "text/comma-separated-values", "application/vnd.ms-excel"); - protected ReferentialService service; + protected transient ReferentialService service; protected File csvFile; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -32,6 +32,8 @@ }) public class IndexAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,5 +31,6 @@ }) public abstract class AbstractImportReferentialAction extends AbstractImportCsvAction { + private static final long serialVersionUID = 1L; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -30,8 +30,10 @@ public class CompaniesAction extends WaoJspActionSupport implements Preparable { - protected CompaniesService service; + private static final long serialVersionUID = 1L; + protected transient CompaniesService service; + protected List<Company> companies; public void setService(CompaniesService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ }) public class DeleteCompanyAction extends WaoJspActionSupport { - protected CompaniesService service; + private static final long serialVersionUID = 1L; + protected transient CompaniesService service; + protected String companyId; public void setCompanyId(String companyId) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ }) public class DeleteWaoUserAction extends WaoJspActionSupport { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected String waoUserId; public void setService(WaoUsersService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -35,8 +35,10 @@ }) public class EditCompanyAction extends WaoJspActionSupport implements Preparable { - protected CompaniesService service; + private static final long serialVersionUID = 1L; + protected transient CompaniesService service; + protected String companyId; protected Company company; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -42,8 +42,10 @@ }) public class EditWaoUserAction extends WaoJspActionSupport implements Preparable { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected Optional<String> optionalWaoUserId = Optional.absent(); protected Optional<String> optionalCompanyId = Optional.absent(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportBoatGroupsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected void importCsv(InputStream csvInputStream) throws ImportErrorException { service.importBoatGroups(csvInputStream); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportBoatsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected void importCsv(InputStream csvInputStream) throws ImportErrorException { service.importBoats(csvInputStream); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportContactStateMotivesAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.contactStateMotives.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportFishingZonesAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.fishingZones.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportObsdebCodesAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.obsDebCodes.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportTerrestrialDivisionsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.terrestrialDivisions.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportTerrestrialLocationsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.terrestrialLocations.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,10 @@ public class ReferentialManagementAction extends WaoJspActionSupport implements Preparable { - protected ReferentialService referentialService; + private static final long serialVersionUID = 1L; + protected transient ReferentialService referentialService; + protected List<ReferentialState> referentialStates; public void setReferentialService(ReferentialService referentialService) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ public class WaoUsersAction extends WaoJspActionSupport implements Preparable { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected Optional<String> optionalCompanyId = Optional.absent(); protected List<WaoUser> waoUsers; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -44,8 +44,10 @@ }) public class LoginAction extends WaoJspActionSupport { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected String login; protected String password; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -30,6 +30,8 @@ }) public class LogoutAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + @Override public String execute() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -25,4 +25,6 @@ public class WaoJsonActionSupport extends WaoActionSupport { + private static final long serialVersionUID = 1L; + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ }) public class CommentSampleRowAction extends WaoJspActionSupport { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + protected String sampleRowId; protected String comment; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,10 @@ }) public class DeleteNewsAction extends WaoJspActionSupport { - protected NewsService service; + private static final long serialVersionUID = 1L; + protected transient NewsService service; + protected String newsId; public void setService(NewsService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -34,8 +34,10 @@ }) public class EditNewsAction extends WaoJspActionSupport implements Preparable { - protected NewsService service; + private static final long serialVersionUID = 1L; + protected transient NewsService service; + protected String newsId; protected News news; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -48,9 +48,11 @@ }) public class EditSampleRowAction extends WaoJspActionSupport implements Preparable { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(EditSampleRowAction.class); - protected ObsMerSamplingPlanService service; + protected transient ObsMerSamplingPlanService service; protected Optional<String> optionalSampleRowId = Optional.absent(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,10 @@ public class ExportSamplingPlanAction extends AbstractDownloadCsvAction implements Preparable { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + protected SampleRowsFilter filter; public void setService(ObsMerSamplingPlanService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -35,8 +35,10 @@ }) public class ImportSamplingPlanAction extends AbstractImportCsvAction { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + public void setService(ObsMerSamplingPlanService service) { this.service = service; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -29,8 +29,10 @@ public class NewsAction extends WaoJspActionSupport { - protected NewsService service; + private static final long serialVersionUID = 1L; + protected transient NewsService service; + protected List<News> recentNews; public void setService(NewsService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -27,8 +27,10 @@ public class SampleRowLogAction extends WaoJspActionSupport { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + protected String sampleRowId; protected SampleRow sampleRow; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,7 +33,7 @@ protected transient ObsMerSamplingPlanService service; - protected transient SampleRowsFilter filter; + protected SampleRowsFilter filter; protected ObsMerSamplingPlan samplingPlan;

1 0

r1755 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: tchemit Date: 2014-03-26 11:26:25 +0100 (Wed, 26 Mar 2014) New Revision: 1755 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1755 Log: fix display-real-tides Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 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-03-26 09:08:46 UTC (rev 1754) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-26 10:26:25 UTC (rev 1755) @@ -233,7 +233,7 @@ <s:iterator value="samplingPlan.months" var="month"> <td<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> class="current-month"</s:if>> <s:property value="%{#samplingPlanRow.getNbTidesExpected(#month)}"/> - <span class="display-tides-real"> + <span<s:if test="#samplingPlanRow.hasNbTidesReal(#month) && !#authenticatedWaoUser.guest"> class="display-tides-real"</s:if>> <em>(<s:property value="%{#samplingPlanRow.getNbTidesReal(#month)}"/>) </em> </span>

1 0

r1754 - trunk/wao-persistence/src/main/java/fr/ifremer/wao
by tchemit＠users.forge.codelutin.com 26 Mar '14

26 Mar '14

Author: tchemit Date: 2014-03-26 10:08:46 +0100 (Wed, 26 Mar 2014) New Revision: 1754 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1754 Log: filter must be serializable + implements equals + hashcode for contactsFilter Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-03-25 18:39:11 UTC (rev 1753) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-03-26 09:08:46 UTC (rev 1754) @@ -7,11 +7,15 @@ import fr.ifremer.wao.entity.SamplingStrategy; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import java.io.Serializable; import java.util.Date; +import java.util.Objects; import java.util.Set; -public class ContactsFilter { +public class ContactsFilter implements Serializable { + private static final long serialVersionUID = 1L; + protected SampleRowsFilter sampleRowFilter; /** @@ -247,6 +251,66 @@ } @Override + public boolean equals(Object o) { + + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ContactsFilter that = (ContactsFilter) o; + + boolean equals = Objects.equals(sampleRowFilter, that.sampleRowFilter) + && Objects.equals(periodFrom, that.periodFrom) + && Objects.equals(periodTo, that.periodTo) + && WaoUtils.isEqualCollection(contactIds, that.contactIds) + && WaoUtils.isEqualCollection(contactStates, that.contactStates) + && WaoUtils.isEqualCollection(dataReliabilities, that.dataReliabilities) + && WaoUtils.isEqualCollection(actualSamplingStrategies, that.actualSamplingStrategies) + && WaoUtils.isEqualCollection(observationTypes, that.observationTypes) + && WaoUtils.isEqualCollection(observedDataControls, that.observedDataControls) + && WaoUtils.isEqualCollection(observerIds, that.observerIds) + && WaoUtils.isEqualCollection(terrestrialLocationIds, that.terrestrialLocationIds) + && WaoUtils.isEqualCollection(contactStateMotiveIds, that.contactStateMotiveIds) + && Objects.equals(mammalsCaptureOnly, that.mammalsCaptureOnly) + && Objects.equals(mammalsObservationOnly, that.mammalsObservationOnly) + && Objects.equals(commentDefinedOnly, that.commentDefinedOnly) + && Objects.equals(commentAdminDefinedOnly, that.commentAdminDefinedOnly) + && Objects.equals(commentCompanyDefinedOnly, that.commentCompanyDefinedOnly) + && WaoUtils.isEqualCollection(companyAcceptations, that.companyAcceptations) + && WaoUtils.isEqualCollection(programAcceptations, that.programAcceptations) + && WaoUtils.isEqualCollection(completeSamplings, that.completeSamplings) + && Objects.equals(filterOnObservationBeginDate, that.filterOnObservationBeginDate) + && Objects.equals(sortedByBoardingDate, that.sortedByBoardingDate); + return equals; + } + + @Override + public int hashCode() { + int hashCode = Objects.hashCode(sampleRowFilter); + hashCode = 31 * hashCode + Objects.hashCode(periodFrom); + hashCode = 31 * hashCode + Objects.hashCode(periodFrom); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(contactIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(contactStates); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(dataReliabilities); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(actualSamplingStrategies); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(observationTypes); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(observedDataControls); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(observerIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(terrestrialLocationIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(contactStateMotiveIds); + hashCode = 31 * hashCode + Objects.hashCode(mammalsCaptureOnly); + hashCode = 31 * hashCode + Objects.hashCode(mammalsObservationOnly); + hashCode = 31 * hashCode + Objects.hashCode(commentDefinedOnly); + hashCode = 31 * hashCode + Objects.hashCode(commentAdminDefinedOnly); + hashCode = 31 * hashCode + Objects.hashCode(commentCompanyDefinedOnly); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(companyAcceptations); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(programAcceptations); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(completeSamplings); + hashCode = 31 * hashCode + Objects.hashCode(filterOnObservationBeginDate); + hashCode = 31 * hashCode + Objects.hashCode(sortedByBoardingDate); + return hashCode; + } + + @Override public String toString() { return ReflectionToStringBuilder.reflectionToString(this); } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 18:39:11 UTC (rev 1753) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-26 09:08:46 UTC (rev 1754) @@ -25,12 +25,15 @@ import fr.ifremer.wao.entity.SamplingStrategy; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import java.io.Serializable; import java.util.Date; import java.util.Objects; import java.util.Set; -public class SampleRowsFilter { +public class SampleRowsFilter implements Serializable { + private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; protected Set<String> sampleRowIds; @@ -209,16 +212,16 @@ @Override public int hashCode() { int hashCode = obsProgram.hashCode(); - hashCode = 31 * hashCode + (sampleRowIds == null ? 0 : sampleRowIds.size()); - hashCode = 31 * hashCode + (fishingZoneFacadeNames == null ? 0 : fishingZoneFacadeNames.size()); - hashCode = 31 * hashCode + (fishingZoneSectorNames == null ? 0 : fishingZoneSectorNames.size()); - hashCode = 31 * hashCode + (sampleRowCodes == null ? 0 : sampleRowCodes.size()); - hashCode = 31 * hashCode + (programNames == null ? 0 : programNames.size()); - hashCode = 31 * hashCode + (fishingGearDcfIds == null ? 0 : fishingGearDcfIds.size()); - hashCode = 31 * hashCode + (targetSpeciesDcfIds == null ? 0 : targetSpeciesDcfIds.size()); - hashCode = 31 * hashCode + (samplingStrategies == null ? 0 : samplingStrategies.size()); - hashCode = 31 * hashCode + (terrestrialDistrictIds == null ? 0 : terrestrialDistrictIds.size()); - hashCode = 31 * hashCode + (companyIds == null ? 0 : companyIds.size()); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(sampleRowIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingZoneFacadeNames); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingZoneSectorNames); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(sampleRowCodes); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(programNames); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(fishingGearDcfIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(targetSpeciesDcfIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(samplingStrategies); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(terrestrialDistrictIds); + hashCode = 31 * hashCode + WaoUtils.collectionHashcode(companyIds); return hashCode; } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-03-25 18:39:11 UTC (rev 1753) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-03-26 09:08:46 UTC (rev 1754) @@ -111,4 +111,7 @@ return isEqualCollection; } + public static int collectionHashcode(Collection<?> a) { + return a == null ? 0 : a.size(); + } }

1 0

Build failed in Jenkins: wao-nightly » Wao :: Persistence #12
by admin+ci-codelutin.com＠codelutin.com 25 Mar '14

25 Mar '14

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> Changes: [bleny] refs #4483 reintroduce SampleRowLogImplTest ------------------------------------------ [...truncated 236 lines...] [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] Scan 235 files header done in 262.427ms. [INFO] * uptodate header on 36 files. * add header on 199 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-persistence --- [INFO] Compiling 202 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ wao-persistence --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ wao-persistence --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-persistence --- [INFO] Compiling 1 source file to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ wao-persistence --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.wao.entity.SampleRowLogImplTest log4j:WARN No appenders could be found for logger (fr.ifremer.wao.entity.SampleRowLogImplTest). log4j:WARN Please initialize the log4j system properly. log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more info. Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.121 sec - in fr.ifremer.wao.entity.SampleRowLogImplTest Results : Tests run: 3, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-persistence --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.7.3:generate (generate-entities) @ wao-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] Copy file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] No file generated. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> for 1 file(s). [INFO] No file generated. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:577) getObjectElements - Invalid tagvalue [fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy] : Element 'boatDistrict' of type 'attribute' on classifier 'fr.ifremer.wao.entity.Boat' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:577) getObjectElements - Invalid tagvalue [fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse] : Element 'SampleRow' of type 'attribute' on classifier 'fr.ifremer.wao.entity.WaoUser' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique] : this tagvalue 'unique' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.copyright] : the tagvalue 'copyright' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.exceptionClass] : the tagvalue 'exceptionClass' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.java.lang.String] : the tagvalue 'java.lang.String' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:303) loadModelTagValue - Invalid model tag value [model.tagValue.useEnumerationName] : this tagvalue 'useEnumerationName' can not be apply on the model. INFO [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:270) loadModelProperties - 32 tag values were succesfull imported from <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getUserProfile([fr.ifremer.wao.entity.ObsProgram obsProgram<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name getUserProfile is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setDCF5Code([java.lang.String codes<<[]>> tagvalue: {}, java.lang.String separatorRegex<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setDCF5Code is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getSampleMonth([java.util.Date date<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name getSampleMonth is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setLogText([fr.ifremer.wao.entity.SampleRow oldSampleRow<<[]>> tagvalue: {}, fr.ifremer.wao.entity.SampleRow newSampleRow<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setLogText is already reserved for a getter/setter of an entity attribute INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.WaoUserImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.FishingGearDCFImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialDivisionImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.DCF5CodeImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleRowImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.BoatImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.ContactImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.IndicatorImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.ContactStateMotifImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialLocationImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.BoatGroupImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.CompanyImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.IndicatorLevelImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.FishingZoneImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleMonthImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.FleetImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.UserProfileImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TargetSpeciesDCFImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.ObsDebCodeImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleRowLogImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.NewsImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.WaoUserTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialDivisionTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleRowTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialLocationTopiaDao], already found in class-path. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-persistence --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-persistence --- [INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect-artifacts.txt [INFO] Copying wao-persistence-4.0-SNAPSHOT.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-persistence/wao-persistence-4.0-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-persistence/THIRD-PARTY.properties [INFO] Copying wao-persistence-4.0-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-persistence/wao-persistence-4.0-SNAPSHOT-sources.jar [INFO] Copying wao-persistence-4.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-persistence/wao-persistence-4.0-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.4:sign (sign-artifacts) @ wao-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-persistence --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-1:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile [INFO] org.apache.commons:commons-lang3:jar:3.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] com.google.guava:guava:jar:15.0:compile [INFO] junit:junit:jar:4.11:test [WARNING] Used undeclared dependencies found: [WARNING] org.hibernate:hibernate-core:jar:4.2.8.Final:compile [WARNING] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [WARNING] commons-collections:commons-collections:jar:3.2.1:compile [WARNING] Unused declared dependencies found: [WARNING] org.apache.commons:commons-collections4:jar:4.0:compile [JENKINS] Archiving disabled

1 5