Author: bleny Date: 2014-06-21 14:00:27 +0200 (Sat, 21 Jun 2014) New Revision: 2082 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2082 Log: refs #4491 finish obsvente sampling plan Modified: branches/wao-4.0-obsvente/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/SampleRowsFilterValuesJsonAction.java branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: branches/wao-4.0-obsvente/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- branches/wao-4.0-obsvente/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-21 12:00:27 UTC (rev 2082) @@ -36,3 +36,10 @@ update dcf5code_sampleRow set dcf5code='fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963OTB' where dcf5code='fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963OTBDES'; delete from dcf5code where topiaId='fr.ifremer.wao.entities.DCF5Code#1289320029000#798260963OTBDES'; + +-- Erreur de l'unicité dans le référentiel des codes DCF + +delete from boatInfos where (company, boat) in (select company, boat from boatinfos group by company, boat having count(topiaId) > 1) and topiaVersion = 0; + +alter table boatInfos add constraint company_boat_uniqueness unique (company, boat); + Modified: branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java =================================================================== --- branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java 2014-06-21 12:00:27 UTC (rev 2082) @@ -117,7 +117,7 @@ Optional<String> optionalCompanyId, SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; - this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSMER, optionalCompanyId); + this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSVENTE, optionalCompanyId); this.sampleRowIds = new HashSet<>(); this.facadeMap = new TreeMap<>(); this.totalExpectedForMonths = new TreeMap<>(); Modified: branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java =================================================================== --- branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-21 12:00:27 UTC (rev 2082) @@ -3,12 +3,10 @@ import com.google.common.base.Optional; import com.google.common.cache.Cache; import fr.ifremer.wao.SampleRowsFilter; -import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; -import java.util.Date; import java.util.List; public class ObsVenteSamplingPlanService extends SamplingPlanService { @@ -46,11 +44,6 @@ optionalCompanyId, sampleRowsFilter); - // begin of month - Date periodFrom = sampleRowsFilter.getPeriodFrom(); - // end of month - Date periodTo = WaoUtils.getEndOfMonth(sampleRowsFilter.getPeriodTo()); - for (SampleRow sampleRow : sampleRows) { // ajout de la ligne au build de plan Modified: branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-21 12:00:27 UTC (rev 2082) @@ -149,12 +149,12 @@ protected Date now = new Date(); public String getFilterPeriodFromPlaceholder() { - String placeholder = formatDateTime(DateUtils.addMonths(now, 1)); + String placeholder = formatDate(DateUtils.addMonths(now, 1)); return placeholder; } public String getFilterPeriodToPlaceholder() { - String placeholder = formatDateTime(DateUtils.addYears(now, 1)); + String placeholder = formatDate(DateUtils.addYears(now, 1)); return placeholder; } Modified: branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/SampleRowsFilterValuesJsonAction.java =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/SampleRowsFilterValuesJsonAction.java 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-web/src/main/java/fr/ifremer/wao/web/action/SampleRowsFilterValuesJsonAction.java 2014-06-21 12:00:27 UTC (rev 2082) @@ -48,7 +48,7 @@ this.obsMerSamplingPlanService = obsMerSamplingPlanService; } - public void setObsMerSamplingPlanService(ObsVenteSamplingPlanService obsVenteSamplingPlanService) { + public void setObsVenteSamplingPlanService(ObsVenteSamplingPlanService obsVenteSamplingPlanService) { this.obsVenteSamplingPlanService = obsVenteSamplingPlanService; } Modified: branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-21 12:00:27 UTC (rev 2082) @@ -227,6 +227,7 @@ wao.ui.field.FishingZone.facadeName=Facade wao.ui.field.FishingZone.sectorName=Sector wao.ui.field.SampleRow.appliedCoverageRate=Applied coverage rate +wao.ui.field.SampleRow.averageObservationsCount= wao.ui.field.SampleRow.averageTideTime=Average tide time wao.ui.field.SampleRow.boat=Boat wao.ui.field.SampleRow.code=Line code @@ -556,6 +557,7 @@ wao.ui.tip.youMustChooseBoat=You must choose a boat in the list wao.ui.unavailableOperation=Unavailable operation wao.ui.unit.days=day(s) +wao.ui.unit.observations= wao.ui.unit.observers=observer(s) wao.ui.unknownBoatImmatriculations=Unknown boats\: %s wao.ui.userList=Users list Modified: branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-21 12:00:27 UTC (rev 2082) @@ -227,6 +227,7 @@ wao.ui.field.FishingZone.facadeName=Façade wao.ui.field.FishingZone.sectorName=Zone wao.ui.field.SampleRow.appliedCoverageRate=Taux de couverture appliqué +wao.ui.field.SampleRow.averageObservationsCount= wao.ui.field.SampleRow.averageTideTime=Durée moyenne d'une marée wao.ui.field.SampleRow.boat=Navire wao.ui.field.SampleRow.code=Code ligne @@ -556,6 +557,7 @@ wao.ui.tip.youMustChooseBoat=Vous devez sélectionner un navire dans la liste en cliquant sur son immatriculation pour afficher les détails ici. wao.ui.unavailableOperation=Opération non-disponible wao.ui.unit.days=jour(s) +wao.ui.unit.observations= wao.ui.unit.observers=observateur(s) wao.ui.unknownBoatImmatriculations=Les navires ayant pour immatriculations %s sont inconnus du référentiel wao.ui.userList=Liste des utilisateurs Modified: branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-21 12:00:27 UTC (rev 2082) @@ -221,12 +221,22 @@ cssClass="input-xxlarge" /> - <s:textfield type="number" name="updateSampleRowCommand.sampleRow.nbObservants" label="%{getText('wao.ui.field.SampleRow.nbObservants')}" inputAppend="%{getText('wao.ui.unit.observers')}" cssClass="input-small"/> + <s:if test="updateSampleRowCommand.sampleRow.obsProgram.obsMer"> - <%-- XXX brendan 19/05/14 ne pas mettre type="number" car avec le formatter qui mets la valeur avec ',' on a pas la valeur quand on modifie une ligne --%> - <s:textfield name="updateSampleRowCommand.sampleRow.averageTideTime" label="%{getText('wao.ui.field.SampleRow.averageTideTime')}" inputAppend="%{getText('wao.ui.unit.days')}" cssClass="input-small"/> - <s:textfield name="updateSampleRowCommand.sampleRow.appliedCoverageRate" label="%{getText('wao.ui.field.SampleRow.appliedCoverageRate')}" inputAppend="%" cssClass="input-small"/> + <s:textfield type="number" name="updateSampleRowCommand.sampleRow.nbObservants" label="%{getText('wao.ui.field.SampleRow.nbObservants')}" inputAppend="%{getText('wao.ui.unit.observers')}" cssClass="input-small"/> + <%-- XXX brendan 19/05/14 ne pas mettre type="number" car avec le formatter qui mets la valeur avec ',' on a pas la valeur quand on modifie une ligne --%> + <s:textfield name="updateSampleRowCommand.sampleRow.averageTideTime" label="%{getText('wao.ui.field.SampleRow.averageTideTime')}" inputAppend="%{getText('wao.ui.unit.days')}" cssClass="input-small"/> + <s:textfield name="updateSampleRowCommand.sampleRow.appliedCoverageRate" label="%{getText('wao.ui.field.SampleRow.appliedCoverageRate')}" inputAppend="%" cssClass="input-small"/> + + </s:if> + + <s:if test="updateSampleRowCommand.sampleRow.obsProgram.obsVente"> + + <s:textfield type="number" name="updateSampleRowCommand.sampleRow.averageObservationsCount" label="%{getText('wao.ui.field.SampleRow.averageObservationsCount')}" inputAppend="%{getText('wao.ui.unit.observations')}" cssClass="input-small"/> + + </s:if> + <s:textarea name="updateSampleRowCommand.elligibleBoatImmatriculations" label="%{getText('wao.ui.field.SampleRow.elligibleBoat')}" /> <s:textarea name="updateSampleRowCommand.sampleRow.comment" label="%{getText('wao.ui.field.SampleRow.comment')}" /> Modified: branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-21 11:01:33 UTC (rev 2081) +++ branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-21 12:00:27 UTC (rev 2082) @@ -75,7 +75,7 @@ }, { filterName: 'terrestrialDistrictIds', - filterLabel: "<s:text name="wao.ui.field.SampleRow.terrestrialLocation"/>", + filterLabel: "<s:text name="wao.ui.field.SampleRow.terrestrialLocations"/>", filterValuesField: 'terrestrialDistricts' }, { @@ -404,7 +404,7 @@ </span> </s:if> </td> - <td> + <td class="align-center"> <s:property value="averageObservationsCount"/> </td> <td> @@ -552,21 +552,6 @@ </span> </s:if> </td> - <td class="effort"> - <s:set var="expected" value="%{samplingPlan.observationTimesInDaysTotalExpected}"/> - <s:set var="estimated" value="%{samplingPlan.observationTimesInDaysTotalEstimated}"/> - <s:set var="real" value="%{samplingPlan.observationTimesInDaysTotalReal}"/> - <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <span class="estimated<s:if test="#estimated < #expected"> lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> - <s:property value="#estimated"/> <s:text name="wao.ui.misc.day"/> - </span> - <span class="real<s:if test="#real < #expected"> lower-than-expected</s:if><s:if test="#real > #expected"> higher-than-expected</s:if>"> - <s:property value="#real"/> <s:text name="wao.ui.misc.day"/> - </span> - / - </s:if> - <s:property value="#expected"/> <s:text name="wao.ui.misc.day"/> - </td> <th colspan="${nbColumnsForOther}"></th> </tfoot> </table>