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