Author: bleny Date: 2013-04-22 17:56:33 +0200 (Mon, 22 Apr 2013) New Revision: 1653 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1653 Log: refs #1901, update sample row form and csv import/export model Modified: trunk/src/site/rst/obsVente/administrateur.rst trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/src/site/rst/obsVente/administrateur.rst =================================================================== --- trunk/src/site/rst/obsVente/administrateur.rst 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/src/site/rst/obsVente/administrateur.rst 2013-04-22 15:56:33 UTC (rev 1653) @@ -79,6 +79,7 @@ - PLAN_STRATEGIE (String) : Stratégie d'échantillonnage souhaitée (obligatoire) - PLAN_LIEU_CODE (String) : Code du quartier maritime (obligatoire) - PLAN_LIEU_NOM (String) : Nom du quartier maritime +- PLAN_NOMBRE_OBSERVATIONS (entier) : Nombre moyen d'observation à effectuer par sortie ================================================================================ Importer et exporter les contacts Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2013-04-22 15:56:33 UTC (rev 1653) @@ -194,6 +194,15 @@ } } + protected void compareAverageObservationsCount() { + if (oldRow == null) { + addChange("Le nombre moyen d'observations par sortie est de " + newRow.getAverageTideTime()); + } else if (oldRow.getAverageTideTime() != newRow.getAverageTideTime()) { + addChange("Le nombre moyen d'observations par sortie est passé de " + oldRow.getAverageTideTime() + + " à " + newRow.getAverageTideTime()); + } + } + protected void compareTerrestrialLocations() { Collection<TerrestrialLocation> oldTerrestrialLocations; if (oldRow == null) { @@ -513,7 +522,7 @@ } } - private void compareBlankRows() { + protected void compareBlankRows() { if (oldRow == null || oldRow.isBlankRow() != newRow.isBlankRow()) { if (newRow.isBlankRow()) { addChange("La ligne devient réalisée sans contacts"); @@ -565,6 +574,7 @@ compareSampleMonths(); compareEligibleBoats(); compareFishingZones(); + compareAverageObservationsCount(); } if (ObsProgram.OBSDEB.equals(obsProgram)) { compareDays(); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2013-04-22 15:56:33 UTC (rev 1653) @@ -216,6 +216,7 @@ modelBuilder.newColumnForExport("PLAN_LIEU_NOM", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictNamesFormatter()); modelBuilder.newIgnoredColumn("PLAN_LIEU_NOM"); modelBuilder.newColumnForImportExport("PLAN_LIEU_COMMENT", SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS); + modelBuilder.newColumnForImportExport("PLAN_NOMBRE_OBSERVATIONS", SampleRow.PROPERTY_AVERAGE_OBSERVATIONS_COUNT, Common.PRIMITIVE_INTEGER); } if (log.isDebugEnabled()) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2013-04-22 15:56:33 UTC (rev 1653) @@ -404,7 +404,8 @@ sampleRowBinderModelBuilder.addSimpleProperties( SampleRow.PROPERTY_SAMPLING_STRATEGY_ORDINAL, SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, - SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS); + SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS, + SampleRow.PROPERTY_AVERAGE_OBSERVATIONS_COUNT); } } Binder<SampleRow, SampleRow> sampleRowBinder = sampleRowBinderModelBuilder.toBinder(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2013-04-22 15:56:33 UTC (rev 1653) @@ -654,15 +654,16 @@ } else { sampleRowModel.add(SampleRow.PROPERTY_COMPANY, null); sampleRowModel.add("boats", null); - if (user.getProfile().getObsProgram() == ObsProgram.OBSMER) { + if (user.isObsMer()) { sampleRowModel.include(SampleRow.PROPERTY_CODE, SampleRow.PROPERTY_COMPANY, SampleRow.PROPERTY_NB_OBSERVANTS, SampleRow.PROPERTY_AVERAGE_TIDE_TIME, "boats", SampleRow.PROPERTY_COMMENT, SampleRow.PROPERTY_APPLIED_COVERAGE_RATE); } - if (user.getProfile().getObsProgram() == ObsProgram.OBSVENTE) { + if (user.isObsVente()) { sampleRowModel.include(SampleRow.PROPERTY_CODE, SampleRow.PROPERTY_COMPANY, "boats", SampleRow.PROPERTY_COMMENT); sampleRowModel.add("samplingStrategy"); + sampleRowModel.add(SampleRow.PROPERTY_AVERAGE_OBSERVATIONS_COUNT); } } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties 2013-04-22 15:56:33 UTC (rev 1653) @@ -49,6 +49,7 @@ samplingStrategy-label: Stat\u00e9gie d'\u00e9chantillonnage blankRow-label: Journ\u00e9e r\u00e9alis\u00e9e (sans contacts) appliedCoverageRate-label: Taux de couverture appliqué +averageObservationsCount-label: Nombre d'observations par sortie # FORM errors-banner: La ligne n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2013-04-22 15:02:33 UTC (rev 1652) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2013-04-22 15:56:33 UTC (rev 1653) @@ -299,6 +299,10 @@ <t:label t:for="comment" /> <input t:type="textarea" t:id="comment" cols="40" rows="3" value="sampleRow.comment" /> </p:comment> + <p:averageObservationsCount> + <t:label t:for="averageObservationsCount" /> + <input t:id="averageObservationsCount" t:type="textfield" value="sampleRow.averageObservationsCount" size="2" /> + </p:averageObservationsCount> <p:appliedCoverageRate> <t:label t:for="appliedCoverageRate" /> <span t:type="ck/Tooltip" t:value="${message:wao.ui.indicator.useRightDecimalSymbol}" t:effect="appear">