Author: bleny Date: 2011-02-15 15:11:37 +0000 (Tue, 15 Feb 2011) New Revision: 1013 Log: fix bug in sampling plan import in ObsVente Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.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/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-02-15 14:21:33 UTC (rev 1012) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-02-15 15:11:37 UTC (rev 1013) @@ -1103,11 +1103,15 @@ String fishingZoneInfos = ImportHelper.read(reader, SAMPLING.PECHE_AUTRE); - int nbObservants = - ImportHelper.readInt(reader, SAMPLING.PLAN_NB_OBSERV); - String averageStr = ImportHelper.read(reader, SAMPLING.PLAN_DUREE_MOY); - averageStr = averageStr.replaceAll(",", "."); - double averageTideTime = Double.parseDouble(averageStr); + if (sampleRow.getObsProgram().equals(ObsProgram.OBSMER)) { + int nbObservants = + ImportHelper.readInt(reader, SAMPLING.PLAN_NB_OBSERV); + String averageStr = ImportHelper.read(reader, SAMPLING.PLAN_DUREE_MOY); + averageStr = averageStr.replaceAll(",", "."); + double averageTideTime = Double.parseDouble(averageStr); + sampleRow.setNbObservants(nbObservants); + sampleRow.setAverageTideTime(averageTideTime); + } String programName = ImportHelper.read(reader, SAMPLING.PROGRAMME_CODE); String comment = ImportHelper.read(reader, SAMPLING.PLAN_COMMENT); PeriodDates period = ImportHelper.readPeriod(reader, @@ -1121,24 +1125,24 @@ } sampleRow.setFishingZonesInfos(fishingZoneInfos); - sampleRow.setNbObservants(nbObservants); - sampleRow.setAverageTideTime(averageTideTime); sampleRow.setProgramName(programName); sampleRow.setPeriodBegin(period.getFromDate()); sampleRow.setPeriodEnd(period.getThruDate()); sampleRow.setComment(comment); - String districtCode = ImportHelper.read(reader, SAMPLING.PLAN_LIEU_CODE); - ServiceReferential serviceReferential = context.getServiceFactory().getServiceReferential(); - if (StringUtils.isBlank(districtCode)) { - String districtName = ImportHelper.read(reader, SAMPLING.PLAN_LIEU_NOM); - if (districtName != null && districtName.equals("Autre")) { - TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(null); + if (sampleRow.getObsProgram().equals(ObsProgram.OBSVENTE)) { + String districtCode = ImportHelper.read(reader, SAMPLING.PLAN_LIEU_CODE); + ServiceReferential serviceReferential = context.getServiceFactory().getServiceReferential(); + if (StringUtils.isBlank(districtCode)) { + String districtName = ImportHelper.read(reader, SAMPLING.PLAN_LIEU_NOM); + if (districtName != null && districtName.equals("Autre")) { + TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(null); + sampleRow.setTerrestrialLocation(district); + } + } else { + TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(districtCode); sampleRow.setTerrestrialLocation(district); } - } else { - TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(districtCode); - sampleRow.setTerrestrialLocation(district); } String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); 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-02-15 14:21:33 UTC (rev 1012) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-15 15:11:37 UTC (rev 1013) @@ -175,7 +175,7 @@ wao.ui.invalidLogin=Invalid identifier wao.ui.layout.userDescription=You are %s of company %s (%s) wao.ui.message.chooseProfile=Choose your profile \: -wao.ui.misc.BUSINESS=BUSINESS +wao.ui.misc.METIER=METIER wao.ui.misc.N/A=non available wao.ui.misc.accepted=Accepted wao.ui.misc.advancedSearch=Advanced search 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-02-15 14:21:33 UTC (rev 1012) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-15 15:11:37 UTC (rev 1013) @@ -175,7 +175,7 @@ wao.ui.invalidLogin=Identifiant invalide wao.ui.layout.userDescription=Vous \u00EAtes %s de la soci\u00E9t\u00E9 %s (%s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: -wao.ui.misc.BUSINESS=M\u00C9TIER +wao.ui.misc.METIER=M\u00C9TIER wao.ui.misc.N/A=non renseign\u00E9e wao.ui.misc.accepted=Accept\u00E9 wao.ui.misc.advancedSearch=Recherche avanc\u00E9e Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-15 14:21:33 UTC (rev 1012) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-15 15:11:37 UTC (rev 1013) @@ -170,12 +170,12 @@ <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocation}</td> <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocationInfos}</td> </t:if> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.dCF5Code}</td> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.meshSize}</td> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.size}</td> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.other}</td> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.libelle}</td> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.species}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.dCF5Code}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.meshSize}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.size}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.other}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.libelle}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.species}</td> <td>${message:wao.ui.field.SampleRow.periodBegin}</td> <td>${message:wao.ui.field.SampleRow.periodEnd}</td> <p:else> @@ -183,8 +183,8 @@ <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocation}</td> <td>${message:wao.ui.entity.TerrestrialLocation}<br />${message:wao.ui.field.SampleRow.terrestrialLocationInfos}</td> </t:if> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.dCF5Code}</td> - <td>${message:wao.ui.misc.BUSINESS}<br />${message:wao.ui.field.SampleRow.libelle}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.dCF5Code}</td> + <td>${message:wao.ui.misc.METIER}<br />${message:wao.ui.field.SampleRow.libelle}</td> </p:else> </t:if> <t:if test="user.obsVente">