Author: bleny Date: 2011-01-10 07:18:34 +0000 (Mon, 10 Jan 2011) New Revision: 902 Log: add new fields in contact filters Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.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/Contacts.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-01-09 18:52:29 UTC (rev 901) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-01-10 07:18:34 UTC (rev 902) @@ -612,6 +612,28 @@ query.addEquals(contactProperty.obsProgramOrdinal(), filter.getObsProgram().ordinal()); } + if (filter.getActualSamplingStrategy() != null) { + query.addEquals(contactProperty.samplingStrategyOrdinal(), filter.getActualSamplingStrategy().ordinal()); + } + + List<Boolean> completeSampling = new ArrayList<Boolean>(); + if (filter.isCompleteSampling()) { + completeSampling.add(true); + } + if (filter.isIncompleteSampling()) { + completeSampling.add(false); + } + if (filter.isNoSamplingCompleteness()) { + completeSampling.add(null); + } + if (completeSampling.size() > 0) { + query.addEquals(contactProperty.completeSampling(), completeSampling.toArray()); + } + + if (logger.isDebugEnabled()) { + logger.debug("query with filters on Contacts is " + query); + } + return query; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2011-01-09 18:52:29 UTC (rev 901) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2011-01-10 07:18:34 UTC (rev 902) @@ -52,6 +52,10 @@ isCommentCompany() || getDataReliability() != null || getFishingGearDCF() != null || - getTargetSpeciesDCF() != null; + getTargetSpeciesDCF() != null || + getActualSamplingStrategy() != null || + isNoSamplingCompleteness() || + isCompleteSampling() || + isIncompleteSampling(); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2011-01-09 18:52:29 UTC (rev 901) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2011-01-10 07:18:34 UTC (rev 902) @@ -54,7 +54,8 @@ StringUtils.isNotEmpty(getFacadeName()) || StringUtils.isNotEmpty(getProgramName()) || StringUtils.isNotEmpty(getCodeDCF5()) || - getPeriod() != null; + getPeriod() != null || + getSamplingStrategy() != null; return result; } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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 2011-01-09 18:52:29 UTC (rev 901) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-10 07:18:34 UTC (rev 902) @@ -30,6 +30,7 @@ import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.bean.ValidationResult; @@ -230,6 +231,10 @@ } } + public boolean showObsVente() { + return user.getProfile().getObsProgram() == ObsProgram.OBSVENTE; + } + /**************************** CONTACT IMPORT/EXPORT ***********************/ @Property 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-09 18:52:29 UTC (rev 901) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-10 07:18:34 UTC (rev 902) @@ -87,6 +87,7 @@ wao.ui.field.SampleRow.code= wao.ui.field.SampleRow.profession= wao.ui.field.SampleRow.programName= +wao.ui.field.SampleRow.samplingStrategy= wao.ui.field.User.firstName= wao.ui.field.User.lastName= wao.ui.field.User.login= 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-09 18:52:29 UTC (rev 901) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-10 07:18:34 UTC (rev 902) @@ -41,10 +41,10 @@ wao.ui.field.Boat.buildYear=Ann\u00E9e de construction wao.ui.field.Boat.capacity=Capacit\u00E9 d'accueil du navire en personnels sp\u00E9cialis\u00E9s wao.ui.field.Boat.districtCode=Quartier -wao.ui.field.Boat.immatriculation=immatriculation -wao.ui.field.Boat.name=nom -wao.ui.field.Boat.shipOwner=armateur -wao.ui.field.BoatDistrict.code=code quartier +wao.ui.field.Boat.immatriculation=Immatriculation +wao.ui.field.Boat.name=Nom +wao.ui.field.Boat.shipOwner=Armateur +wao.ui.field.BoatDistrict.code=Code quartier wao.ui.field.Company.active=Active wao.ui.field.Company.name=Nom wao.ui.field.Contact.beginDate=D\u00E9but d'observation @@ -61,13 +61,14 @@ wao.ui.field.Contact.mammalsCapture=Capture accidentelle wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle wao.ui.field.Contact.nbObservants=Nombre d'observateurs -wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage +wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs wao.ui.field.FishingZone.facadeName=fa\u00E7ade wao.ui.field.FishingZone.sectorName=quartier wao.ui.field.SampleRow.code=code ligne wao.ui.field.SampleRow.profession=M\u00E9tier wao.ui.field.SampleRow.programName=Programme +wao.ui.field.SampleRow.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage wao.ui.field.User.firstName=Pr\u00E9nom wao.ui.field.User.lastName=Nom wao.ui.field.User.login=Identifiant Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-09 18:52:29 UTC (rev 901) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-10 07:18:34 UTC (rev 902) @@ -148,6 +148,25 @@ <label for="commentAdmin">programme</label> </t:if> </div> + <t:if t:test="showObsVente()"> + <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy}</label> + <input t:type="select" t:id="samplingStrategy" value="contactFilter.samplingStrategy" /> + <label t:for="actualSamplingStrategy">${message:wao.ui.field.Contact.samplingStrategy}</label> + <input t:type="select" t:id="actualSamplingStrategy" value="contactFilter.actualSamplingStrategy" /> + <label>${message:wao.ui.field.Contact.completeSampling}</label> + <input t:type="checkbox" t:id="completeSampling" value="contactFilter.completeSampling" /> + <label t:for="completeSampling"> + <img src="${asset:context:img/true-22px.png}" alt="Oui" /> + </label> + <input t:type="checkbox" t:id="incompleteSampling" value="contactFilter.incompleteSampling" /> + <label t:for="incompleteSampling"> + <img src="${asset:context:img/false-22px.png}" alt="Non" /> + </label> + <input t:type="checkbox" t:id="noSamplingCompleteness" value="contactFilter.noSamplingCompleteness" /> + <label t:for="noSamplingCompleteness"> + <img src="${asset:context:img/help-22px.png}" title="Non précisé" /> + </label> + </t:if> <div class="fleft" style="margin-top: 15px;"> <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> </div>