Author: bleny Date: 2010-11-12 13:17:23 +0000 (Fri, 12 Nov 2010) New Revision: 763 Log: add codes descriptions in multiple places Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.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/webapp/SampleRowForm.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java 2010-11-12 12:48:18 UTC (rev 762) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/DCFFiveCodeImpl.java 2010-11-12 13:17:23 UTC (rev 763) @@ -1,8 +1,21 @@ package fr.ifremer.wao.entity; +import static org.nuiton.i18n.I18n._; + public class DCFFiveCodeImpl extends DCFFiveCodeAbstract { + @Override + public String getFishingGearDCFDescription() { + return _("DCF.gear." + getFishingGearDCF()); + } + + @Override + public String getTargetSpeciesDCFDescription() { + return _("DCF.species." + getTargetSpeciesDCF()); + } + + @Override public String toString() { String toString = getFishingGearDCF(); if (getTargetSpeciesDCF() != null) { 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 2010-11-12 12:48:18 UTC (rev 762) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 13:17:23 UTC (rev 763) @@ -30,6 +30,7 @@ import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.entity.DCFFiveCode; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; @@ -329,6 +330,10 @@ @Property private Date month; + /* variable used in template */ + @Property + private DCFFiveCode dcf5code; + /** * Current SampleRow from loop */ @@ -360,10 +365,6 @@ return data; } - public String getDcf5code() { - return StringUtil.join(row.getProfession().getDcf5code(), ", ", true); - } - public List<Date> getMonths() { if (months == null) { months = getPeriod().getMonths(); Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 12:48:18 UTC (rev 762) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 13:17:23 UTC (rev 763) @@ -72,7 +72,9 @@ </a> <ul> <li t:type="loop" t:source="rowDCF5codes" t:value="dcf5Code" t:index="dcf5CodeIndex" t:volatile="true"> - ${dcf5Code.fishingGearDCF}_${dcf5Code.targetSpeciesDCF} + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + ${dcf5Code.fishingGearDCF}_${dcf5Code.targetSpeciesDCF} + </span> <a t:type="actionlink" t:id="removeDcf5Code" t:context="dcf5CodeIndex" title="Supprimer ce code DCF5" t:zone="so-sampleRowForm-dcf5CodeZone"> <img src="${asset:context:img/remove-22px.png}" /> </a> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 12:48:18 UTC (rev 762) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 13:17:23 UTC (rev 763) @@ -244,7 +244,13 @@ <t:if t:test="fullView"> <td>${fishingZones}</td> <td>${row.fishingZonesInfos}</td> - <td>${row.profession.codeDCF5} ; ${dcf5code}</td> + <td>${row.profession.codeDCF5} ; + <t:loop source="row.profession.dcf5code" value="dcf5code"> + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + ${dcf5Code.fishingGearDCF}_${dcf5Code.targetSpeciesDCF} + </span> + </t:loop> + </td> <td>${row.profession.meshSize}</td> <td>${row.profession.size}</td> <td>${row.profession.other}</td>