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

r1569 - trunk/wao-business/src/main/xmi
by bleny＠users.forge.codelutin.com 16 Mar '12

16 Mar '12

Author: bleny Date: 2012-03-16 17:17:07 +0100 (Fri, 16 Mar 2012) New Revision: 1569 Url: http://forge.codelutin.com/repositories/revision/wao/1569 Log: fichier adjoint au mod?\195?\168le en CamelCase Modified: trunk/wao-business/src/main/xmi/wao.properties Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2012-03-16 16:15:41 UTC (rev 1568) +++ trunk/wao-business/src/main/xmi/wao.properties 2012-03-16 16:17:07 UTC (rev 1569) @@ -21,51 +21,51 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ -model.tagvalue.java.lang.String=text -model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException -model.tagvalue.notGenerateToString=true -model.tagvalue.constantPrefix=PROPERTY_ -model.tagvalue.useEnumerationName=true +model.tagValue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ +model.tagValue.java.lang.String=text +model.tagValue.exceptionClass=fr.ifremer.wao.WaoException +model.tagValue.notGenerateToString=true +model.tagValue.constantPrefix=PROPERTY_ +model.tagValue.useEnumerationName=true # model.tagValue.indexForeignKeys=true # model.tagValue.doNotGenerateBooleanGetMethods=true -#model.tagvalue.useLegacyDAO=true +#model.tagValue.useLegacyDAO=true -fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagvalue.lazy=false +fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false -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.company.tagvalue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.profession.tagvalue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagvalue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagvalue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagvalue.lazy=false -#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.orderBy=companyActive -#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagvalue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagvalue.orderBy=topiaCreateDate desc +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.company.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.orderBy=companyActive +#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc -fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagvalue.lazy=false +fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagValue.lazy=false -fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagvalue.orderBy=code +fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagValue.orderBy=code -#fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagvalue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagvalue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagvalue.orderBy=companyActive +#fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false +fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy=false +fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.orderBy=companyActive -fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagvalue.lazy=false +fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false -fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagvalue.lazy=false -fr.ifremer.wao.entity.Contact.attribute.boat.tagvalue.lazy=false +fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false +fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false -fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagvalue.lazy=false +fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagValue.lazy=false -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagvalue.lazy=false -fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagvalue.lazy=false -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagvalue.orderBy=level +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.lazy=false +fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagValue.lazy=false +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.orderBy=level fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true

1 0

r1568 - trunk/wao-business/src/main/xmi
by bleny＠users.forge.codelutin.com 16 Mar '12

16 Mar '12

Author: bleny Date: 2012-03-16 17:15:41 +0100 (Fri, 16 Mar 2012) New Revision: 1568 Url: http://forge.codelutin.com/repositories/revision/wao/1568 Log: ajout de la tagValue indexForeignKeys comment?\195?\169e Modified: trunk/wao-business/src/main/xmi/wao.properties Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2012-03-16 15:53:26 UTC (rev 1567) +++ trunk/wao-business/src/main/xmi/wao.properties 2012-03-16 16:15:41 UTC (rev 1568) @@ -27,6 +27,8 @@ model.tagvalue.notGenerateToString=true model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.useEnumerationName=true +# model.tagValue.indexForeignKeys=true + # model.tagValue.doNotGenerateBooleanGetMethods=true #model.tagvalue.useLegacyDAO=true

1 0

r1567 - in trunk/wao-business/src/main: java/fr/ifremer/wao/entity java/fr/ifremer/wao/service resources/i18n
by bleny＠users.forge.codelutin.com 16 Mar '12

16 Mar '12

Author: bleny Date: 2012-03-16 16:53:26 +0100 (Fri, 16 Mar 2012) New Revision: 1567 Url: http://forge.codelutin.com/repositories/revision/wao/1567 Log: Evolution #813 mise ?\195?\160 jour des r?\195?\169f?\195?\169rentiels DCF5 : selon les CSV Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2012-03-15 15:22:28 UTC (rev 1566) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingGearDCFImpl.java 2012-03-16 15:53:26 UTC (rev 1567) @@ -24,6 +24,7 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; /** * @author bleny @@ -48,4 +49,9 @@ public String getFullDescription() { return String.format("%s (%s)", getCode(), getDescription()); } + + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2012-03-15 15:22:28 UTC (rev 1566) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2012-03-16 15:53:26 UTC (rev 1567) @@ -24,6 +24,7 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; /** * @author bleny @@ -48,4 +49,9 @@ public String getFullDescription() { return String.format("%s (%s)", getCode(), getDescription()); } + + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } } 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 2012-03-15 15:22:28 UTC (rev 1566) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2012-03-16 15:53:26 UTC (rev 1567) @@ -41,6 +41,7 @@ import fr.ifremer.wao.entity.BoatGroup; import fr.ifremer.wao.entity.ContactStateMotif; import fr.ifremer.wao.entity.ContactStateMotifDAO; +import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingGearDCF; import fr.ifremer.wao.entity.FishingGearDCFDAO; import fr.ifremer.wao.entity.FishingZone; @@ -54,6 +55,8 @@ import fr.ifremer.wao.entity.ReferentialMeta; import fr.ifremer.wao.entity.ReferentialMetaDAO; import fr.ifremer.wao.entity.ReferentialMetaImpl; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRowDAO; import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.TargetSpeciesDCFDAO; import fr.ifremer.wao.entity.TerrestrialDivision; @@ -71,6 +74,7 @@ import fr.ifremer.wao.io.csv2.models.TerrestrialDivisionImportModel; import fr.ifremer.wao.io.csv2.models.TerrestrialLocationImportModel; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -676,18 +680,18 @@ FishingGearDCFDAO fishingGearDCFDAO = WaoDAOHelper.getFishingGearDCFDAO(transaction); TargetSpeciesDCFDAO targetSpeciesDCFDAO = WaoDAOHelper.getTargetSpeciesDCFDAO(transaction); + + final String[] gearCodesBase = {"DRB", "DRH", + "FPN", "FPO", "FSN", "FWR", "FYK", "GES", "GNC", + "GND", "GNF", "GNS", "GTN", "GTR", "HAR", "HMD", "HMP", + "LA", "LHM", "LHP", "LLD", "LLS", "LNB", "LNP", "LNS", + "LTL", "LX", "OTB", "OTM", "OTT", "PS", + "PTB", "PTM", "RG", "SB", "SDN", "SPR", "SSC", "SV", + "TBB", "TBN", "TBS", "TMS"}; - final String[] gearCodesBase = {"DRB", "DRH", "FAR", "FCN", "FG", - "FIX", "FPN", "FPO", "FSN", "FWR", "FYK", "GEN", "GES", "GN", "GNC", - "GND", "GNF", "GNS", "GT", "GTN", "GTR", "HAR", "HMD", "HMP", "HMX", - "LA", "LHM", "LHP", "LL", "LLD", "LLS", "LN", "LNB", "LNP", "LNS", - "LTL", "LX", "MIS", "NK", "OT", "OTB", "OTM", "OTT", "PS", "PS1", - "PS2", "PT", "PTB", "PTM", "RG", "SB", "SDN", "SPR", "SSC", "SV", - "SW", "TB", "TBB", "TBN", "TBS", "TM", "TMS", "TX"}; + final String[] speciesCodesBase = {"ALG", "ANA", "CAT", "CRU", + "DEF", "DWS", "LPF", "MOL", "SPF"}; - final String[] speciesCodesBase = {"ALG", "CAT", "CRU", "CSJ", - "DEF", "DWS", "FIN", "LPF", "MOL", "SPF", "CRW"}; - long nbCodes = fishingGearDCFDAO.count() + targetSpeciesDCFDAO.count(); if (nbCodes == 0) { @@ -726,6 +730,37 @@ } } + // on supprime ce qu'il y a en trop + for (FishingGearDCF fishingGearDCF : fishingGearDCFDAO.findAll()) { + if ( ! ArrayUtils.contains(gearCodesBase, fishingGearDCF.getCode())) { + List<DCF5Code> usages = fishingGearDCFDAO.findUsages(DCF5Code.class, fishingGearDCF); + if (usages.isEmpty()) { + log.info("will delete code " + fishingGearDCF); + fishingGearDCFDAO.delete(fishingGearDCF); + } else { + log.warn("will not delete " + fishingGearDCF); + SampleRowDAO sampleRowDAO = WaoDAOHelper.getSampleRowDAO(transaction); + for (DCF5Code usage : usages) { + List<SampleRow> sampleRows = sampleRowDAO.findAllContainsdCF5Code(usage); + for (SampleRow sampleRow : sampleRows) { + log.warn("sampleRow " + sampleRow.getCode() + " use " + usage); + } + } + } + } + } + + for (TargetSpeciesDCF targetSpeciesDCF : targetSpeciesDCFDAO.findAll()) { + if ( ! ArrayUtils.contains(speciesCodesBase, targetSpeciesDCF.getCode())) { + List<DCF5Code> usages = targetSpeciesDCFDAO.findUsages(DCF5Code.class, targetSpeciesDCF); + if (usages.isEmpty()) { + log.info("will delete code " + targetSpeciesDCF); + targetSpeciesDCFDAO.delete(targetSpeciesDCF); + } else { + log.warn("will not delete " + targetSpeciesDCF); + } + } + } } transaction.commitTransaction(); Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-15 15:22:28 UTC (rev 1566) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-16 15:53:26 UTC (rev 1567) @@ -125,6 +125,7 @@ fr.ifremer.wao.entity.ObsDebCode=ObsDeb codes fr.ifremer.wao.entity.TargetSpeciesDCF.=Not specified fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algae +fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Catadromous species fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacean fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-03-15 15:22:28 UTC (rev 1566) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2012-03-16 15:53:26 UTC (rev 1567) @@ -85,8 +85,8 @@ fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de récolte (non spécifiés) fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes à main et lignes avec cannes -fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes à main et lignes à cannes +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes à main et lignes avec cannes (mécanisées) +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes à main et lignes à cannes (manœuvrées à la main) fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non spécifiées) fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres dérivantes fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres calées ou semi-flottantes @@ -120,12 +120,13 @@ fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut à langoustines fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut à crevettes fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut pélagique (non spécifié) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut à crevettes +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut pélagique à crevettes fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non spécifié) fr.ifremer.wao.entity.FishingZone=Zones de pêche fr.ifremer.wao.entity.ObsDebCode=Codes métiers ObsDeb fr.ifremer.wao.entity.TargetSpeciesDCF.=Non spécifié fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues +fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Espèces catadromes fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacés fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste

1 0

r1566 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp webapp/css
by bleny＠users.forge.codelutin.com 15 Mar '12

15 Mar '12

Author: bleny Date: 2012-03-15 16:22:28 +0100 (Thu, 15 Mar 2012) New Revision: 1566 Url: http://forge.codelutin.com/repositories/revision/wao/1566 Log: Evolution #665 Ajouter une contrainte de filtrage des informations par navire pour le professionnel - champs sous la forme d'une liste d'immatriculation Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/css/administration.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2012-03-14 11:21:22 UTC (rev 1565) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2012-03-15 15:22:28 UTC (rev 1566) @@ -83,6 +83,7 @@ import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.LinkedList; import java.util.List; /** @@ -455,6 +456,7 @@ // reset : if user change, its profiles change editedUserProfiles = null; editedProfile = null; + editedUserCanReadBoats = null; if (log.isDebugEnabled()) { log.debug("'User id : " + userId); @@ -533,6 +535,19 @@ void onValidateFormFromUserForm() { userForm.clearErrors(); + if (editedUserCanReadBoats != null) { + getUserEdited().clearCanReadBoats(); + if (StringUtils.isNotBlank(editedUserCanReadBoats)) { + try { + List<Boat> boatsByImmatriculations = + serviceBoat.getBoatsByImmatriculations(editedUserCanReadBoats); + getUserEdited().addAllCanReadBoats(boatsByImmatriculations); + } catch (WaoBusinessException e) { + userForm.recordError("Vous devez préciser une liste d'immatriculations de navire séparées par des espaces"); + } + } + } + getUserEdited().clearUserProfile(currentUser.getProfile().getObsProgram()); getUserEdited().addAllUserProfile(getEditedUserProfiles()); } @@ -579,6 +594,9 @@ private List<UserProfile> editedUserProfiles; @Persist + private String editedUserCanReadBoats; + + @Persist @Property private UserProfile profile; @@ -654,6 +672,23 @@ return editedUserProfiles; } + public String getEditedUserCanReadBoats() { + if (editedUserCanReadBoats == null) { + if (getUserEdited() != null) { + List<String> boatImmatriculations = new LinkedList<String>(); + for (Boat boat : getUserEdited().getCanReadBoats()) { + boatImmatriculations.add(String.valueOf(boat.getImmatriculation())); + } + editedUserCanReadBoats = StringUtils.join(boatImmatriculations, " "); + } + } + return editedUserCanReadBoats; + } + + public void setEditedUserCanReadBoats(String editedUserCanReadBoats) { + this.editedUserCanReadBoats = editedUserCanReadBoats; + } + @Log Zone onActionFromAddRole() { Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2012-03-14 11:21:22 UTC (rev 1565) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2012-03-15 15:22:28 UTC (rev 1566) @@ -149,14 +149,8 @@ </p:mammalsNotifications> <p:canReadBoats> <t:if t:test="currentUser.admin"> - <label t:for="canReadBoats">${message:wao.ui.field.WaoUser.canReadBoats}</label> - <t:topiaEntitySelector t:id="canReadBoats" - t:multiple="true" - t:clazzName="Boat" - t:labelPropertyName="description" - t:values="boats" - t:selectedValues="userEdited.canReadBoats" - size="6"/> + <label t:for="editedUserCanReadBoats">${message:wao.ui.field.WaoUser.canReadBoats}</label> + <input t:type="textarea" t:id="editedUserCanReadBoats" value="editedUserCanReadBoats" /> </t:if> </p:canReadBoats> </t:beaneditform> Modified: trunk/wao-ui/src/main/webapp/css/administration.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/administration.css 2012-03-14 11:21:22 UTC (rev 1565) +++ trunk/wao-ui/src/main/webapp/css/administration.css 2012-03-15 15:22:28 UTC (rev 1566) @@ -51,10 +51,15 @@ padding-left: 5px; } -div#so-admin fieldset.user-form div.t-beaneditor input { +div#so-admin fieldset.user-form div.t-beaneditor input, +div#so-admin fieldset.user-form div.t-beaneditor textarea { width: 350px; } +div#so-admin fieldset.user-form div.t-beaneditor textarea { + height: 200px; +} + fieldset.user-form div.t-beaneditor input.t-beaneditor-submit { background: url(../img/save.png) no-repeat center right !important; }

1 0

r1565 - trunk/wao-ui/src/main/webapp
by bleny＠users.forge.codelutin.com 14 Mar '12

14 Mar '12

Author: bleny Date: 2012-03-14 12:21:22 +0100 (Wed, 14 Mar 2012) New Revision: 1565 Url: http://forge.codelutin.com/repositories/revision/wao/1565 Log: augmentation de la hauteur de la popup ?\195?\160 la connexion Modified: trunk/wao-ui/src/main/webapp/Connexion.tml Modified: trunk/wao-ui/src/main/webapp/Connexion.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Connexion.tml 2012-03-14 09:56:55 UTC (rev 1564) +++ trunk/wao-ui/src/main/webapp/Connexion.tml 2012-03-14 11:21:22 UTC (rev 1565) @@ -68,7 +68,7 @@ </div> <div t:type="minimalWindow" t:id="roleWindow" t:show="${showRoleWindow}" t:modal="true" - t:center="false" t:top="70" t:width="500" t:height="400" + t:center="false" t:top="70" t:width="500" t:height="450" t:title="${message:wao.ui.message.chooseProfile}"> <form t:id="roleForm" t:type="form" action="tapestry"> <t:if test="askForAcceptCgu">

1 0

r1564 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 14 Mar '12

14 Mar '12

Author: bleny Date: 2012-03-14 10:56:55 +0100 (Wed, 14 Mar 2012) New Revision: 1564 Url: http://forge.codelutin.com/repositories/revision/wao/1564 Log: Anomalie #980 Temps d'ouverture de la page navires Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-03-13 14:50:58 UTC (rev 1563) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-03-14 09:56:55 UTC (rev 1564) @@ -108,7 +108,8 @@ sampleRowDAO.toTopiaQuery(filter.getSamplingFilter()); samplingFilterQuery.setSelect("SR.topiaId"); query.addDistinct() - .addLeftJoin(boatProperty.elligibleBoat(), "EB", true) + // On ne fetch pas ici car on fetch déjà quand nécessaire + .addLeftJoin(boatProperty.elligibleBoat(), "EB", false) .addSubQuery( "EB." + ElligibleBoat.PROPERTY_SAMPLE_ROW + "." + SampleRow.TOPIA_ID + " IN (?)", samplingFilterQuery); @@ -183,21 +184,25 @@ boatProperty.fleet(), boatProperty.district()); + WaoQueryHelper.ElligibleBoatProperty elligibleBoatProperty = WaoQueryHelper.newElligibleBoatProperty("ER"); + + query.addLeftJoin(boatProperty.elligibleBoat(), "ER", true); + query.addLeftJoin(elligibleBoatProperty.sampleRow(), "SR", true); + // load data for sample row: company, fishingZone, DCF5Code, profession - WaoQueryHelper.SampleRowProperty sampleRowProperty = - WaoQueryHelper.newSampleRowProperty(); -// query.addFetch( // XXX 20110524 bleny fetching those two data raise a - // 'cannot simultaneously fetch multiple bags' - // exception. Not fetching works but data will be lazily - // loaded and it costs performance in - // BoatFilterValues#fillBoats() - // - // sampleRowProperty.fishingZone(), - // sampleRowProperty.dCF5Code(), -// sampleRowProperty.company(), -// sampleRowProperty.profession()); + WaoQueryHelper.SampleRowProperty sampleRowProperty = elligibleBoatProperty.sampleRowProperty(); + query.addFetch( // XXX 20110524 bleny fetching those two data raise a + // 'cannot simultaneously fetch multiple bags' + // exception. Not fetching works but data will be lazily + // loaded and it costs performance in + // BoatFilterValues#fillBoats() + // elligibleBoatProperty.sampleRowProperty().fishingZone(), + // elligibleBoatProperty.sampleRowProperty().dCF5Code(), + sampleRowProperty.company(), + sampleRowProperty.profession()); + if (log.isDebugEnabled()) { log.debug("query to get boats by filter : " + query); }

1 0

r1563 - trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures
by bleny＠users.forge.codelutin.com 13 Mar '12

13 Mar '12

Author: bleny Date: 2012-03-13 15:50:58 +0100 (Tue, 13 Mar 2012) New Revision: 1563 Url: http://forge.codelutin.com/repositories/revision/wao/1563 Log: correction test suite ?\195?\160 changement des r?\195?\168gles de validation contact Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-03-13 14:31:25 UTC (rev 1562) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-03-13 14:50:58 UTC (rev 1563) @@ -215,6 +215,7 @@ contact5.setMainObserver(user2); contact5.setSampleRow(row2); contact5.setContactState(ContactState.OBSERVATION_CANCELLED); + contact5.setComment("commentaire obligatoire"); begin = DateUtil.createDate(3, 5, 2010); end = DateUtil.createDate(4, 5, 2010); contact5.setObservationEndDate(end); @@ -227,6 +228,7 @@ contact6.setMainObserver(user2); contact6.setSampleRow(row2); contact6.setContactState(ContactState.OBSERVATION_CANCELLED); + contact6.setComment("commentaire obligatoire"); begin = DateUtil.createDate(3, 3, 2010); contact6.setCreationDate(begin); end = DateUtil.createDate(4, 3, 2010);

1 0

r1562 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 13 Mar '12

13 Mar '12

Author: bleny Date: 2012-03-13 15:31:25 +0100 (Tue, 13 Mar 2012) New Revision: 1562 Url: http://forge.codelutin.com/repositories/revision/wao/1562 Log: correction test suite ?\195?\160 changement des r?\195?\168gles de validation contact 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 2012-03-13 10:57:45 UTC (rev 1561) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-03-13 14:31:25 UTC (rev 1562) @@ -376,37 +376,10 @@ message = "La date de saisie des données ne peut pas être postérieure à la date du jour"; } - // Non abouti, Refus ou Refus Définitif - if (success && contactState.isUnfinishedState()) { - - if (oldContact != null) { - - String newComment = contact.getComment(); - - boolean commentDefined = StringUtils.isNotEmpty(newComment); - boolean commentChanged = commentDefined && - !newComment.equals(oldContact.getComment()); - - // Ano #2540 : NPE on oldState, extract boolean for - // previous unfinishedState case - boolean previousUnfinishedState = commentDefined && - oldContact.getContactState() != null && oldContact.getContactState().isUnfinishedState(); - - // Ano #2440 : no restriction if previous state is unfinished - if (previousUnfinishedState || commentChanged) { - - // RAZ des champs - contact.setObservationBeginDate(null); - contact.setObservationEndDate(null); - contact.setMammalsCapture(false); - contact.setMammalsObservation(false); - contact.setDataInputDate(null); - - } else { - success = false; - message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); - } - } + // Non abouti + if (success && contactState == ContactState.OBSERVATION_CANCELLED && StringUtils.isBlank(contact.getComment())) { + success = false; + message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); // Observation réalisée } else if (success && contactState.equals(ContactState.OBSERVATION_DONE)) {

1 0

r1561 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.forge.codelutin.com 13 Mar '12

13 Mar '12

Author: bleny Date: 2012-03-13 11:57:45 +0100 (Tue, 13 Mar 2012) New Revision: 1561 Url: http://forge.codelutin.com/repositories/revision/wao/1561 Log: Evolution #602 Rendre visible l'information saisie par l'observateur en cas de capture accidentelle : afficher ce texte dans une info-bulle au survol de l'ic?\195?\180ne "chalut" Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2012-03-13 10:28:19 UTC (rev 1560) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2012-03-13 10:57:45 UTC (rev 1561) @@ -26,6 +26,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; @@ -429,6 +430,10 @@ return manager.getTooltipSampleRow(contact.getSampleRow()); } + public String getMammalsInfo() { + return WaoUtils.escapeForToolTip(contact.getMammalsInfo()); + } + public String getBoatDescription() { return manager.getTooltipBoat(contact.getBoat()); } Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2012-03-13 10:28:19 UTC (rev 1560) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2012-03-13 10:57:45 UTC (rev 1561) @@ -147,7 +147,14 @@ <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" />  </t:if> <t:if t:test="contact.mammalsCapture"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + <t:if t:test="contact.mammalsInfo"> + <span t:type="ck/Tooltip" title="${message:wao.ui.field.Contact.mammalsInfo}" t:value="prop:mammalsInfo" t:effect="appear"> + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </span> + <p:else> + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </p:else> + </t:if> </t:if> </p:mammalsCell> <p:validationCell>

1 0

r1560 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 13 Mar '12

13 Mar '12

Author: bleny Date: 2012-03-13 11:28:19 +0100 (Tue, 13 Mar 2012) New Revision: 1560 Url: http://forge.codelutin.com/repositories/revision/wao/1560 Log: Anomalie #964 controles au remplissage du formulaire par l'observateur : motifs de refus 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 2012-03-13 09:48:53 UTC (rev 1559) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-03-13 10:28:19 UTC (rev 1560) @@ -379,50 +379,32 @@ // Non abouti, Refus ou Refus Définitif if (success && contactState.isUnfinishedState()) { - boolean contactMustHaveAMotif = contact.getObsProgram() == ObsProgram.OBSMER - && (contactState == ContactState.CONTACT_REFUSED - || contactState == ContactState.CONTACT_DEFINITELY_REFUSED); - if (contactMustHaveAMotif) { + if (oldContact != null) { - if (contact.getContactStateMotif() == null) { - success = false; - message = WaoUtils._("wao.business.contact.validation.contactStateMotifMissing"); - } + String newComment = contact.getComment(); - } else { + boolean commentDefined = StringUtils.isNotEmpty(newComment); + boolean commentChanged = commentDefined && + !newComment.equals(oldContact.getComment()); - if (contact.getContactStateMotif() != null) { - success = false; - message = WaoUtils._("wao.business.contact.validation.contactStateMotifUnwanted"); - } + // Ano #2540 : NPE on oldState, extract boolean for + // previous unfinishedState case + boolean previousUnfinishedState = commentDefined && + oldContact.getContactState() != null && oldContact.getContactState().isUnfinishedState(); - if (oldContact != null) { + // Ano #2440 : no restriction if previous state is unfinished + if (previousUnfinishedState || commentChanged) { - String newComment = contact.getComment(); + // RAZ des champs + contact.setObservationBeginDate(null); + contact.setObservationEndDate(null); + contact.setMammalsCapture(false); + contact.setMammalsObservation(false); + contact.setDataInputDate(null); - boolean commentDefined = StringUtils.isNotEmpty(newComment); - boolean commentChanged = commentDefined && - !newComment.equals(oldContact.getComment()); - - // Ano #2540 : NPE on oldState, extract boolean for - // previous unfinishedState case - boolean previousUnfinishedState = commentDefined && - oldContact.getContactState() != null && oldContact.getContactState().isUnfinishedState(); - - // Ano #2440 : no restriction if previous state is unfinished - if (previousUnfinishedState || commentChanged) { - - // RAZ des champs - contact.setObservationBeginDate(null); - contact.setObservationEndDate(null); - contact.setMammalsCapture(false); - contact.setMammalsObservation(false); - contact.setDataInputDate(null); - - } else { - success = false; - message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); - } + } else { + success = false; + message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); } } // Observation réalisée @@ -451,6 +433,19 @@ // Ici, les contrôle spécifique à ObsMer if (success && contact.getObsProgram() == ObsProgram.OBSMER) { + boolean contactMustHaveAMotif = contact.getObsProgram() == ObsProgram.OBSMER + && (contactState == ContactState.CONTACT_REFUSED + || contactState == ContactState.CONTACT_DEFINITELY_REFUSED); + if (contactMustHaveAMotif && contact.getContactStateMotif() == null) { + success = false; + message = WaoUtils._("wao.business.contact.validation.contactStateMotifMissing"); + } + + if ( ! contactMustHaveAMotif && contact.getContactStateMotif() != null) { + success = false; + message = WaoUtils._("wao.business.contact.validation.contactStateMotifUnwanted"); + } + if (log.isDebugEnabled()) { log.debug("validationProgram = " + contact.getValidationProgram()); }

1 0