Author: bleny Date: 2010-11-17 16:36:44 +0000 (Wed, 17 Nov 2010) New Revision: 778 Log: fix tooltip for DCF5code in sampling plan compact mode Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-17 16:35:43 UTC (rev 777) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-17 16:36:44 UTC (rev 778) @@ -46,6 +46,13 @@ @Override public String getCode() { String code = StringUtils.join(getDcf5code(), ", "); + code += getCodeWithoutDCF5(); + return code; + } + + @Override + public String getCodeWithoutDCF5() { + String code = ""; if (!StringUtils.isEmpty(getMeshSize())) { code += " " + getMeshSize(); } @@ -57,5 +64,4 @@ } return code; } - } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-17 16:35:43 UTC (rev 777) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-17 16:36:44 UTC (rev 778) @@ -274,7 +274,14 @@ ${fishingZones} </span> </td> - <td>${row.profession.code}</td> + <td> + <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} + </span> + </t:loop> + ${row.profession.codeWithoutDCF5} + </td> <td class="bright"> <span t:type="ck/Tooltip" title="Infos" t:value="Espèces cibles : ${row.profession.species}" t:effect="appear"> ${row.profession.libelle}