Author: bleny Date: 2011-02-01 09:33:39 +0000 (Tue, 01 Feb 2011) New Revision: 967 Log: fix i18n bug in cartography ; add terrestrialInfos field to SampleRow ; fix terrestrial location import (out of France != England) Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.properties 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/Cartography.tml trunk/wao-ui/src/main/webapp/SampleRowForm.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/pom.xml 2011-02-01 09:33:39 UTC (rev 967) @@ -328,7 +328,7 @@ <labs.id>154</labs.id> <!-- libraries version --> - <nuitonI18nVersion>2.2</nuitonI18nVersion> + <nuitonI18nVersion>2.3</nuitonI18nVersion> <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.1</topiaVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-02-01 09:33:39 UTC (rev 967) @@ -752,5 +752,7 @@ queries.add("ALTER TABLE SampleRow ADD CONSTRAINT TerrestrialLocation_fkey FOREIGN KEY (terrestrialLocation) REFERENCES TerrestrialLocation(topiaId);"); queries.add("ALTER TABLE Contact ADD terrestrialLocation CHARACTER VARYING(255);"); queries.add("ALTER TABLE Contact ADD CONSTRAINT TerrestrialLocation_fkey FOREIGN KEY (terrestrialLocation) REFERENCES TerrestrialLocation(topiaId);"); + + queries.add("ALTER TABLE SampleRow ADD terrestrialLocationInfos TEXT;"); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2011-02-01 09:33:39 UTC (rev 967) @@ -47,10 +47,6 @@ this.color = color; } - public String getI18nKey() { - return i18nKey; - } - public String getColor() { return color; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-02-01 09:33:39 UTC (rev 967) @@ -307,6 +307,19 @@ TerrestrialLocation.TOPIA_VERSION); district.setLocationType(null); + if (StringUtils.isEmpty(district.getDistrictCode())) { + // distinct will select a random place with no district code + // it can be in England, Swedend or whatever. It's bad for us + // because we don't want some data not to be filtered when looking + // for England while we want to filter on all country except France + district.setCountryCode(null); + district.setCountryName("Hors France"); + district.setSeaboardCode(null); + district.setSeaboardName(null); + district.setCoastFAOCode(null); + district.setCoastFAOName(null); + } + dao.create(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 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-02-01 09:33:39 UTC (rev 967) @@ -264,7 +264,7 @@ rowLog.addChange("La durée moyenne d'une marée est passé de " + oldRow.getAverageTideTime() + " jours à " + row.getAverageTideTime()); } - if (oldRow.getTerrestrialLocation() != row.getTerrestrialLocation()) { + if ( ! oldRow.getTerrestrialLocation().equals(row.getTerrestrialLocation())) { rowLog.addChange("Le lieu est passé de " + oldRow.getTerrestrialLocation().getDescription() + " à " + row.getTerrestrialLocation().getDescription()); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-02-01 09:33:39 UTC (rev 967) @@ -1169,7 +1169,7 @@ PieChartData data = new PieChartDataImpl(); for (ContactPieChartConstant constant : ContactPieChartConstant.values()) { PieChartSeries series = new PieChartSeriesImpl(); - series.setLabel(constant.getI18nKey()); + series.setLabel(constant.toString()); series.setColor(constant.getColor()); data.addSeries(series); } Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-business/src/main/xmi/wao.properties 2011-02-01 09:33:39 UTC (rev 967) @@ -34,6 +34,8 @@ fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagvalue.orderBy=periodDate fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagvalue.orderBy=facadeName,sectorName,districtCode +fr.ifremer.wao.entity.SampleRow.attribute.terrestrialLocation.tagvalue.orderBy=districtName +fr.ifremer.wao.entity.Contact.attribute.terrestrialLocation.tagvalue.orderBy=name fr.ifremer.wao.entity.SampleRow.attribute.company.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.profession.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagvalue.lazy=false 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 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-02-01 09:33:39 UTC (rev 967) @@ -580,7 +580,7 @@ fixed += 8; } if (user.isObsVente()) { - fixed += 2; // add sampling strategy, terrestrial location + fixed += 3; // add sampling strategy, terrestrial location, terrestrial location infos } return fixed; } 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 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-01 09:33:39 UTC (rev 967) @@ -59,6 +59,7 @@ wao.ui.entity.Contact=Contact wao.ui.entity.FishingZone=Fishing zones wao.ui.entity.SampleRow=Sample row +wao.ui.entity.TerrestrialLocation= wao.ui.entity.fishingGearDCF=Gear DCF code wao.ui.entity.targetSpeciesDCF=Target species DCF code wao.ui.field.Boat.boatLength=Length @@ -108,6 +109,7 @@ wao.ui.field.SampleRow.size=Boat size wao.ui.field.SampleRow.species=Species wao.ui.field.SampleRow.terrestrialLocation=Maritime district +wao.ui.field.SampleRow.terrestrialLocationInfos= wao.ui.field.User.firstName=First name wao.ui.field.User.lastName=Last name wao.ui.field.User.login=Login @@ -230,7 +232,7 @@ wao.ui.samplingPlan.estimated=estimated wao.ui.samplingPlan.expected=expected wao.ui.samplingPlan.export=Export the sampling plan from %s to %s -wao.ui.samplingPlan.fishingZoneInfo=Fishing Zone infos +wao.ui.samplingPlan.fishingZoneInfo=Fishing Zone others infos wao.ui.samplingPlan.nbObservants=Nb. observers wao.ui.samplingPlan.program=program wao.ui.samplingPlan.sampledProfessions=Sampled professions 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 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-01 09:33:39 UTC (rev 967) @@ -59,6 +59,7 @@ wao.ui.entity.Contact=Contact wao.ui.entity.FishingZone=Zones de p\u00EAche wao.ui.entity.SampleRow=Ligne du plan d'\u00E9chantillonnage +wao.ui.entity.TerrestrialLocation=Lieu wao.ui.entity.fishingGearDCF=Engin code DCF wao.ui.entity.targetSpeciesDCF=Ensembles d'esp\u00E8ces-cible code DCF wao.ui.field.Boat.boatLength=Longueur @@ -108,6 +109,7 @@ wao.ui.field.SampleRow.size=Taille du navire wao.ui.field.SampleRow.species=Esp\u00E8ces cibles wao.ui.field.SampleRow.terrestrialLocation=Quartier maritime +wao.ui.field.SampleRow.terrestrialLocationInfos=Autre(s) info(s) wao.ui.field.User.firstName=Pr\u00E9nom wao.ui.field.User.lastName=Nom wao.ui.field.User.login=Identifiant @@ -230,7 +232,7 @@ wao.ui.samplingPlan.estimated=estim\u00E9 wao.ui.samplingPlan.expected=planifi\u00E9 wao.ui.samplingPlan.export=Exporter le plan d'\u00E9chantillonnage du %s au %s -wao.ui.samplingPlan.fishingZoneInfo=Zone de p\u00EAche info +wao.ui.samplingPlan.fishingZoneInfo=Zone autre(s) info(s) wao.ui.samplingPlan.nbObservants=Nb. d'observateurs wao.ui.samplingPlan.program=Programme ou r\u00E8glement rattachement wao.ui.samplingPlan.sampledProfessions=M\u00E9tiers \u00E9chantillonn\u00E9s Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2011-02-01 09:33:39 UTC (rev 967) @@ -29,7 +29,7 @@ <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>WAO - Web Applicatif Obsmer : ${pageTitle}</title> + <title>WAO - Web Applicatif Obsmer : ${message:wao.ui.cartography.title}</title> <link rel="stylesheet" type="text/css" href="${asset:context:css/common.css}" /> <link rel="stylesheet" type="text/css" href="${asset:context:css/main.css}" /> <link rel="stylesheet" type="text/css" href="${asset:context:css/cartography.css}" /> @@ -113,7 +113,7 @@ <div id="so-cartography-map" class="fleft" style="margin: 10px;"/> </div> - <t:footer /> + <t:footer connectedUser="user" /> </body> </html> Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-02-01 09:33:39 UTC (rev 967) @@ -78,10 +78,6 @@ ${fishingZone.code} </li> </ul> - <p> - <label for="terrestrialLocation">${message:wao.ui.field.SampleRow.terrestrialLocation}</label> - ${sampleRow.terrestrialLocation} - </p> <p:else> <!-- EDITION --> <div class="select"> @@ -99,7 +95,27 @@ ${fishingZone.code} </div> </div> - <t:if t:test="showObsVente()"> + </p:else> + </t:if> + <div class="t-beaneditor-row"> + <label for="fishingZonesInfos">${message:wao.ui.misc.otherInfos} :</label> + <input t:type="textfield" class="width300" t:id="fishingZonesInfos" value="sampleRow.fishingZonesInfos" /> + </div> + </fieldset> + + <t:if test="user.obsVente"> + <fieldset> + <legend>${message:wao.ui.entity.TerrestrialLocation}</legend> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> + <p class="acenter"> + <label for="terrestrialLocation">${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> + ${sampleRow.terrestrialLocation.description} + </p> + <p class="acenter"> + <label for="terrestrialLocationInfos">${message:wao.ui.misc.otherInfos} :</label> + ${sampleRow.terrestrialLocationInfos} + </p> + <p:else> <!-- edit --> <div class="select"> <label for="terrestrialLocation"> ${message:wao.ui.field.SampleRow.terrestrialLocation} : @@ -110,14 +126,16 @@ t:value="terrestrialLocationId" t:validate="required" /> </div> - </t:if> - </p:else> - </t:if> - <div class="t-beaneditor-row"> - <t:label t:for="fishingZonesInfos" /> - <input t:type="textfield" class="width300" t:id="fishingZonesInfos" value="sampleRow.fishingZonesInfos" /> - </div> - </fieldset> + <div class="select"> + <label for="terrestrialLocationInfos"> + ${message:wao.ui.misc.otherInfos} : + </label> + <input t:type="textfield" class="width300" t:id="terrestrialLocationInfos" value="sampleRow.terrestrialLocationInfos" /> + </div> + </p:else> + </t:if> + </fieldset> + </t:if> <!-- PROGRAM and SAMPLE MONTHS --> <fieldset> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-01-31 16:07:03 UTC (rev 966) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-01 09:33:39 UTC (rev 967) @@ -163,7 +163,8 @@ <t:if t:test="fullView"> <td>${message:wao.ui.samplingPlan.fishingZoneInfo}</td> <t:if test="user.obsVente"> - <td>${message:wao.ui.field.SampleRow.terrestrialLocation}</td> + <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocation}</td> + <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocationInfos}</td> </t:if> <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.dCF5Code}</td> <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.meshSize}</td> @@ -175,7 +176,8 @@ <td>${message:wao.ui.field.SampleRow.periodEnd}</td> <p:else> <t:if test="user.obsVente"> - <td>${message:wao.ui.field.SampleRow.terrestrialLocation}</td> + <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocation}</td> + <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocationInfos}</td> </t:if> <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.dCF5Code}</td> <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.libelle}</td> @@ -237,6 +239,9 @@ ${row.terrestrialLocation.districtName} </span> </td> + <td> + ${row.terrestrialLocationInfos} + </td> </t:if> <td> <t:loop source="row.dcf5code" value="dcf5code"> @@ -258,12 +263,15 @@ ${fishingZones} </span> </td> - <t:if test="user.ObsVente"> + <t:if test="user.obsVente"> <td> <span t:type="ck/Tooltip" title="Infos" t:value="${row.terrestrialLocation.description}" t:effect="appear"> ${row.terrestrialLocation.districtName} </span> </td> + <td> + ${row.terrestrialLocationInfos} + </td> </t:if> <td> <t:loop source="row.dcf5code" value="dcf5code">