Author: bleny Date: 2010-11-29 17:53:00 +0000 (Mon, 29 Nov 2010) New Revision: 816 Log: minor fixes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/WEB-INF/app.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-29 17:53:00 UTC (rev 816) @@ -215,8 +215,6 @@ // need sampleRowProperty, may have fishingZoneProperty - SampleRow sampleRow = filter.getSampleRow(); - String codeDCF5 = filter.getCodeDCF5(); String programName = filter.getProgramName(); PeriodDates period = filter.getPeriod(); Date fromDate = filter.getFromDate(); 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 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-29 17:53:00 UTC (rev 816) @@ -663,8 +663,6 @@ protected Map<String, Double> executeGetDataReliability (TopiaContext transaction, SamplingFilter filter) throws Exception { - // FIXME bleny 20101028 exception if company is not in the DB results - WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); @@ -871,8 +869,11 @@ } } - double percentRealized = ((double) totalNumberOfRealized / + Double percentRealized = null; + if (totalNumberOfPlanned > 0) { + percentRealized = ((double) totalNumberOfRealized / (double) totalNumberOfPlanned) * 100.0; + } if (log.isDebugEnabled()) { log.debug(String.format("percent realized %f %%", percentRealized)); @@ -918,7 +919,10 @@ } double numberOfCompanies = (double) allegroReactivity.size(); - double totalAverages = sumAverages / numberOfCompanies; + Double totalAverages = null; + if (numberOfCompanies > 0) { + totalAverages = sumAverages / numberOfCompanies; + } return totalAverages; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-11-29 17:53:00 UTC (rev 816) @@ -612,9 +612,15 @@ if ( ! existingFishingGearCodes.contains(code.getFishingGearCode())) { sampleRowForm.recordError(code.getFishingGearCode() + " n'est pas un code d'engin valide"); } - if (code.getTargetSpeciesCode() != null && - ! existingTargetSpeciesCodes.contains(code.getTargetSpeciesCode())) { - sampleRowForm.recordError(code.getTargetSpeciesCode() + " n'est pas un code d'espèces cibles valide"); + + if (StringUtils.isEmpty(code.getTargetSpeciesCode())) { + if (StringUtils.isEmpty(getSampleRow().getProfession().getSpecies())) { + sampleRowForm.recordError("Le code DCF d'espèces cibles peut ne pas être renseigné, mais dans ce cas il faut préciser une description des espèces cibles"); + } + } else { + if ( ! existingTargetSpeciesCodes.contains(code.getTargetSpeciesCode())) { + sampleRowForm.recordError(code.getTargetSpeciesCode() + " n'est pas un code d'espèces cibles valide"); + } } } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-11-29 17:53:00 UTC (rev 816) @@ -33,6 +33,8 @@ company-label: Soci\u00e9t\u00e9 programName-label: Programme estimatedTides-label: Voir l'effort d'observations estim\u00e9 +fishingGearDCF-label: Engins code DCF +targetSpeciesDCF-label: Ensembles d\'esp\u00e8ces-cible code DCF companyForBoarding-label: Soci\u00e9t\u00e9 Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-29 17:53:00 UTC (rev 816) @@ -206,12 +206,10 @@ title="Changer les dates de la période par rapport à celles de la ligne"> ${row.code} </a> - <t:if t:test="canEditSampleRow()"> - <t:if test="rowModified"> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> - </a> - </t:if> + <t:if test="rowModified"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> </t:if> </td> <td class="width150">${row.programName}</td> Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-28 20:10:23 UTC (rev 815) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-29 17:53:00 UTC (rev 816) @@ -33,7 +33,8 @@ ContactState.CONTACT_START: Contact pris DataReliability.UNKNOWN: Inconnue -DataReliability.NOT_RELIABLE: Non-exploitable +DataReliability.NOT_RELIABLE: Non exploitable DataReliability.DOUBTFUL: Douteuse DataReliability.RELIABLE: Exploitable +DataReliability.NOT_PROVIDED: Non contr\u00f4l\u00e9e