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

r1654 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: bleny Date: 2013-04-23 11:04:36 +0200 (Tue, 23 Apr 2013) New Revision: 1654 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1654 Log: fixes #1901, update synthesis for obsvente now expected observations = value in samplemonth * averageObservationsCount Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2013-04-22 15:56:33 UTC (rev 1653) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2013-04-23 09:04:36 UTC (rev 1654) @@ -246,9 +246,15 @@ String sampleMonthDateProperty = sampleMonthProperty.periodDate(); TopiaQuery query = toTopiaQuery(filter). addLeftJoin(sampleRowProperty.sampleMonth(), sampleMonthProperty.defaultAlias(), false). - setSelect(sampleMonthDateProperty). - addSelect(WaoQueryHelper.format("SUM($1)", sampleMonthProperty.expectedTidesValue())). - addBetween(sampleMonthDateProperty, monthsPeriod.getFromDate(), monthsPeriod.getThruDate()). + setSelect(sampleMonthDateProperty); + + if (filter.getObsProgram() == ObsProgram.OBSVENTE) { + query.addSelect(WaoQueryHelper.format("SUM($1 * $2)", sampleMonthProperty.expectedTidesValue(), sampleRowProperty.averageObservationsCount())); + } else { + query.addSelect(WaoQueryHelper.format("SUM($1)", sampleMonthProperty.expectedTidesValue())); + } + + query.addBetween(sampleMonthDateProperty, monthsPeriod.getFromDate(), monthsPeriod.getThruDate()). addGroup(sampleMonthDateProperty). addOrder(sampleMonthDateProperty);

1 0

r1653 - in trunk: src/site/rst/obsVente wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv2/models wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

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">

1 0

r1652 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n wao-ui/src/main/webapp
by bleny＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: bleny Date: 2013-04-22 17:02:33 +0200 (Mon, 22 Apr 2013) New Revision: 1652 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1652 Log: refs #1901, update model, add migration, show in sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2013-04-22 13:36:56 UTC (rev 1651) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2013-04-22 15:02:33 UTC (rev 1652) @@ -1202,4 +1202,14 @@ queries.add("ALTER TABLE SampleRow DROP COLUMN terrestrialLocation"); } + + @Override + protected void addAverageObservationsCountToSampleRow_3_4(List<String> queries) { + + queries.add("ALTER TABLE SampleRow ADD averageObservationsCount SMALLINT DEFAULT 0"); + + queries.add("UPDATE SampleRow SET averageObservationsCount = 1 WHERE obsProgramOrdinal = 1"); + + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2013-04-22 13:36:56 UTC (rev 1651) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2013-04-22 15:02:33 UTC (rev 1652) @@ -665,11 +665,15 @@ addMultiplicityBetweenSampleRowsAndTerrestrialLocations_3_4(queries); + addAverageObservationsCountToSampleRow_3_4(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } + protected abstract void addAverageObservationsCountToSampleRow_3_4(List<String> queries); + protected abstract void addMultiplicityBetweenSampleRowsAndTerrestrialLocations_3_4(List<String> queries); } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2013-04-22 13:36:56 UTC (rev 1651) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2013-04-22 15:02:33 UTC (rev 1652) @@ -614,6 +614,9 @@ if (user.isObsMer()) { nbColumnsForOther += 4; // nbObservants, observationTimesInDays, averageTideTime, appliedCoverageRate } + if (user.isObsVente()) { + nbColumnsForOther += 1; // averageObservationsCount + } return nbColumnsForOther; } Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2013-04-22 13:36:56 UTC (rev 1651) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2013-04-22 15:02:33 UTC (rev 1652) @@ -294,8 +294,10 @@ wao.ui.samplingPlan.actions=Actions wao.ui.samplingPlan.actual=actual wao.ui.samplingPlan.addSampleRow=Add a line in the sampling plan +wao.ui.samplingPlan.averageObservationsCount=Number of observations wao.ui.samplingPlan.averageTideTime=Average tide time (d.) wao.ui.samplingPlan.effort=Observation effort +wao.ui.samplingPlan.effort.obsVente=Observation effort wao.ui.samplingPlan.estimated=estimated wao.ui.samplingPlan.expected=expected wao.ui.samplingPlan.export=Export the sampling plan from %s to %s Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2013-04-22 13:36:56 UTC (rev 1651) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2013-04-22 15:02:33 UTC (rev 1652) @@ -290,8 +290,10 @@ wao.ui.samplingPlan.actions=Actions wao.ui.samplingPlan.actual=réalisé wao.ui.samplingPlan.addSampleRow=Ajouter une ligne au plan d'échantillonnage +wao.ui.samplingPlan.averageObservationsCount=Nombre d'observations wao.ui.samplingPlan.averageTideTime=Durée moyenne d'une marée (J.) wao.ui.samplingPlan.effort=Effort d'observation en nombre de marées +wao.ui.samplingPlan.effort.obsVente=Effort d'observation en nombre de sorties wao.ui.samplingPlan.estimated=estimé wao.ui.samplingPlan.expected=planifié wao.ui.samplingPlan.export=Exporter le plan d'échantillonnage du %s au %s Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2013-04-22 13:36:56 UTC (rev 1651) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2013-04-22 15:02:33 UTC (rev 1652) @@ -96,7 +96,12 @@ <tr class="main"> <td colspan="${nbColumnsForProfession}">${message:wao.ui.samplingPlan.sampledProfessions}</td> <td colspan="${nbColumnsForMonths}"> - ${message:wao.ui.samplingPlan.effort} + <t:if test="user.obsVente"> + ${message:wao.ui.samplingPlan.effort.obsVente} + <p:else> + ${message:wao.ui.samplingPlan.effort} + </p:else> + </t:if> [ ${message:wao.ui.samplingPlan.expected} <em>(${message:wao.ui.samplingPlan.actual}<t:if t:test="filter.estimatedTides"> + ${message:wao.ui.samplingPlan.estimated}</t:if>)</em> ] </td> <td colspan="${nbColumnsForOther}">${message:wao.ui.misc.others}</td> @@ -147,6 +152,9 @@ <td class="width60">${message:wao.ui.samplingPlan.nbObservants}</td> <td class="width60">${message:wao.ui.field.SampleRow.appliedCoverageRate}</td> </t:if> + <t:if test="user.obsVente"> + <td class="width60">${message:wao.ui.samplingPlan.averageObservationsCount}</td> + </t:if> <td class="width60 bright">${message:wao.ui.misc.comment}</td> <td class="bright">${message:wao.ui.samplingPlan.actions}</td> </tr> @@ -292,6 +300,9 @@ </t:if> </td> </t:if> + <t:if test="user.obsVente"> + <td class="width60 acenter">${row.averageObservationsCount}</td> + </t:if> <td class="width60 acenter bright"> <t:if t:test="rowComment"> <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:rowComment" t:effect="appear">

1 0

r1651 - trunk/wao-ui/src/main/resources
by bleny＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: bleny Date: 2013-04-22 15:36:56 +0200 (Mon, 22 Apr 2013) New Revision: 1651 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1651 Log: add commented lines in log4j.prop Modified: trunk/wao-ui/src/main/resources/log4j.properties Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2013-04-22 13:34:38 UTC (rev 1650) +++ trunk/wao-ui/src/main/resources/log4j.properties 2013-04-22 13:36:56 UTC (rev 1651) @@ -69,3 +69,6 @@ # log4j.logger.fr.ifremer.wao.WaoContextImpl=INFO # log4j.logger.fr.ifremer.wao.ui.services.AppModule=TRACE + +# log4j.logger.fr.ifremer.wao.entity=TRACE +# log4j.logger.fr.ifremer.wao.service=TRACE

1 0

r1650 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: bleny Date: 2013-04-22 15:34:38 +0200 (Mon, 22 Apr 2013) New Revision: 1650 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1650 Log: fix a NPE in hibernate by adding a prefix in a IN ELEMENTS clause Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2013-04-22 10:03:07 UTC (rev 1649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2013-04-22 13:34:38 UTC (rev 1650) @@ -159,7 +159,7 @@ } if (filter.getTerrestrialDistrict() != null) { - query.addInElements(":terrestrialDistrict", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS); + query.addInElements(":terrestrialDistrict", "SR." + SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS); query.addParam("terrestrialDistrict", filter.getTerrestrialDistrict()); }

1 0

r1649 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 22 Apr '13

22 Apr '13

Author: bleny Date: 2013-04-22 12:03:07 +0200 (Mon, 22 Apr 2013) New Revision: 1649 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1649 Log: fixes #1910 mettre en place l'envoi automatique d'un mail pour l'ajour du navire au portefeuil Allegro Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-04-19 16:52:25 UTC (rev 1648) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2013-04-22 10:03:07 UTC (rev 1649) @@ -1148,6 +1148,8 @@ ImmutableSet.of( ContactState.OBSERVATION_DONE, ContactState.OBSERVATION_EXPECTED).contains(contactState); + } else if (obsProgram == ObsProgram.OBSVENTE) { + addBoatToObserversAllegroWallet = ContactState.OBSERVATION_DONE == contactState; } if (addBoatToObserversAllegroWallet) {

1 0

Jenkins build is back to normal : wao #967
by admin+hudson＠codelutin.com 20 Apr '13

20 Apr '13

See <http://ci.nuiton.org/jenkins/job/wao/967/changes>

1 0

Jenkins build is back to normal : wao » Wao :: Web Interface #967
by admin+hudson＠codelutin.com 20 Apr '13

20 Apr '13

See <http://ci.nuiton.org/jenkins/job/wao/fr.ifremer.wao$wao-ui/967/>

1 0

Jenkins build is back to stable : wao » Wao :: Business #967
by admin+hudson＠codelutin.com 20 Apr '13

20 Apr '13

See <http://ci.nuiton.org/jenkins/job/wao/fr.ifremer.wao$wao-business/967/changes>

1 0

r1648 - in trunk/wao-business/src/main/java/fr/ifremer/wao: io/csv2/models io/csv2/models/operations service
by bleny＠users.forge.codelutin.com 19 Apr '13

19 Apr '13

Author: bleny Date: 2013-04-19 18:52:25 +0200 (Fri, 19 Apr 2013) New Revision: 1648 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1648 Log: fix build, revert some change by reintroducing DistrictParserFormatter Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java 2013-04-19 16:51:52 UTC (rev 1647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java 2013-04-19 16:52:25 UTC (rev 1648) @@ -29,7 +29,7 @@ import fr.ifremer.wao.entity.ShipOwnerImpl; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.io.csv2.models.operations.BoatImmatriculationParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DistrictsParserFormatter; +import fr.ifremer.wao.io.csv2.models.operations.DistrictParserFormatter; import fr.ifremer.wao.io.csv2.models.operations.PortParserFormatter; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.csv.Common; @@ -131,7 +131,7 @@ // boat district modelBuilder.newColumnForImportExport("QUARTIER_CODE", Boat.PROPERTY_DISTRICT, - new DistrictsParserFormatter(districts)); + new DistrictParserFormatter(districts)); // port of registry modelBuilder.newColumnForImportExport("PORT_CODE", Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java 2013-04-19 16:52:25 UTC (rev 1648) @@ -0,0 +1,73 @@ +package fr.ifremer.wao.io.csv2.models.operations; + +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + + +import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.TerrestrialLocation; +import org.nuiton.util.csv.ValueParserFormatter; + +import java.text.ParseException; +import java.util.List; +import java.util.Map; + +public class DistrictParserFormatter implements ValueParserFormatter<TerrestrialLocation> { + + protected Map<String, TerrestrialLocation> indexedDistricts; + + public DistrictParserFormatter(List<TerrestrialLocation> districts) { + if (districts != null) { + for (TerrestrialLocation district : districts) { + if ( ! district.isDistrict()) { + throw new IllegalArgumentException(); + } + } + indexedDistricts = WaoUtils.projectPropertyUnique(districts, TerrestrialLocation.PROPERTY_DISTRICT_CODE); + } + } + + @Override + public String format(TerrestrialLocation district) { + String districtCode = ""; + if (district != null) { + districtCode = district.getDistrictCode(); + } + return districtCode; + } + + @Override + public TerrestrialLocation parse(String value) throws ParseException { + String trimmedValue = value.trim(); + if (trimmedValue.isEmpty()) { + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.districtMissing")); + } + TerrestrialLocation district = indexedDistricts.get(trimmedValue); + if (district == null) { + throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); + } + return district; + } + +} 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-19 16:51:52 UTC (rev 1647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2013-04-19 16:52:25 UTC (rev 1648) @@ -626,8 +626,8 @@ } if (result.isPhoneCall()) { result.getBoat().getBoatGroup(); - result.getTerrestrialLocation(); } + result.sizeTerrestrialLocations(); } else { result.sizeElligibleBoat(); result.sizeSampleMonth();

1 0