- Tutti-commits - mailman.cloud.codelutin.com

r1441 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 21:13:47 +0100 (Mon, 09 Dec 2013) New Revision: 1441 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1441 Log: - fixes #3933: [CAPTURE] probl?\195?\168me affichage // et nb chiffres apr?\195?\168s la virgule - improve import-export code (Kevin, please try to factorize your code a little more) - fix ImportPuttri dialog open(caroussel file was not reset) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -96,7 +96,7 @@ File.class), REPORT_LOG_DIRECTORY( "tutti.report.log.directory", - n_("tutti.config.option.report.log.file.description"), + n_("tutti.config.option.report.log.directory.description"), "${tutti.data.directory}/reportlogs", File.class), DB_DIRECTORY( Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -27,10 +27,14 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.TuttiEntity; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.NestedNullException; @@ -45,6 +49,7 @@ import org.nuiton.csv.ValueParserFormatter; import org.nuiton.csv.ext.AbstractExportModel; import org.nuiton.csv.ext.AbstractImportExportModel; +import org.nuiton.csv.ext.AbstractImportModel; import org.nuiton.csv.ext.RepeatableExport; import org.nuiton.decorator.Decorator; @@ -69,6 +74,49 @@ */ public class TuttiCsvUtil extends Common { + public static final ValueFormatter<Caracteristic> CARACTERISTIC_ID_FORMATTER = new ValueFormatter<Caracteristic>() { + @Override + public String format(Caracteristic value) { + return value != null ? value.getId() : ""; + } + }; + + public static final ValueFormatter<Species> SPECIES_REFERENCE_TAXON_ID_FORMATTER = new ValueFormatter<Species>() { + @Override + public String format(Species value) { + return value != null ? String.valueOf(value.getReferenceTaxonId()) : null; + } + }; + + public static final ValueFormatter<Serializable> CARACTERISTIC_VALUE_FORMATTER2 = new ValueFormatter<Serializable>() { + @Override + public String format(Serializable value) { + String result = ""; + if (value != null) { + if (CaracteristicQualitativeValue.class.isAssignableFrom(value.getClass())) { + CaracteristicQualitativeValue cqv = (CaracteristicQualitativeValue) value; + result = cqv.getId(); + + } else { + result = String.valueOf(value); + } + } + return result; + } + }; + + public static ValueFormatter<CaracteristicQualitativeValue> CARACTERISTIC_QUALITATIVE_VALUE_FORMATTER = + new ValueFormatter<CaracteristicQualitativeValue>() { + @Override + public String format(CaracteristicQualitativeValue value) { + String result = ""; + if (value != null) { + result = value.getId(); + } + return result; + } + }; + public static abstract class AbstractTuttiImportExportModel<M> extends AbstractImportExportModel<M> { public AbstractTuttiImportExportModel(char separator) { @@ -101,6 +149,22 @@ newMandatoryColumn(propertyName, propertyName, newForeignKeyValue(entityType, foreignKeyName, universe)); } + public void newSpeciesForeignKeyColumn(String propertyName, String foreignKeyName, List<Species> species) { + if (species == null) { + species = Lists.newArrayList(); + } + Map<String, Species> universe = TuttiEntities.splitByTaxonId(species); + newForeignKeyColumn(propertyName, Species.class, foreignKeyName, universe); + } + + public <E extends TuttiEntity> void newForeignKeyColumn(String propertyName, Class<E> entityType, String foreignKeyName, List<E> list) { + if (list == null) { + list = Lists.newArrayList(); + } + Map<String, E> universe = Maps.uniqueIndex(list, TuttiEntities.GET_ID); + newMandatoryColumn(propertyName, propertyName, newForeignKeyValue(entityType, foreignKeyName, universe)); + } + public <E extends TuttiEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, String propertyName, Map<String, E> universe) { return new ForeignKeyValue<E>(type, propertyName, universe); } @@ -122,6 +186,41 @@ } } + public static abstract class AbstractTuttiImportModel<M> extends AbstractImportModel<M> { + + public AbstractTuttiImportModel(char separator) { + super(separator); + } + + public <E extends TuttiEntity> void newForeignKeyColumn(String headerName, String propertyName, Class<E> entityType, String foreignKeyName, Map<String, E> universe) { + newMandatoryColumn(headerName, propertyName, newForeignKeyValue(entityType, foreignKeyName, universe)); + } + + public <E extends TuttiEntity> void newForeignKeyColumn(String propertyName, Class<E> entityType, String foreignKeyName, Map<String, E> universe) { + newMandatoryColumn(propertyName, propertyName, newForeignKeyValue(entityType, foreignKeyName, universe)); + } + + public <E extends TuttiEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, String propertyName, Map<String, E> universe) { + return new ForeignKeyValue<E>(type, propertyName, universe); + } + + public void newNotExistingValueColumn(String propertyName, Set<String> universe) { + newNotExistingValueColumn(propertyName, propertyName, universe); + } + + public void newNotExistingValueColumn(String headerName, String propertyName, Set<String> universe) { + newMandatoryColumn(headerName, propertyName, new NotExistingKeyValue(propertyName, universe)); + } + + public void newNotExistingValueColumn(String propertyName, Set<String> universe, String errorMessage) { + newNotExistingValueColumn(propertyName, propertyName, universe, errorMessage); + } + + public void newNotExistingValueColumn(String headerName, String propertyName, Set<String> universe, String errorMessage) { + newMandatoryColumn(headerName, propertyName, new NotExistingKeyValue(propertyName, universe, errorMessage)); + } + } + public static abstract class AbstractTuttiExportModel<M> extends AbstractExportModel<M> { public AbstractTuttiExportModel(char separator) { @@ -174,9 +273,26 @@ public ExportableColumn<M, String> newIndexNullableColumnForExport(String headerName, String collectionName, int order, String propertyName) { return newIndexNullableColumnForExport(headerName, collectionName, order, propertyName, TuttiCsvUtil.STRING); } - } + public static ValueParserFormatter<Float> WEIGHT_PARSER_FORMATTER = new FloatParserFormatter(null, true) { + + @Override + public String format(Float value) { + if (value != null) { + value = TuttiEntities.roundKiloGram(value); + } + return super.format(value); + } + + @Override + protected Float parseNoneEmptyValue(String value) { + Float aFloat = super.parseNoneEmptyValue(value); + float result = TuttiEntities.roundKiloGram(aFloat); + return result; + } + }; + public static ValueParserFormatter<String> newStringParserFormatter2(String defaultValue, boolean nullAllowed) { return new StringParserFormatter2(defaultValue, nullAllowed); } @@ -646,4 +762,13 @@ protected TuttiCsvUtil() { // no instance } + + public static abstract class ImportModelWithHeader<M> extends AbstractTuttiImportModel<M> { + + protected ImportModelWithHeader(char separator) { + super(separator); + } + + public abstract String[] getHeader(); + } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,17 +24,12 @@ * #L% */ -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueFormatter; import java.util.List; -import java.util.Map; /** * Model of a individual observation export. @@ -55,83 +50,43 @@ List<CaracteristicQualitativeValue> deadOrAliveValues) { super(separator); - ValueFormatter<CaracteristicQualitativeValue> cqvFormatter = - new ValueFormatter<CaracteristicQualitativeValue>() { - @Override - public String format(CaracteristicQualitativeValue value) { - String result = ""; - if (value != null) { - result = value.getId(); - } - return result; - } - }; - newColumnForImportExport(AccidentalCatchRow.BATCH_ID); newColumnForExport(AccidentalCatchRow.SPECIES, - new ValueFormatter<Species>() { - @Override - public String format(Species value) { - return value != null ? String.valueOf(value.getReferenceTaxonId()) : null; - } - }); + TuttiCsvUtil.SPECIES_REFERENCE_TAXON_ID_FORMATTER); - if (species == null) { - species = Lists.newArrayList(); - } - Map<String, Species> speciesMap = TuttiEntities.splitByTaxonId(species); - newForeignKeyColumn(AccidentalCatchRow.SPECIES, - Species.class, - Species.PROPERTY_REFERENCE_TAXON_ID, - speciesMap); + newSpeciesForeignKeyColumn(AccidentalCatchRow.SPECIES, + Species.PROPERTY_REFERENCE_TAXON_ID, + species); newColumnForExport(AccidentalCatchRow.GENDER, - cqvFormatter); + TuttiCsvUtil.CARACTERISTIC_QUALITATIVE_VALUE_FORMATTER); - if (genderValues == null) { - genderValues = Lists.newArrayList(); - } - Map<String, CaracteristicQualitativeValue> genderValuesMap = - Maps.uniqueIndex(genderValues, TuttiEntities.GET_ID); newForeignKeyColumn(AccidentalCatchRow.GENDER, CaracteristicQualitativeValue.class, CaracteristicQualitativeValue.PROPERTY_ID, - genderValuesMap); + genderValues); - newColumnForImportExport(AccidentalCatchRow.WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(AccidentalCatchRow.WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); newColumnForImportExport(AccidentalCatchRow.SIZE, TuttiCsvUtil.FLOAT); newColumnForExport(AccidentalCatchRow.LENGTH_STEP_CARACTERISTIC, - new ValueFormatter<Caracteristic>() { - @Override - public String format(Caracteristic value) { - return value != null ? value.getId() : ""; - } - }); + TuttiCsvUtil.CARACTERISTIC_ID_FORMATTER); - if (lengthStepCaracteristics == null) { - lengthStepCaracteristics = Lists.newArrayList(); - } - Map<String, Caracteristic> caracteristicMap = Maps.uniqueIndex(lengthStepCaracteristics, TuttiEntities.GET_ID); newForeignKeyColumn(AccidentalCatchRow.LENGTH_STEP_CARACTERISTIC, Caracteristic.class, Caracteristic.PROPERTY_ID, - caracteristicMap); + lengthStepCaracteristics); newColumnForExport(AccidentalCatchRow.DEAD_OR_ALIVE, - cqvFormatter); + TuttiCsvUtil.CARACTERISTIC_QUALITATIVE_VALUE_FORMATTER); - if (deadOrAliveValues == null) { - deadOrAliveValues = Lists.newArrayList(); - } - Map<String, CaracteristicQualitativeValue> deadOraliveValuesMap = - Maps.uniqueIndex(deadOrAliveValues, TuttiEntities.GET_ID); newForeignKeyColumn(AccidentalCatchRow.DEAD_OR_ALIVE, CaracteristicQualitativeValue.class, CaracteristicQualitativeValue.PROPERTY_ID, - deadOraliveValuesMap); + deadOrAliveValues); newColumnForImportExport(AccidentalCatchRow.COMMENT); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,17 +24,10 @@ * #L% */ -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueFormatter; -import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @author kmorin <kmorin(a)codelutin.com> @@ -53,43 +46,18 @@ newColumnForImportExport(CaracteristicRow.BATCH_ID); newColumnForExport(CaracteristicRow.CARACTERISTIC, - new ValueFormatter<Caracteristic>() { - @Override - public String format(Caracteristic value) { - return value != null ? value.getId() : ""; - } - }); + TuttiCsvUtil.CARACTERISTIC_ID_FORMATTER); - if (caracteristics == null) { - caracteristics = Lists.newArrayList(); - } - Map<String, Caracteristic> caracteristicMap = Maps.uniqueIndex(caracteristics, TuttiEntities.GET_ID); newForeignKeyColumn(CaracteristicRow.CARACTERISTIC, Caracteristic.class, Caracteristic.PROPERTY_ID, - caracteristicMap); + caracteristics); newColumnForExport(CaracteristicRow.VALUE, - new ValueFormatter<Serializable>() { - @Override - public String format(Serializable value) { - String result = ""; - if (value != null) { - if (CaracteristicQualitativeValue.class.isAssignableFrom(value.getClass())) { - CaracteristicQualitativeValue cqv = (CaracteristicQualitativeValue) value; - result = cqv.getId(); + TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER2); - } else { - result = String.valueOf(value); - } - } - return result; - } - }); + newMandatoryColumn(CaracteristicRow.VALUE, TuttiCsvUtil.STRING); - newMandatoryColumn(CaracteristicRow.VALUE, - TuttiCsvUtil.STRING); - } @Override Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,15 +24,10 @@ * #L% */ -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueFormatter; import java.util.List; -import java.util.Map; /** * Model of a catch export. @@ -52,21 +47,12 @@ newColumnForImportExport(CatchFrequencyRow.BATCH_ID); newColumnForExport(CatchFrequencyRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC, - new ValueFormatter<Caracteristic>() { - @Override - public String format(Caracteristic value) { - return value != null ? value.getId() : ""; - } - }); + TuttiCsvUtil.CARACTERISTIC_ID_FORMATTER); - if (caracteristics == null) { - caracteristics = Lists.newArrayList(); - } - Map<String, Caracteristic> caracteristicMap = Maps.uniqueIndex(caracteristics, TuttiEntities.GET_ID); newForeignKeyColumn(CatchFrequencyRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC, Caracteristic.class, Caracteristic.PROPERTY_ID, - caracteristicMap); + caracteristics); newColumnForImportExport(CatchFrequencyRow.FREQUENCY_LENGTH_STEP, TuttiCsvUtil.FLOAT); @@ -75,7 +61,7 @@ TuttiCsvUtil.INTEGER); newColumnForImportExport(CatchFrequencyRow.FREQUENCY_WEIGHT, - TuttiCsvUtil.FLOAT); + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,16 +24,10 @@ * #L% */ -import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueFormatter; -import java.io.Serializable; import java.util.List; -import java.util.Map; /** * Model of a catch export. @@ -47,63 +41,34 @@ this(separator, null); } - public CatchRowModel(char separator, - List<Species> species) { + public CatchRowModel(char separator, List<Species> species) { super(separator); - ValueFormatter<Serializable> caracteristicValueFormatter = new ValueFormatter<Serializable>() { - @Override - public String format(Serializable value) { - String result = ""; - if (value != null) { - if (CaracteristicQualitativeValue.class.isAssignableFrom(value.getClass())) { - CaracteristicQualitativeValue cqv = (CaracteristicQualitativeValue) value; - result = cqv.getId(); - - } else { - result = String.valueOf(value); - } - } - return result; - } - }; - newColumnForImportExport(CatchRow.ID); newColumnForImportExport(CatchRow.PARENT_ID); newColumnForExport(CatchRow.SPECIES, - new ValueFormatter<Species>() { - @Override - public String format(Species value) { - return value != null ? String.valueOf(value.getReferenceTaxonId()) : null; - } - }); + TuttiCsvUtil.SPECIES_REFERENCE_TAXON_ID_FORMATTER); - if (species == null) { - species = Lists.newArrayList(); - } - Map<String, Species> speciesMap = TuttiEntities.splitByTaxonId(species); - newForeignKeyColumn(CatchRow.SPECIES, - Species.class, - Species.PROPERTY_REFERENCE_TAXON_ID, - speciesMap); + newSpeciesForeignKeyColumn(CatchRow.SPECIES, + Species.PROPERTY_REFERENCE_TAXON_ID, + species); - newColumnForImportExport(CatchRow.CATEGORY_ID, TuttiCsvUtil.INTEGER); newColumnForExport(CatchRow.CATEGORY_VALUE, - caracteristicValueFormatter); + TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER2); newMandatoryColumn(CatchRow.CATEGORY_VALUE, TuttiCsvUtil.STRING); newColumnForImportExport(CatchRow.CATEGORY_WEIGHT, - TuttiCsvUtil.FLOAT); + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); newColumnForImportExport(CatchRow.WEIGHT, - TuttiCsvUtil.FLOAT); + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); newColumnForImportExport(CatchRow.NUMBER, TuttiCsvUtil.INTEGER); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -35,9 +35,12 @@ public CatchWeightsRowModel(char separator) { super(separator); - newColumnForImportExport(CatchWeightsRow.TOTAL_SORTED_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForImportExport(CatchWeightsRow.INERT_WEIGHT, TuttiCsvUtil.FLOAT); - newColumnForImportExport(CatchWeightsRow.LIVING_NOT_ITEMIZED_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(CatchWeightsRow.TOTAL_SORTED_WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); + newColumnForImportExport(CatchWeightsRow.INERT_WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); + newColumnForImportExport(CatchWeightsRow.LIVING_NOT_ITEMIZED_WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); } @Override Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,16 +24,11 @@ * #L% */ -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueFormatter; import java.util.List; -import java.util.Map; /** * Model of a individual observation export. @@ -55,47 +50,26 @@ newColumnForImportExport(IndividualObservationRow.BATCH_ID); newColumnForExport(IndividualObservationRow.SPECIES, - new ValueFormatter<Species>() { - @Override - public String format(Species value) { - return value != null ? String.valueOf(value.getReferenceTaxonId()) : null; - } - }); + TuttiCsvUtil.SPECIES_REFERENCE_TAXON_ID_FORMATTER); - if (species == null) { - species = Lists.newArrayList(); - } - Map<String, Species> speciesMap = TuttiEntities.splitByTaxonId(species); - newForeignKeyColumn(IndividualObservationRow.SPECIES, - Species.class, - Species.PROPERTY_REFERENCE_TAXON_ID, - speciesMap); + newSpeciesForeignKeyColumn(IndividualObservationRow.SPECIES, + Species.PROPERTY_REFERENCE_TAXON_ID, + species); - newColumnForImportExport(IndividualObservationRow.WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(IndividualObservationRow.WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); - newColumnForImportExport(IndividualObservationRow.SIZE, TuttiCsvUtil.FLOAT); + newColumnForImportExport(IndividualObservationRow.SIZE, + TuttiCsvUtil.FLOAT); newColumnForExport(IndividualObservationRow.LENGTH_STEP_CARACTERISTIC, - new ValueFormatter<Caracteristic>() { - @Override - public String format(Caracteristic value) { - return value != null ? value.getId() : ""; - } - }); + TuttiCsvUtil.CARACTERISTIC_ID_FORMATTER); - if (lengthStepCaracteristics == null) { - lengthStepCaracteristics = Lists.newArrayList(); - } - Map<String, Caracteristic> caracteristicMap = Maps.uniqueIndex(lengthStepCaracteristics, TuttiEntities.GET_ID); newForeignKeyColumn(IndividualObservationRow.LENGTH_STEP_CARACTERISTIC, Caracteristic.class, Caracteristic.PROPERTY_ID, - caracteristicMap); + lengthStepCaracteristics); -// newColumnForImportExport(IndividualObservationRow.SAMPLING_CODE); -// -// newColumnForImportExport(IndividualObservationRow.CALCIFIED_PIECE_SAMPLING_CODE); - newColumnForImportExport(IndividualObservationRow.COMMENT); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,15 +24,10 @@ * #L% */ -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueFormatter; import java.util.List; -import java.util.Map; /** * @author kmorin <morin(a)codelutin.com> @@ -49,49 +44,28 @@ List<CaracteristicQualitativeValue> sizeCategoryValues) { super(separator); - if (categoryValues == null) { - categoryValues = Lists.newArrayList(); - } - Map<String, CaracteristicQualitativeValue> categoryValueMap = - Maps.uniqueIndex(categoryValues, TuttiEntities.GET_ID); - - if (sizeCategoryValues == null) { - sizeCategoryValues = Lists.newArrayList(); - } - Map<String, CaracteristicQualitativeValue> sizeCategoryValueMap = - Maps.uniqueIndex(sizeCategoryValues, TuttiEntities.GET_ID); - - ValueFormatter<CaracteristicQualitativeValue> caracteristicQualitativeValueFormatter = - new ValueFormatter<CaracteristicQualitativeValue>() { - @Override - public String format(CaracteristicQualitativeValue value) { - String result = ""; - if (value != null) { - result = value.getId(); - } - return result; - } - }; - newColumnForImportExport(MarineLitterRow.BATCH_ID); - newColumnForExport(MarineLitterRow.CATEGORY, caracteristicQualitativeValueFormatter); + newColumnForExport(MarineLitterRow.CATEGORY, + TuttiCsvUtil.CARACTERISTIC_QUALITATIVE_VALUE_FORMATTER); newForeignKeyColumn(MarineLitterRow.CATEGORY, CaracteristicQualitativeValue.class, CaracteristicQualitativeValue.PROPERTY_ID, - categoryValueMap); + categoryValues); - newColumnForExport(MarineLitterRow.SIZE_CATEGORY, caracteristicQualitativeValueFormatter); + newColumnForExport(MarineLitterRow.SIZE_CATEGORY, + TuttiCsvUtil.CARACTERISTIC_QUALITATIVE_VALUE_FORMATTER); newForeignKeyColumn(MarineLitterRow.SIZE_CATEGORY, CaracteristicQualitativeValue.class, CaracteristicQualitativeValue.PROPERTY_ID, - sizeCategoryValueMap); + sizeCategoryValues); newColumnForImportExport(MarineLitterRow.NUMBER, TuttiCsvUtil.INTEGER); - newColumnForImportExport(MarineLitterRow.WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(MarineLitterRow.WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); newColumnForImportExport(MarineLitterRow.COMMENT); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -35,7 +35,8 @@ public MarineLitterWeightRowModel(char separator) { super(separator); - newColumnForImportExport(MarineLitterWeightRow.TOTAL_WEIGHT, TuttiCsvUtil.FLOAT); + newColumnForImportExport(MarineLitterWeightRow.TOTAL_WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); } @Override Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,6 +24,8 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; + import java.io.Serializable; /** @@ -70,7 +72,9 @@ protected Float weight; - public CarrouselRow() { + public boolean acceptOperation(FishingOperation operation) { + return operationCode.equals(operation.getStationNumber()) + && rigNumber.equals(operation.getMultirigAggregation()); } public String getOperationCode() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -34,46 +34,53 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.2 */ -public class CarrouselRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<CarrouselRow> { +public class CarrouselRowModel extends TuttiCsvUtil.ImportModelWithHeader<CarrouselRow> { public CarrouselRowModel(char separator) { super(separator); - // import definition - newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE); newMandatoryColumn(CarrouselRow.PROPERTY_RIG_NUMBER); newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID, new ValueParser<String>() { + @Override public String parse(String string) throws ParseException { return StringUtils.remove(string, '-').trim(); } }); newMandatoryColumn(CarrouselRow.PROPERTY_SIGN); - newMandatoryColumn(CarrouselRow.PROPERTY_DIRECTION, new ValueParser<Directions>() { + newMandatoryColumn(CarrouselRow.PROPERTY_DIRECTION, + TuttiCsvUtil.newEnumByNameParserFormatter(Directions.class)); + newMandatoryColumn(CarrouselRow.PROPERTY_WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); - public Directions parse(String string) throws ParseException { - return Directions.valueOf(string); - } - - }); - newMandatoryColumn(CarrouselRow.PROPERTY_WEIGHT, new ValueParser<Float>() { - - public Float parse(String string) throws ParseException { - return Float.parseFloat(string); - } - - }); - newIgnoredColumn(CarrouselRow.PROPERTY_FILE_ORIGIN); newIgnoredColumn(CarrouselRow.PROPERTY_DATE); newIgnoredColumn(CarrouselRow.PROPERTY_TIME); newIgnoredColumn(CarrouselRow.PROPERTY_BALANCE_ID); newIgnoredColumn(CarrouselRow.PROPERTY_TO_CONFIRM); newIgnoredColumn(CarrouselRow.PROPERTY_BOX_TYPE); + } + @Override + public String[] getHeader() { + return new String[]{ + CarrouselRow.PROPERTY_FILE_ORIGIN, + CarrouselRow.PROPERTY_DATE, + CarrouselRow.PROPERTY_TIME, + CarrouselRow.PROPERTY_BALANCE_ID, + CarrouselRow.PROPERTY_TO_CONFIRM, + CarrouselRow.PROPERTY_OPERATION_CODE, + CarrouselRow.PROPERTY_RIG_NUMBER, + CarrouselRow.PROPERTY_BOX_TYPE, + CarrouselRow.PROPERTY_SPECIES_ID, + CarrouselRow.PROPERTY_SIGN, + CarrouselRow.PROPERTY_DIRECTION, + CarrouselRow.PROPERTY_WEIGHT + }; } + @Override public CarrouselRow newEmptyInstance() { return new CarrouselRow(); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -26,14 +26,13 @@ import com.google.common.base.Charsets; import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -import com.google.common.io.Files; +import fr.ifremer.shared.application.ApplicationIOUtil; import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; @@ -51,6 +50,7 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.collections.CollectionUtils; @@ -70,12 +70,12 @@ import java.io.Serializable; import java.text.DateFormat; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * @author kmorin <kmorin(a)codelutin.com> @@ -96,16 +96,6 @@ protected CaracteristicQualitativeValue unsortedCaracteristic; -// protected CaracteristicQualitativeValue maleCaracteristic; -// -// protected CaracteristicQualitativeValue femaleCaracteristic; -// -// protected CaracteristicQualitativeValue smallCaracteristic; -// -// protected CaracteristicQualitativeValue mediumCaracteristic; -// -// protected CaracteristicQualitativeValue bigCaracteristic; - protected Map<PupitriCatch.Signs, CaracteristicQualitativeValue> signsToCaracteristicValue; @Override @@ -118,7 +108,6 @@ TuttiEnumerationFile enumerationFile = persistenceService.getEnumerationFile(); - signsToCaracteristicValue = Maps.newEnumMap(PupitriCatch.Signs.class); { // sorted/unsorted caracteristic @@ -145,7 +134,6 @@ } } - /** * @param trunkFile incoming trunk file * @param carrouselFile incoming carroussle file @@ -170,61 +158,79 @@ return result; } + public void exportSpecies(List<Species> species, File target) { + SpeciesRowModel speciesCsvModel = new SpeciesRowModel(';'); + + List<SpeciesRow> rows = Lists.newArrayList(); + + if (CollectionUtils.isNotEmpty(species)) { + rows = Lists.transform(species, new Function<Species, SpeciesRow>() { + + @Override + public SpeciesRow apply(Species input) { + SpeciesRow row = new SpeciesRow(input); +// String codeFirstPart = StringUtils.substring(input.getSurveyCode(), 0, 4); +// row.setCodeFirstPart(StringUtils.rightPad(codeFirstPart, 4)); +// String codeSecondPart = StringUtils.substring(input.getSurveyCode(), 4, 7); +// row.setCodeSecondPart(StringUtils.rightPad(codeSecondPart, 3)); +// row.setScientificName(input.getName()); + return row; + } + }); + } + + try { + Export.exportToFile(speciesCsvModel, + rows, + target, + Charsets.UTF_8, + false); + + } catch (Exception e) { + throw new ApplicationTechnicalException( + _("tutti.service.pupitri.export.species.error", target), e); + } + } + protected void addFileAsAttachment(File f, CatchBatch catchBatch) { Attachment attachment = Attachments.newAttachment(); attachment.setObjectType(AttachementObjectTypeEnum.CATCH_BATCH); attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); - String date = DateFormat.getDateTimeInstance().format(new Date()); + String date = DateFormat.getDateTimeInstance().format(context.currentDate()); String comment = _("tutti.service.pupitri.import.attachment.comment", date); attachment.setComment(comment); persistenceService.createAttachment(attachment, f); } - protected void importPupitriTrunk(File file, FishingOperation operation, CatchBatch catchBatch) { + protected void importPupitriTrunk(File file, + FishingOperation operation, + CatchBatch catchBatch) { if (log.isInfoEnabled()) { log.info("Will import pupitri operation [" + operation.toString() + "] trunk from file: " + file); } - char separator = ','; - TrunkRowModel csvModel = new TrunkRowModel(separator); + // prepare import - Reader reader = null; - File fileWithHeaders = null; + float sortedWeight = 0f; + float rejectedWeight = 0f; + Import<TrunkRow> importer = null; - try { - fileWithHeaders = new File(FileUtils.getTempDirectory(), file.getName()); - String headers = TrunkRow.PROPERTY_FILE_ORIGIN + separator + - TrunkRow.PROPERTY_DATE + separator + - TrunkRow.PROPERTY_TIME + separator + - TrunkRow.PROPERTY_BALANCE_ID + separator + - TrunkRow.PROPERTY_SIGN + separator + - TrunkRow.PROPERTY_OPERATION_CODE + separator + - TrunkRow.PROPERTY_RIG_NUMBER + separator + - TrunkRow.PROPERTY_DIRECTION + separator + - TrunkRow.PROPERTY_WEIGHT; + TrunkRowModel csvModel = new TrunkRowModel(','); - FileUtils.writeLines(fileWithHeaders, Collections.singletonList(headers)); - log.info(FileUtils.readFileToString(fileWithHeaders)); - FileUtils.writeLines(fileWithHeaders, FileUtils.readLines(file), true); - log.info(FileUtils.readFileToString(fileWithHeaders)); + File fileWithHeaders = createFileWithHeaders(csvModel, file); - reader = Files.newReader(fileWithHeaders, Charsets.UTF_8); - + Reader reader = ApplicationIOUtil.newReader( + fileWithHeaders, + n_("tutti.service.puttiri.carroussel.import.error")); + try { importer = Import.newImport(csvModel, reader); - Float sortedWeight = 0f; - Float rejectedWeight = 0f; - String operationNumber = operation.getStationNumber(); - String rigNumber = operation.getMultirigAggregation(); - for (TrunkRow bean : importer) { - if (bean.getOperationCode().equals(operationNumber) - && bean.getRigNumber().equals(rigNumber)) { - + if (bean.acceptOperation(operation)) { switch (bean.getDirection()) { case VAT: sortedWeight += bean.getWeight(); @@ -234,16 +240,14 @@ rejectedWeight += bean.getWeight(); } } - } - catchBatch.setCatchTotalSortedTremisWeight(sortedWeight); - catchBatch.setCatchTotalRejectedWeight(rejectedWeight); importer.close(); reader.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.pupitri.import.trunk.error", operation.toString(), file), e); + throw new ApplicationTechnicalException( + _("tutti.service.pupitri.import.trunk.error", operation.toString(), file), e); } finally { IOUtils.closeQuietly(importer); @@ -251,6 +255,10 @@ FileUtils.deleteQuietly(fileWithHeaders); } + catchBatch.setCatchTotalSortedTremisWeight( + TuttiEntities.roundKiloGram(sortedWeight)); + catchBatch.setCatchTotalRejectedWeight( + TuttiEntities.roundKiloGram(rejectedWeight)); } protected int importPupitriCarrousel(File carrouselFile, @@ -262,64 +270,50 @@ "] carrousel from file: " + carrouselFile); } - int result = 0; - Reader reader = null; - File fileWithHeaders = null; + // prepare import - Import<CarrouselRow> carrouselImporter = null; - char carrouselSeparator = ','; - CarrouselRowModel carrouselCsvModel = new CarrouselRowModel(carrouselSeparator); + //FIXME tchemit-2013-12-02 Explain what does it do ? + // get the map of species by survey code + ListMultimap<String, Species> speciesBySurveyCode = ArrayListMultimap.create(); - try { + speciesBySurveyCode.putAll( + Multimaps.index(dataContext.getReferentSpeciesWithSurveyCode(), + new Function<Species, String>() { + @Override + public String apply(Species input) { + String surveyCode = String.valueOf(input.getSurveyCode()); + int end = Math.min(surveyCode.length(), 7); + return surveyCode.substring(0, end); + } + }) + ); + speciesBySurveyCode.putAll(TuttiEntities.splitByRefTaxCode(dataContext.getReferentSpecies())); - //FIXME tchemit-2013-12-02 Explain what does it do ? - // get the map of species by survey code - ListMultimap<String, Species> speciesBySurveyCode = ArrayListMultimap.create(); + // import the batches - speciesBySurveyCode.putAll( - Multimaps.index(dataContext.getReferentSpeciesWithSurveyCode(), - new Function<Species, String>() { - @Override - public String apply(Species input) { - String surveyCode = String.valueOf(input.getSurveyCode()); - int end = Math.min(surveyCode.length(), 7); - return surveyCode.substring(0, end); - } - }) - ); - speciesBySurveyCode.putAll(TuttiEntities.splitByRefTaxCode(dataContext.getReferentSpecies())); - // import the batches - String[] header = new String[]{ - CarrouselRow.PROPERTY_FILE_ORIGIN, - CarrouselRow.PROPERTY_DATE, - CarrouselRow.PROPERTY_TIME, - CarrouselRow.PROPERTY_BALANCE_ID, - CarrouselRow.PROPERTY_TO_CONFIRM, - CarrouselRow.PROPERTY_OPERATION_CODE, - CarrouselRow.PROPERTY_RIG_NUMBER, - CarrouselRow.PROPERTY_BOX_TYPE, - CarrouselRow.PROPERTY_SPECIES_ID, - CarrouselRow.PROPERTY_SIGN, - CarrouselRow.PROPERTY_DIRECTION, - CarrouselRow.PROPERTY_WEIGHT - }; - fileWithHeaders = createFileWithHeaders(carrouselFile, header, carrouselSeparator); - reader = Files.newReader(fileWithHeaders, Charsets.UTF_8); - carrouselImporter = Import.newImport(carrouselCsvModel, reader); + int result; + Float carrouselSortedWeight = 0f; - String operationNumber = operation.getStationNumber(); - String rigNumber = operation.getMultirigAggregation(); + List<PupitriCatch> catches = Lists.newArrayList(); + Set<String> notFoundSpecies = Sets.newHashSet(); - Float carrouselSortedWeight = 0f; + Import<CarrouselRow> importer = null; - List<PupitriCatch> catches = Lists.newArrayList(); - Set<String> notFoundSpecies = Sets.newHashSet(); + CarrouselRowModel carrouselCsvModel = new CarrouselRowModel(','); - for (CarrouselRow bean : carrouselImporter) { + File fileWithHeaders = createFileWithHeaders(carrouselCsvModel, + carrouselFile); + Reader reader = ApplicationIOUtil.newReader( + fileWithHeaders, + n_("tutti.service.puttiri.carroussel.import.error")); + try { + + importer = Import.newImport(carrouselCsvModel, reader); + + for (CarrouselRow bean : importer) { // is the bean from the current operation and rig ? - if (bean.getOperationCode().equals(operationNumber) - && bean.getRigNumber().equals(rigNumber)) { + if (bean.acceptOperation(operation)) { String speciesId = bean.getSpeciesId(); List<Species> speciesList = speciesBySurveyCode.get(speciesId); @@ -355,151 +349,115 @@ } } } - result = notFoundSpecies.size(); - catchBatch.setCatchTotalSortedCarousselWeight(carrouselSortedWeight); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), null); - for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(batch.getId()); - } + importer.close(); + reader.close(); - TuttiEnumerationFile enumerationFile = persistenceService.getEnumerationFile(); - Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); - for (PupitriCatch pupitriCatch : catches) { + } catch (Exception e) { + DecoratorService service = getService(DecoratorService.class); + throw new ApplicationTechnicalException( + _("tutti.service.pupitri.import.carrousel.error", carrouselFile, service.getDecorator(operation).toString(operation)), e); - Species species = pupitriCatch.getSpecies(); - CaracteristicQualitativeValue cqv = pupitriCatch.isSorted() ? - sortedCaracteristic : unsortedCaracteristic; + } finally { + IOUtils.closeQuietly(importer); + IOUtils.closeQuietly(reader); + FileUtils.deleteQuietly(fileWithHeaders); + } - boolean splitSpecies = isSplitSpecies(pupitriCatch); + result = notFoundSpecies.size(); + catchBatch.setCatchTotalSortedCarousselWeight(TuttiEntities.roundKiloGram(carrouselSortedWeight)); - Map<PupitriCatch.Signs, MutableFloat> weightBySign = - pupitriCatch.getWeightBySign(); + // delete all species batches - if (splitSpecies) { + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), null); + for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { + persistenceService.deleteSpeciesBatch(batch.getId()); + } - // create a top batch + a son for each sign - if (log.isInfoEnabled()) { - log.info("Create a categorized batches for species " + speciesDecorator.toString(species)); - } - SpeciesBatch batch = createSpeciesBatch(operation, - species, - null, - enumerationFile.PMFM_ID_SORTED_UNSORTED, - cqv); + // insert all imported species batches - batch = persistenceService.createSpeciesBatch(batch, null); + TuttiEnumerationFile enumerationFile = persistenceService.getEnumerationFile(); + Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); + for (PupitriCatch pupitriCatch : catches) { - String parentBatchId = batch.getId(); + Species species = pupitriCatch.getSpecies(); + CaracteristicQualitativeValue cqv = pupitriCatch.isSorted() ? + sortedCaracteristic : unsortedCaracteristic; - for (Map.Entry<PupitriCatch.Signs, MutableFloat> entry : weightBySign.entrySet()) { + boolean splitSpecies = isSplitSpecies(pupitriCatch); - PupitriCatch.Signs signs = entry.getKey(); - float catchWeight = entry.getValue().floatValue(); + Map<PupitriCatch.Signs, MutableFloat> weightBySign = + pupitriCatch.getWeightBySign(); - Integer categoryId = signs.getCategory(enumerationFile); - CaracteristicQualitativeValue splitCqv = signsToCaracteristicValue.get(signs); - SpeciesBatch childBatch = createSpeciesBatch( - operation, - species, - catchWeight, - categoryId, - splitCqv - ); + if (splitSpecies) { + // create a top batch + a son for each sign + if (log.isDebugEnabled()) { + log.debug("Create a categorized batches for species " + speciesDecorator.toString(species)); + } + SpeciesBatch batch = createSpeciesBatch(operation, + species, + null, + enumerationFile.PMFM_ID_SORTED_UNSORTED, + cqv); - persistenceService.createSpeciesBatch(childBatch, parentBatchId); - } + batch = persistenceService.createSpeciesBatch(batch, null); - } else { + String parentBatchId = batch.getId(); - // create a unique batch with sum all weights as simple weight - if (log.isInfoEnabled()) { - log.info("Create a unique batch for species " + speciesDecorator.toString(species)); - } - float totalWeight = 0f; - for (MutableFloat weight : weightBySign.values()) { - totalWeight += weight.floatValue(); - } + for (Map.Entry<PupitriCatch.Signs, MutableFloat> entry : weightBySign.entrySet()) { - SpeciesBatch batch = createSpeciesBatch(operation, - species, - totalWeight, - enumerationFile.PMFM_ID_SORTED_UNSORTED, - cqv); + PupitriCatch.Signs signs = entry.getKey(); + float catchWeight = entry.getValue().floatValue(); - persistenceService.createSpeciesBatch(batch, null); + Integer categoryId = signs.getCategory(enumerationFile); + CaracteristicQualitativeValue splitCqv = signsToCaracteristicValue.get(signs); + SpeciesBatch childBatch = createSpeciesBatch( + operation, + species, + catchWeight, + categoryId, + splitCqv + ); + + + persistenceService.createSpeciesBatch(childBatch, parentBatchId); } -// MutableFloat catchWeight = weightBySign.get(PupitriCatch.Signs.DEFAULT); -// -// -// SpeciesBatch batch = createSpeciesBatch(operation, -// species, -// catchWeight.floatValue(), -// enumerationFile.PMFM_ID_SORTED_UNSORTED, -// cqv); -// -// batch = persistenceService.createSpeciesBatch(batch, null); -// -// // if the batch is splitted -// if (catchWeight == null) { -// Integer categoryId = null; -// for (PupitriCatch.Signs s : weightBySign.keySet()) { -// CaracteristicQualitativeValue splitCqv = null; -// switch (s) { -// case MALE: -// categoryId = enumerationFile.PMFM_ID_SEX; -// splitCqv = maleCaracteristic; -// break; -// -// case FEMALE: -// categoryId = enumerationFile.PMFM_ID_SEX; -// splitCqv = femaleCaracteristic; -// break; -// -// case SMALL: -// categoryId = enumerationFile.PMFM_ID_SIZE_CATEGORY; -// splitCqv = smallCaracteristic; -// break; -// -// case MEDIUM: -// categoryId = enumerationFile.PMFM_ID_SIZE_CATEGORY; -// splitCqv = mediumCaracteristic; -// break; -// -// case BIG: -// categoryId = enumerationFile.PMFM_ID_SIZE_CATEGORY; -// splitCqv = bigCaracteristic; -// break; -// } -// -// SpeciesBatch childBatch = createSpeciesBatch( -// operation, -// species, -// weightBySign.get(s).floatValue(), -// categoryId, -// splitCqv -// ); -// -// persistenceService.createSpeciesBatch(childBatch, batch.getId()); -// } -// } - } + } else { - carrouselImporter.close(); - reader.close(); + // create a unique batch with sum all weights as simple weight + if (log.isDebugEnabled()) { + log.debug("Create a unique batch for species " + speciesDecorator.toString(species)); + } + float totalWeight = 0f; + for (MutableFloat weight : weightBySign.values()) { + totalWeight += weight.floatValue(); + } - } catch (Exception e) { - DecoratorService service = getService(DecoratorService.class); - throw new ApplicationTechnicalException(_("tutti.service.pupitri.import.carrousel.error", carrouselFile, service.getDecorator(operation).toString(operation)), e);//"Could not import carrousel data [" + operation.toString() + "] from file " + carrouselFile + SpeciesBatch batch = createSpeciesBatch(operation, + species, + totalWeight, + enumerationFile.PMFM_ID_SORTED_UNSORTED, + cqv); - } finally { - IOUtils.closeQuietly(carrouselImporter); - IOUtils.closeQuietly(reader); - FileUtils.deleteQuietly(fileWithHeaders); + persistenceService.createSpeciesBatch(batch, null); + } } +// carrouselImporter.close(); +// reader.close(); +// +// } catch (Exception e) { +// DecoratorService service = getService(DecoratorService.class); +// throw new ApplicationTechnicalException(_("tutti.service.pupitri.import.carrousel.error", carrouselFile, service.getDecorator(operation).toString(operation)), e);//"Could not import carrousel data [" + operation.toString() + "] from file " + carrouselFile +// +// } finally { +// IOUtils.closeQuietly(carrouselImporter); +// IOUtils.closeQuietly(reader); +// FileUtils.deleteQuietly(fileWithHeaders); +// } + return result; } @@ -519,6 +477,7 @@ PupitriCatch.Signs.BIG ); + /** * Check that the given species catch can be split. * For the moment accept for a same catch : @@ -569,37 +528,6 @@ return result; } - - public void exportSpecies(List<Species> species, File target) { - SpeciesRowModel speciesCsvModel = new SpeciesRowModel(';'); - - List<SpeciesRow> rows = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(species)) { - rows = Lists.transform(species, new Function<Species, SpeciesRow>() { - - public SpeciesRow apply(Species input) { - Preconditions.checkNotNull(input.getSurveyCode(), - "Unable to export a species with a null survey code : " + input); - SpeciesRow row = new SpeciesRow(); - String codeFirstPart = StringUtils.substring(input.getSurveyCode(), 0, 4); - row.setCodeFirstPart(StringUtils.rightPad(codeFirstPart, 4)); - String codeSecondPart = StringUtils.substring(input.getSurveyCode(), 4, 7); - row.setCodeSecondPart(StringUtils.rightPad(codeSecondPart, 3)); - row.setScientificName(input.getName()); - return row; - } - }); - } - - try { - Export.exportToFile(speciesCsvModel, rows, target, Charsets.UTF_8, false); - - } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.pupitri.export.species.error", target), e); - } - } - protected SpeciesBatch createSpeciesBatch(FishingOperation operation, Species species, Float catchWeight, @@ -610,16 +538,22 @@ batch.setSampleCategoryId(categoryId); batch.setSampleCategoryValue(cqv); batch.setSpecies(species); - batch.setSampleCategoryWeight(catchWeight); + batch.setSampleCategoryWeight( + catchWeight == null ? null : TuttiEntities.roundKiloGram(catchWeight)); return batch; } - protected File createFileWithHeaders(File file, String[] header, char separator) throws IOException { + protected File createFileWithHeaders(TuttiCsvUtil.ImportModelWithHeader<?> model, + File file) { File fileWithHeaders = new File(FileUtils.getTempDirectory(), file.getName()); - String headers = StringUtils.join(header, separator); + String headers = StringUtils.join(model.getHeader(), model.getSeparator()); - FileUtils.writeLines(fileWithHeaders, Collections.singletonList(headers)); - FileUtils.writeLines(fileWithHeaders, FileUtils.readLines(file), true); + try { + FileUtils.writeLines(fileWithHeaders, Collections.singletonList(headers)); + FileUtils.writeLines(fileWithHeaders, FileUtils.readLines(file), true); + } catch (IOException e) { + throw new ApplicationTechnicalException("Could not create file with header " + file, e); + } return fileWithHeaders; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,6 +24,10 @@ * #L% */ +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import org.apache.commons.lang3.StringUtils; + import java.io.Serializable; /** @@ -40,34 +44,27 @@ public static final String PROPERTY_SCIENTIFIC_NAME = "scientificName"; - protected String codeFirstPart; + protected final Species species; - protected String codeSecondPart; + public SpeciesRow(Species species) { + Preconditions.checkNotNull(species.getSurveyCode(), + "Unable to export a species with a null survey code : " + species); + this.species = species; + } - protected String scientificName; - public String getCodeFirstPart() { - return codeFirstPart; + String codeFirstPart = StringUtils.substring(species.getSurveyCode(), 0, 4); + String result = StringUtils.rightPad(codeFirstPart, 4); + return result; } - public void setCodeFirstPart(String codeFirstPart) { - this.codeFirstPart = codeFirstPart; - } - public String getCodeSecondPart() { - return codeSecondPart; + String codeSecondPart = StringUtils.substring(species.getSurveyCode(), 4, 7); + String result = StringUtils.rightPad(codeSecondPart, 3); + return result; } - public void setCodeSecondPart(String codeSecondPart) { - this.codeSecondPart = codeSecondPart; - } - public String getScientificName() { - return scientificName; + return species.getName(); } - - public void setScientificName(String scientificName) { - this.scientificName = scientificName; - } - } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -25,30 +25,20 @@ */ import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * @author kmorin <kmorin(a)codelutin.com> * @since 1.2 */ -public class SpeciesRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<SpeciesRow> { +public class SpeciesRowModel extends TuttiCsvUtil.AbstractTuttiExportModel<SpeciesRow> { - private static final Log log = LogFactory.getLog(SpeciesRowModel.class); - public SpeciesRowModel(char separator) { super(separator); - // import definition - - newColumnForImportExport(SpeciesRow.PROPERTY_CODE_FIRST_PART); - newColumnForImportExport(SpeciesRow.PROPERTY_CODE_SECOND_PART); - newColumnForImportExport(SpeciesRow.PROPERTY_SCIENTIFIC_NAME); - + newColumnForExport(SpeciesRow.PROPERTY_CODE_FIRST_PART); + newColumnForExport(SpeciesRow.PROPERTY_CODE_SECOND_PART); + newColumnForExport(SpeciesRow.PROPERTY_SCIENTIFIC_NAME); } - public SpeciesRow newEmptyInstance() { - return new SpeciesRow(); - } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -24,6 +24,8 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; + import java.io.Serializable; /** @@ -62,7 +64,9 @@ protected Float weight; - public TrunkRow() { + public boolean acceptOperation(FishingOperation operation) { + return operationCode.equals(operation.getStationNumber()) + && rigNumber.equals(operation.getMultirigAggregation()); } public String getOperationCode() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -25,48 +25,47 @@ */ import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.csv.ValueParser; -import java.text.ParseException; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 1.2 */ -public class TrunkRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<TrunkRow> { +public class TrunkRowModel extends TuttiCsvUtil.ImportModelWithHeader<TrunkRow> { public TrunkRowModel(char separator) { super(separator); - // import definition - newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE); newMandatoryColumn(TrunkRow.PROPERTY_RIG_NUMBER); - newMandatoryColumn(TrunkRow.PROPERTY_DIRECTION, new ValueParser<Directions>() { + newMandatoryColumn(TrunkRow.PROPERTY_DIRECTION, + TuttiCsvUtil.newEnumByNameParserFormatter(Directions.class)); + newMandatoryColumn(TrunkRow.PROPERTY_WEIGHT, + TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); - public Directions parse(String string) throws ParseException { - return Directions.valueOf(string); - } - - }); - newMandatoryColumn(TrunkRow.PROPERTY_WEIGHT, new ValueParser<Float>() { - - public Float parse(String string) throws ParseException { - return Float.parseFloat(string); - } - - }); - newIgnoredColumn(TrunkRow.PROPERTY_SIGN); newIgnoredColumn(TrunkRow.PROPERTY_FILE_ORIGIN); newIgnoredColumn(TrunkRow.PROPERTY_DATE); newIgnoredColumn(TrunkRow.PROPERTY_TIME); newIgnoredColumn(TrunkRow.PROPERTY_BALANCE_ID); + } + @Override + public String[] getHeader() { + return new String[]{ + TrunkRow.PROPERTY_FILE_ORIGIN, + TrunkRow.PROPERTY_DATE, + TrunkRow.PROPERTY_TIME, + TrunkRow.PROPERTY_BALANCE_ID, + TrunkRow.PROPERTY_SIGN, + TrunkRow.PROPERTY_OPERATION_CODE, + TrunkRow.PROPERTY_RIG_NUMBER, + TrunkRow.PROPERTY_DIRECTION, + TrunkRow.PROPERTY_WEIGHT + }; } + @Override public TrunkRow newEmptyInstance() { return new TrunkRow(); } - } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-12-09 20:13:47 UTC (rev 1441) @@ -172,6 +172,7 @@ tutti.service.pupitri.import.attachment.comment= tutti.service.pupitri.import.carrousel.error= tutti.service.pupitri.import.trunk.error= +tutti.service.puttiri.carroussel.import.error= tutti.service.referential.export.gear.error= tutti.service.referential.export.person.error= tutti.service.referential.export.species.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-12-09 20:13:47 UTC (rev 1441) @@ -172,6 +172,7 @@ tutti.service.pupitri.import.attachment.comment=Import Pupitri du %s tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier de carrousel %2s pour le trait %1s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s +tutti.service.puttiri.carroussel.import.error= tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s tutti.service.referential.export.species.error=Erreur lors de l'export des espèces dans le fichier %s Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -108,7 +108,11 @@ getContext().getTuttiPupitriImportExportService(); service.exportSpecies(speciesList, file); + } + @Override + public void postSuccessAction() { + super.postSuccessAction(); sendMessage(_("tutti.flash.info.species.exported.from.protocol", file)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -60,8 +60,6 @@ protected ImportPupitriPopupUI importPupitriDialog; -// protected TuttiProtocol currentProtocol; - protected PersistenceService persistenceService; protected EditFishingOperationAction editAction; @@ -74,7 +72,6 @@ public EditFishingOperationAction getEditAction() { if (editAction == null) { - //editAction = getContext().getActionFactory().createLogicAction(getHandler().getParentUi().getHandler().getParentHandler(), FishingOperationsUI parentContainer = handler.getParentContainer(FishingOperationsUI.class); editAction = getContext().getActionFactory().createLogicAction(parentContainer.getHandler(), EditFishingOperationAction.class); @@ -110,7 +107,6 @@ ); } if (result) { -// currentProtocol = getDataContext().getProtocol(); SpeciesBatchUIModel speciesBatchUIModel = getUI().getModel(); if (speciesBatchUIModel.getRowCount() > 0) { @@ -145,7 +141,6 @@ PupitriImportExportService pupitriImportExportService = getContext().getTuttiPupitriImportExportService(); -// EditCatchesUIModel model = getUI().getHandler().getParentUi().getModel(); EditCatchesUI parentContainer = handler.getParentContainer(EditCatchesUI.class); EditCatchesUIModel model = parentContainer.getModel(); @@ -170,7 +165,6 @@ super.releaseAction(); importedTrunkFile = null; importedCarrouselFile = null; -// currentProtocol = null; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2013-12-09 16:12:30 UTC (rev 1440) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2013-12-09 20:13:47 UTC (rev 1441) @@ -56,6 +56,7 @@ protected void resetFields() { ui.getTrunkFile().setSelectedFilePath(null); + ui.getCarrouselFile().setSelectedFilePath(null); } public void open() {

1 0

r1440 - in trunk/tutti-ui-swing/src/main: filtered-resources help/fr java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 17:12:30 +0100 (Mon, 09 Dec 2013) New Revision: 1440 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1440 Log: refs #3944: Compl?\195?\169ter l'aide en ligne (fix help uri with anchor + fix some links) Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/help/fr/report.html trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 15:44:42 UTC (rev 1439) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 16:12:30 UTC (rev 1440) @@ -279,8 +279,8 @@ tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration -tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#traitActions +tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#traitActions tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields tutti.fishingOperations.help=editFishingOperation.html tutti.index.help=index.html Modified: trunk/tutti-ui-swing/src/main/help/fr/report.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/report.html 2013-12-09 15:44:42 UTC (rev 1439) +++ trunk/tutti-ui-swing/src/main/help/fr/report.html 2013-12-09 16:12:30 UTC (rev 1440) @@ -18,7 +18,8 @@ <h1>Générer des rapports</h1> </div> - <p>Sur cet écran on générer des rapports sur un trait sélectionné d'une campagne.</p> + <p>Sur cet écran on permet de générer des rapports sur un trait sélectionné + de la campagne.</p> <h2>Description des champs<a name="fields"></a></h2> <dl> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 15:44:42 UTC (rev 1439) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 16:12:30 UTC (rev 1440) @@ -896,8 +896,8 @@ String fragment = null; if (withFragment) { + fragment = StringUtils.substringAfter(helpDirectory, "#"); helpDirectory = StringUtils.substringBefore(helpDirectory, "#"); - fragment = StringUtils.substringAfter(helpDirectory, "#"); } URI resolvedUri = new File(helpDirectory).toURI();

1 0

r1439 - in trunk/tutti-ui-swing: . src/main/filtered-resources src/main/help/en src/main/help/fr src/main/help/js src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 16:44:42 +0100 (Mon, 09 Dec 2013) New Revision: 1439 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1439 Log: refs #3944: Compl?\195?\169ter l'aide en ligne (ajout aide des rapports + fix) Added: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/help/en/config.html trunk/tutti-ui-swing/src/main/help/en/editSampleCategory.html trunk/tutti-ui-swing/src/main/help/en/faq.html trunk/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html trunk/tutti-ui-swing/src/main/help/en/index.html trunk/tutti-ui-swing/src/main/help/en/menu.html trunk/tutti-ui-swing/src/main/help/en/report.html trunk/tutti-ui-swing/src/main/help/fr/report.html Removed: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html Modified: trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/help/en/dbManager.html trunk/tutti-ui-swing/src/main/help/en/editCruise.html trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/en/editProgram.html trunk/tutti-ui-swing/src/main/help/en/editProtocol.html trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/en/selectCruise.html trunk/tutti-ui-swing/src/main/help/fr/index.html trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/fr/menu.html trunk/tutti-ui-swing/src/main/help/js/navbar.js trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/pom.xml 2013-12-09 15:44:42 UTC (rev 1439) @@ -52,7 +52,7 @@  <jaxx.helpsetName>tutti</jaxx.helpsetName> - <jaxx.locales>fr,en</jaxx.locales> + <jaxx.locales>fr</jaxx.locales> <jaxx.mergeIdsToInput>true</jaxx.mergeIdsToInput> <jaxx.inputHelpDirectory> src/main/filtered-resources Copied: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties (from rev 1436, trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties) =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,369 @@ +#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo +#Mon Dec 09 15:37:05 CET 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles +tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles +tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets +tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot +tutti.dbManager.action.closeDb.help=dbManager.html\#actions +tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions +tutti.dbManager.action.exportDb.help=dbManager.html\#actions +tutti.dbManager.action.importDb.help=dbManager.html\#actions +tutti.dbManager.action.installDb.help=dbManager.html\#actions +tutti.dbManager.action.openDb.help=dbManager.html\#actions +tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions +tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions +tutti.dbManager.help=dbManager.html +tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles +tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.reset.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos +tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.help=editFishingOperation.html\#captureResume +tutti.editCruise.action.close.help=editCruise.html\#actions +tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions +tutti.editCruise.action.generateName.help=editCruise.html\#actions +tutti.editCruise.action.save.help=editCruise.html\#actions +tutti.editCruise.action.viewGearCaracteristics.help= +tutti.editCruise.field.beginDate.help=editCruise.html\#fields +tutti.editCruise.field.comment.help=editCruise.html\#fields +tutti.editCruise.field.country.help=editCruise.html\#fields +tutti.editCruise.field.departureLocation.help=editCruise.html\#fields +tutti.editCruise.field.endDate.help=editCruise.html\#fields +tutti.editCruise.field.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields +tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields +tutti.editCruise.field.name.help=editCruise.html\#fields +tutti.editCruise.field.program.help=editCruise.html\#fields +tutti.editCruise.field.returnLocation.help=editCruise.html\#fields +tutti.editCruise.field.surveyPart.help=editCruise.html\#fields +tutti.editCruise.field.vessel.help=editCruise.html\#fields +tutti.editCruise.field.year.help=editCruise.html\#fields +tutti.editCruise.filterVessel.help=editCruise.html\#fields +tutti.editCruise.help=editCruise.html +tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.secondaryVessel.help= +tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.filterSecondaryVesselType.help= +tutti.editFishingOperation.help=editFishingOperation.html\#traitFields +tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles +tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions +tutti.editProgram.action.saveProgram.help=editProgram.html\#actions +tutti.editProgram.field.description.help=editProgram.html\#fields +tutti.editProgram.field.name.help=editProgram.html\#fields +tutti.editProgram.field.zone.help=editProgram.html\#fields +tutti.editProgram.help=editProgram.html +tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos +tutti.editProtocol.field.comment.help=editProtocol.html\#fields +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.name.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.help=editProtocol.html +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics +tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.help=editSampleCategory.html +tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration +tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields +tutti.fishingOperations.help=editFishingOperation.html +tutti.index.help=index.html +tutti.main.action.changeLocale.help=menu.html\#menu_aide +tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide +tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide +tutti.main.action.showHelp.help=menu.html\#menu_aide +tutti.main.help=index.html +tutti.main.menu.action.about.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide +tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration +tutti.main.menu.action.editCatches.help=menu.html\#menu_action +tutti.main.menu.action.editCruise.help=menu.html\#menu_action +tutti.main.menu.action.editProgram.help=menu.html\#menu_action +tutti.main.menu.action.editProtocol.help=menu.html\#menu_action +tutti.main.menu.action.editSampleCategoryModel.help= +tutti.main.menu.action.exit.help=menu.html\#menu_fichier +tutti.main.menu.action.generateCruiseReport.help=menu.html\#menu_action +tutti.main.menu.action.generateSelectedCruiseReport.help=menu.html\#menu_action +tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration +tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier +tutti.main.menu.action.selectCruise.help=menu.html\#menu_action +tutti.main.menu.action.showHelp.help=menu.html\#menu_aide +tutti.main.menu.action.site.help=menu.html\#menu_aide +tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier +tutti.main.menu.action.updateReport.help= +tutti.main.menu.action.validateCatches.help=menu.html\#menu_action +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel +tutti.report.action.cancel.help=report.html\#actions +tutti.report.action.chooseOutputFile.help=report.html\#actions +tutti.report.action.generate.help=report.html\#actions +tutti.report.action.showOutputFile.help=report.html\#actions +tutti.report.field.fishingOperation.help=report.html\#fields +tutti.report.field.outputFile.help=report.html\#fields +tutti.report.field.report.help=report.html\#fields +tutti.report.help=report.html +tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.generateCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions +tutti.selectCruise.field.cruise.help=selectCruise.html\#fields +tutti.selectCruise.field.program.help=selectCruise.html\#fields +tutti.selectCruise.field.protocol.help=selectCruise.html\#fields +tutti.selectCruise.help=selectCruise.html +tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions +tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions +tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions +tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Deleted: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,368 +0,0 @@ -#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Sun Dec 08 10:30:36 CET 2013 -tutti.config.help=config.html -tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets -tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot -tutti.dbManager.action.closeDb.help=dbManager.html\#actions -tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tutti.dbManager.action.exportDb.help=dbManager.html\#actions -tutti.dbManager.action.importDb.help=dbManager.html\#actions -tutti.dbManager.action.installDb.help=dbManager.html\#actions -tutti.dbManager.action.openDb.help=dbManager.html\#actions -tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions -tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions -tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.reset.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos -tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.help=editFishingOperation.html\#captureResume -tutti.editCruise.action.close.help=editCruise.html\#actions -tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions -tutti.editCruise.action.generateName.help=editCruise.html\#actions -tutti.editCruise.action.save.help=editCruise.html\#actions -tutti.editCruise.action.viewGearCaracteristics.help= -tutti.editCruise.field.beginDate.help=editCruise.html\#fields -tutti.editCruise.field.comment.help=editCruise.html\#fields -tutti.editCruise.field.country.help=editCruise.html\#fields -tutti.editCruise.field.departureLocation.help=editCruise.html\#fields -tutti.editCruise.field.endDate.help=editCruise.html\#fields -tutti.editCruise.field.gear.help=editCruise.html\#fields -tutti.editCruise.field.headOfMission.help=editCruise.html\#fields -tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields -tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields -tutti.editCruise.field.name.help=editCruise.html\#fields -tutti.editCruise.field.program.help=editCruise.html\#fields -tutti.editCruise.field.returnLocation.help=editCruise.html\#fields -tutti.editCruise.field.surveyPart.help=editCruise.html\#fields -tutti.editCruise.field.vessel.help=editCruise.html\#fields -tutti.editCruise.field.year.help=editCruise.html\#fields -tutti.editCruise.filterVessel.help=editCruise.html\#fields -tutti.editCruise.help=editCruise.html -tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.secondaryVessel.help= -tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.filterSecondaryVesselType.help= -tutti.editFishingOperation.help=editFishingOperation.html\#traitFields -tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions -tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.description.help=editProgram.html\#fields -tutti.editProgram.field.name.help=editProgram.html\#fields -tutti.editProgram.field.zone.help=editProgram.html\#fields -tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos -tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics -tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.help=editSampleCategory.html -tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration -tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields -tutti.fishingOperations.help=editFishingOperation.html -tutti.index.help=index.html -tutti.main.action.changeLocale.help=menu.html\#menu_aide -tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.action.showHelp.help=menu.html\#menu_aide -tutti.main.help=index.html -tutti.main.menu.action.about.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration -tutti.main.menu.action.editCatches.help=menu.html\#menu_action -tutti.main.menu.action.editCruise.help=menu.html\#menu_action -tutti.main.menu.action.editProgram.help=menu.html\#menu_action -tutti.main.menu.action.editProtocol.help=menu.html\#menu_action -tutti.main.menu.action.editSampleCategoryModel.help= -tutti.main.menu.action.exit.help=menu.html\#menu_fichier -tutti.main.menu.action.generateCruiseReport.help=menu.html\#menu_action -tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration -tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier -tutti.main.menu.action.selectCruise.help=menu.html\#menu_action -tutti.main.menu.action.showHelp.help=menu.html\#menu_aide -tutti.main.menu.action.site.help=menu.html\#menu_aide -tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier -tutti.main.menu.action.updateReport.help= -tutti.main.menu.action.validateCatches.help=menu.html\#menu_action -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel -tutti.report.action.cancel.help=report.html\#action -tutti.report.action.chooseOutputFile.help=report.html\#action -tutti.report.action.generate.help=report.html\#action -tutti.report.action.showOutputFile.help=report.html\#fields -tutti.report.field.fishingOperation.help=report.html\#fields -tutti.report.field.outputFile.help=report.html\#fields -tutti.report.field.report.help=report.html\#fields -tutti.report.help=report.html -tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.generateCruiseReport.help=selectCruise.html\#actions -tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions -tutti.selectCruise.field.cruise.help=selectCruise.html\#fields -tutti.selectCruise.field.program.help=selectCruise.html\#fields -tutti.selectCruise.field.protocol.help=selectCruise.html\#fields -tutti.selectCruise.help=selectCruise.html -tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Copied: trunk/tutti-ui-swing/src/main/help/en/config.html (from rev 1432, trunk/tutti-ui-swing/src/main/help/fr/config.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/config.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/config.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,135 @@ +<!DOCTYPE html> +<html lang="fr"> +<head> + <meta charset="utf-8"> + + <title>Tutti - Configuration</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> + + <div class="page-header"> + <h1>Configuration</h1> + <strong>TRANSLATE ME!</strong> + </div> + + + <p>Sur + cette écran on peut configurer l'application. A chaque sous onglet il + est rappelé la valeur par défaut du champ permettant de revenir à une + configuration par défaut.</p> + + <strong></strong> + + <h2>Champs<a name="fields"></a></h2> + <dl> + <dt>Onglet Application</dt> + <dd>Caractère séparateur (csv) : permet de définir le séparateur des + fichiers d'import et export<br>Chemin du fichier de configuration : + chemin vers le fichier de configuration de l'application<br>Pourcentage + de différence entre les Poids totaux VRAC triès et les poids totaux + VRAC : valeur au delà de laquelle l'application déclenchera un + warning + suite aux élévations des poids.<br>Nombre max de données + individuelles : + dans le cadre de la recopie des données de l'onglet "espèces" vers + l'onglet "données individuelles", limite max au delà de laquelle un + warning s'affichera pour éviter la création d'un trop grand nombre + de + lignes par erreur.<br>Navire ayant un carousel et un trémie : + identifiant du navire qui activera l'affichage des champs + spécifiques + aux poids carousel et trémie.<br>Id du pays à utiliser (export) : + dans les fichiers d'export, permet d'identifier le pays producteur + de la donnée.<br><span style="font-weight: bold;"></span></dd> + </dl> + <dl> + <dt>Onglet Interface utilisateur</dt> + <dd>Couleur alternée : couleur de fond d'alternance des lignes dans les + tableaux<br>Couleur d'une ligne sélectionnée : couleur de fond d'une + ligne sélectionnée dans un tableau<br>Couleur d'une ligne invalide : + couleur de fond d'une ligne invalide<br>Couleur d'une cellule en + lecture seule : couleur de fond d'une cellule en lecture seule<br>Couleur + cellule avec donnée : couleur de fond d'une cellule commentaire avec + une donnée<br>Couleur d'une espèce à confirmer : couleur de fond + d'une ligne pour laquelle l'option "à confirmer" est cochée<br>Couleur + de valeur calculée : couleur d'écriture des valeurs calculées<br>Couleur + d'attente : couleur de fond quand l'application est en mode + "attente" (exemple : élévation des poids en cours)<br>Format des + dates : formatage de saisie et d'affichage des dates<br>Formatage de + coordonnées : permet de définir le format de saisie et d'affichage + des latitudes et longitudes (DD, DMS ou DMD) + </dd> + <dt>Onglet Unité des poids</dt> + <dd>Unité Espèces : unité de saisie des poids dans l'onglet + "espèces"<br>Unité Benthos : unité de saisie des poids dans l'onglet + "benthos"<br>Unité Macro-déchêts : unité de saisie des poids dans + l'onglet "macro-déchêts"<br>Unité données individuelles : unité de + saisie des poids dans l'onglet "données individuelles"<br>Unité + capture accidentelle : unité de saisie des poids dans l'onglet + "capture accidentelle" + </dd> + <dt>Onglet Technique</dt> + <dd>Contient + la configuration technique de l'application, la plupart des options + sont non modifiables (elles sont là plus à titre indicatif). Seuls + les + champs modifiables sont détaillés ici.<br>Répertoire des sauvegardes + de base : chemin vers le dossier où sera enregistré les sauvegardes + des bases<br>Répertoire + des sauvegardes de rapport : chemin vers le dossier où sera + enregistré + les sauvegardes des rapports (rapport Birt de contrôle par + exemple)<br>URL de mise à jour des applicatifs : lien internet vers + les fichiers de mise à jour automatique de l'applicatif<br>URL de + mise à jour des données : lien internet vers les fichiers de mise à + jour automatique des données de référence + </dd> + </dl> + <h2 accesskey="actions">Actions<a name="actions"></a></h2> + + <dl> + <dt>Annuler</dt> + <dd>Annuler les modifications sur la configuration</dd> + <dt>Enregistrer</dt> + <dd>Enregister + les modifications sur la configuration. La modification de certaines + options demendera le rédémarage de l'application. Valider à + l'invitation. + </dd> + <dt>Quitter</dt> + <dd>Quitter l'écran de configuration</dd> + </dl> + +</div> +</body> +</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Créer un lot de poissons</title> -</head> -<body> - -<h1>Créer un lot de poissons</h1> - -<p>Sur cette écran on peut créer un lot de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/dbManager.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/dbManager.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/dbManager.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,4 +1,7 @@ - -<!DOCTYPE html> -<html lang="fr"> + <meta charset="utf-8"> -<head> - <meta charset="utf-8"/> <title>Tutti - Gérer la base de données</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> <body> +<script type="text/javascript" src="../js/navbar.js"></script> -<h1>Gérer la base de données</h1> +<div class="container"> + <div class="page-header"> + <h1>Gérer la base de données</h1> + <strong>TRANSLATE ME!</strong> + </div> -<p>Sur cette écran on peut gérer la base de données...</p> -<strong>Documentation à rédiger</strong> + <p>Cet + écran permet de gérer la base de données de l'application. Un + rappel de la version en cours (modèle de base et version des + référentiels) est fait sur cet écran</p> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> + <p>L'application utilise une base de travail compatible Allegro, + l'application permet de + gérer ces bases, à savoir Installer une base à partir d'une url distante + via le mécanisme de mise à jour intégré.</p> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : + <h2>Actions</h2> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> + <dl> + <dt>Réinstaller</dt> + <dd> + Permet de réinstaller l'application afin de repartir sur une base + vide + de donnée. Une sauvegarde obligatoire des données sera faite. + </dd> + <dt>Importer une base</dt> + <dd>Permet d'importer une base précédement générer via l'option + Exporter. + </dd> + <dt>Mettre à jour les référentiels</dt> + <dd> + En mode connecté, permet de déclencher le processus de + synchronisation des référentiels + </dd> + <dt>Exporter</dt> + <dd> + Permet d'exporter toute la base embarquée sous un format <i>.zip</i>. + </dd> + </dl> + <dl></dl> + +</div> </body> </html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture accidentelle</title> -</head> -<body> - -<h1>Éditer une capture accidentelle</h1> - -<p>Sur cette écran on peut éditer une capture accidentelle...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de Benthos</title> -</head> -<body> - -<h1>Éditer une capture de Benthos</h1> - -<p>Sur cette écran on peut éditer une capture de Benthos...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture</title> -</head> -<body> - -<h1>Éditer une capture</h1> - -<p>Sur cette écran on peut éditer une capture...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/editCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editCruise.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editCruise.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,4 +1,6 @@ - -<!DOCTYPE html> -<html lang="fr"> + <meta charset="utf-8"> -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une campagne</title> + <title>Tutti - Créer / Éditer une campagne</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> <body> -<h1>Éditer une campagne</h1> +<script type="text/javascript" src="../js/navbar.js"></script> -<p>Sur cette écran on peut éditer une campagne...</p> +<div class="container"> + <div class="page-header"> + <h1>Créer / Éditer une campagne</h1> + <strong>TRANSLATE ME!</strong> + </div> -<strong>Documentation à rédiger</strong> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> + <p>Sur cet écran, on peut créer et éditer une campagne.</p> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : + <h2>Description des champs<a name="fields"></a></h2> + <dl> + <dt>Série</dt> + <dd>liste + les différentes séries existantes dans la base (cf écran Créer/ + Éditer + une série de campagne). Sélectionner la série à laquelle se + rattachera + la campagne. + </dd> + <dt>Série partielle</dt> + <dd>contient + le numéro d'ordre de la campagne. Exemple : si il y a deux + campagnes au cours de la même année, permet de faire la différence + entre ces deux campagnes. Mettre 1 si il n'y a que une campagne par + année. + </dd> + <dt>Port de départ</dt> + <dd>renseigne + sur le port de départ de la campagne. Pour chercher un port, taper + son + code (ex. : XBR) ou son nom (ex. : *brest). Ce champ + pointe + sur un référentiel de lieux terrestres. + </dd> + <dt>Port d'arrivée</dt> + <dd>renseigne + sur le port d'arrivée de la campagne. Pour chercher un port, taper + son + code (ex. : XBR) ou son nom (ex. : *brest). Ce champ + pointe + sur un référentiel de leiux terrestres. + </dd> + <dt>Date de début</dt> + <dd>contient la date de début de la campagne. La saisie se fait + manuellement ou via le bouton situé à droite du champ. + </dd> + <dt>Date de fin</dt> + <dd>contient la date de fin de la campagne. La saisie se fait + manuellement ou via le bouton situé à droite du champ. + </dd> + <dt>Nom</dt> + <dd>contient + le nom de la campagne. Le champ est complété manuellement ou + automatiquement via [Générer le nom]. La valeur de ce champ est + unique + en base. + </dd> + <dt>Nombre de poches</dt> + <dd>contient + le nombre de poches de l'engin de pêche utilisé au cours de la + campagne. Saisir la valeur 1 dans cette version de l'application (le + modèle ne peut pas gérer dans cette version une valeur supérieure à + 1). + </dd> + <dt>Filtre (sur les navire / engins)</dt> + <dd>permet de filtrer la liste des champs navire et Engin(s). + <dl> + <dt>Tout</dt> + <dd>les deux listes proposent toutes les valeurs disponibles en + base. + </dd> + <dt>Scientifique</dt> + <dd>seules les références reliées en base à la catégorie « scientifique » + sont listées dans les champs Navire et Engin(s). + </dd> + <dt>Professionnels</dt> + <dd>seules + les références reliées en base à la catégorie + « professionnels » sont listées dans les champs + Navire et + Engin(s). + </dd> + </dl> + </dd> + <dt>Navire</dt> + <dd>contient + le navire de la campagne. Dans le cas où le navire n'est pas listé, + il + est possible via le menu « Administration/Référentiels + temporaires » d'ajouter un navire temporaire + </dd> + <dt></dt> + <dt>Engin(s)</dt> + </dl> + <dl> + <dd>contient + le(s) engin(s) qui sont mis en œuvre au cours de la campagne. Pour + lister les engins de la campagne, + sélectionner les références dans la colonne de gauche et basculer + les + sélections dans la colonne de droite via la flèche verte orientée + vers + la droite. L'autre flèche permet d’annuler la sélection d'un engin. + Le + champ du dessus permet de faire une recherche textuelle.<br>Un clic + droit sur un engin permet d'accèder aux options suivantes :<br> + <ul> + <li>Editer + : permet d'éditer les caractèristiques de l'engin, + d'ajouter, supprimer + et/ou de modifier les valeurs de ces caractéristiques + </li> + <li>Voir : permet de voir les caractéristiques de l'engins + (modifications impossibles) + </li> + <li>Monter + : si plusieurs engins sont listés dans la colonne de + droite, + permet de monter d'un cran vers le haut l'ordre de l'engin + dans la liste + </li> + <li>Descendre + : si plusieurs engins sont listés dans la colonne de droite, + permet de + descendred un cran vers le bas l'ordre de l'engin dans la + liste + </li> + <li>Supprimer : retir l'engin de la liste de droite</li> + </ul> + </dd> + </dl> + <dl> + <dt>Chef(s) de mission</dt> + <dd>permet + de lister le(s) chef(s) de mission de la campagne. Le fonctionnement + est similaire à la sélection des engins. Dans le cas où des + personnes + ne seraient pas listées, il est possible via le menu + « Administration/Référentiels temporaires » d'ajouter des + personnes temporaires. + </dd> + <dt>Responsable(s) de salle de tri</dt> + <dd>permet + de lister le(s) responsable(s) de la salle de tri de la campagne. Le + fonctionnement est similaire à la sélection des engins. Dans le cas + où + des personnes ne seraient pas listées, il est possible via le menu + « Administration/Référentiels temporaires » d'ajouter des + personnes temporaires. + </dd> + <dt>Commentaire</dt> + <dd>permet d'ajouter un commentaire libre sur la campagne.</dd> + </dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> + <h2>Description des actions<a name="actions"></a></h2> + <dl> + <dt>Générer le nom</dt> + <dd>une + fois les trois champs « Série », « Série + partielle » et « date de début » complétés, cliquer + sur + ce bouton pour générer automatiquement le nom complet de la + campagne. + </dd> + <dt>Fermer</dt> + <dd>ferme l'écran.</dd> + <dt>Enregistrer</dt> + <dd>enregistre les modifications faites dans les différents champs.</dd> + </dl> +</div> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,4 +1,6 @@ - -<!DOCTYPE html> -<html lang="fr"> + <meta charset="utf-8"> -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer un trait</title> + <title>Tutti - Saisie du trait et de la capture</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> <body> -<h1>Éditer un trait</h1> +<script type="text/javascript" src="../js/navbar.js"></script> -<p>Sur cette écran on peut éditer un trait...</p> +<div class="container"> +<div class="page-header"> + <h1>Saisie du trait et de la capture</h1> + <strong>TRANSLATE ME!</strong> +</div> -<strong>Documentation à rédiger</strong> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<h2>Trait / Trait<a name="trait"></a></h2> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : +<p>Sur cet écran, on peut saisir les informations relatives aux + caractéristiques des opérations de pêche.</p> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<h3>Description des champs<a name="traitFields"></a></h3> +<dl> + <dt>Code Station </dt> + <dd> + contient le code station où a eu lieu l'opération de pêche (Station = + un lieu en mer). + </dd> + <dt>Numéro de trait </dt> + <dd> + contient le n° de l'opération de pêche. + </dd> + <dt>Numéro de poche </dt> + <dd> + contient le n° de la poche qui sera observée. Si le nombre de poche = 1 + dans les informations liées à la campagne, alors ce champ est non + saisissable et a pour valeur 1. Dans une campagne mettant en œuvre des + casiers, nasses, le nombre de poches sera le nombre d'engins de la + filière. + Pour les filets, ce sera le nombre de tésures de la filière. + </dd> + <dt>Strate</dt> + <dd> + contient la strate à laquelle est affectée l'opération de pêche. Les + valeurs + de ce champ sont issues d'un référentiel. + </dd> + <dt>Sous strate</dt> + <dd> + contient la sous strate à laquelle est affectée l'opération de pêche. + Les valeurs de ce champ sont issu d'un référentiel. + </dd> + <dt>Localité</dt> + <dd> + contient la localité à laquelle est affecté l'opération de pêche. Les + valeurs de ce champ sont issues d'un référentiel. + </dd> + <dt>Latitude Début et Fin de traîne</dt> + <dd> + contient la latitude de début ou fin de l'opération de pêche. Le format + de + saisie peut être modifié dans la configuration. + </dd> + <dt>Longitude Début et Fin de traîne</dt> + <dd> + contient la longitude de début ou fin de l'opération de pêche. + Le format de saisie peut être modifié dans la configuration. + </dd> + <dt>Date et (H)heure Début et Fin de traîne</dt> + <dd> + contient la date et l'heure de début et de fin de l'opération de pêche. + Pour les engins dormants, le début de l'opération de pêche correspond au + début de mise à l'eau des engins, la fin de pêche correspond au début du + virage. + </dd> + <dt>Trait rectiligne</dt> + <dd> + cocher cette case si le trait est rectiligne. Ce champ est inutile pour + les engins dormants. + </dd> + <dt>Distance chalutée</dt> + <dd> + si le trait est rectiligne, la distance sera calculée automatiquement à + partir des positions. Dans le cas contraire, le champ sera renseigné + manuellement. Ce champ est inutile pour les engins dormants. L'unité de + ce champ est le métre, la valeur traduite en milles marin en laissant + le curseur sur le champ.  </dd> + <dt>Durée</dt> + <dd> + champ calculé automatiquement à partir des valeurs Date et Heure Début + Fin. + </dd> + <dt>Trait valide / invalide</dt> + <dd> + cocher la case en fonction de la validité de l'opération de pêche. + </dd> + <dt>Saisisseur(s)</dt> + <dd> + basculer dans la colonne de droite la(les) personne(s) qui (a)ont saisi + les + données du trait. + </dd> + <dt>Autres caractéristiques Navire</dt> + <dd> + pour rappel du navire de la campagne. + </dd> + <dt>Autres caractéristiques Engin</dt> + <dd> + si plusieurs engins ont été renseignés au niveau de la campagne, + préciser + l'engin utilisé pour le trait. Si un seul engin a été renseigné dans la + campagne, ce champ est auto-renseigné. + </dd> + <dt>Autres caractéristiques Navire(s) associé(s)</dt> + <dd> + fonctionne sur le principe de la double liste. Basculer sur la liste de + droite le(s) navire(s) associé(s) au navire principale au cours du + trait. Un filtre permet de limiter la liste des possibles aux navires + scientifiques, ou professionnels. Le filtre "Associés" permet de + limiter la liste aux navires déjà associés sur les autres traits de la + campagne. + </dd> +</dl> + +<h3>Description des actions<a name="traitActions"></a></h3> +<dl> + <dt>Réinitialiser</dt> + <dd> + si des valeurs ont été modifiées et avant enregistrement, permet de + revenir aux valeurs initiales. + </dd> + <dt>Enregistrer</dt> + <dd>enregistre les modifications faites dans les différents champs.</dd> +</dl> + +<p> + Pour quitter cet écran, utiliser le menu <strong>Actions</strong>. +</p> + +<h2>Trait / Mise en œuvre de l'engin<a name="traitMiseEnOuvreEngin"></a></h2> + +<p> + Sur cet écran, on peut renseigner les valeurs des caractéristiques liées à + la mise en œuvre de l'engin. +</p> + +<h3>Description des champs<a name="miseEnOuvreEnginFields"></a></h3> +<dl> + <dt>Caractéristique + </dt> + <dd> + description de la caractéristique à renseigner. + <br> + Pour ajouter une ligne au tableau, rechercher dans le champ situé au + dessus une caractéristique dans le référentiel. Ajouter la + caractéristique + en cliquant sur [+]. + <br> + Pour supprimer une caractéristique du tableau, clic droit sur la + ligne [supprimer]. + </dd> + <dt>Valeur</dt> + <dd> + valeur de la caractéristique de la ligne. Saisir la valeur au clavier + ou choisir une des valeurs proposées par la liste déroulante. + </dd> +</dl> + +<h3>Description des actions<a name="miseEnOuvreEnginActions"></a></h3> +<dl> + <dt>Réinitialiser</dt> + <dd> + si des valeurs ont été modifiées et avant enregistrement, permet de + revenir aux valeurs initiales. + </dd> + <dt>Enregistrer</dt> + <dd>enregistre les modifications faites dans les différents champs.</dd> +</dl> + +<h2>Trait / Autres paramètres<a name="traitAutreParametres"></a></h2> + +<p> + Sur cet écran, on peut renseigner les valeurs des autres caractéristiques + liées au trait. +</p> + +<p> + Le fonctionnement de cet écran est similaire à l'onglet Trait/Mise en + œuvre de l'engin. S'y référer pour les fonctionnalités. +</p> + +<h3>Description des champs<a name="autreParametresFields"></a></h3> +Identiques aux champs de l'écran <a href="#miseEnOuvreEnginFields">Mise en œuvre + des engins</a> + +<h3>Description des actions<a name="autreParametresActions"></a></h3> +Identiques aux actions de l'écran <a href="#miseEnOuvreEnginActions">Mise en + œuvre des engins</a> + +<h2>Captures / Résumé<a name="captureResume"></a></h2> + +<p> + Sur cet écran, on peut saisir certaines valeurs de poids observées + et/ou avoir, après élévation des poids, un résumé des poids composant + la capture. +</p> + +<h3>Description des champs<a name="captureResumeFields"></a></h3> + +<h4>Capture</h4>pré +requis : le poids des macro-déchets et des captures accidentelles ne +sont pas inclus dans la capture. Attention à bien supprimer ces deux +fractions des poids de la capture si vous renseignez manuellement le +poids total capture ou le poids non trié de la capture. +<dl> + <dt>Poids TOTAL </dt> + <dd> + poids total VRAC + Poids total HORS VRAC + Poids total NON TRIE + </dd> + <dt>Poids total VRAC</dt> + <dd> + poids total VRAC de l'onglet Espèces + Poids total VRAC de l'onglet + Benthos + </dd> + <dt>Carrousel observé</dt> + <dd> + sur la Thalassa, poids total des lots triés. + </dd> + <dt>Trémie</dt> + <dd> + sur la Thalassa, poids total de la capture sans le HORS VRAC. + </dd> + <dt>Poids total HORS VRAC</dt> + <dd> + poids total des lots HORS VRAC Espèces et Benthos. Le plus souvent + se + sont des individus rares et/ou de grande taille qui sont extraits + directement de la capture pour être observés. Dans le cas où seul + un échantillon de la capture est trié, ceci permet de ne pas appliquer + le coefficient d'élévation à ces individus et/ou de bien les observer. + </dd> + <dt>Poids total NON TRIE</dt> + <dd> + poids de la capture qui n'a pas été triée. + </dd> +</dl> + +<h4>Espèces</h4> +<dl> + <dt>Poids TOTAL</dt> + <dd> + Poids total VRAC Espèces + Poids total HORS VRAC Espèces.<br><span + style="font-weight: bold;">ATTENTION</span> + : si la valeur du Poids total NON TRIE est non nulle, la valeur + calculée dans ce champ n'a aucune signification car l'application va + sommer un VRAC qui doit être élevé avec un HORS VRAC qui n'est par + définition pas élevé. Cette anomalie de la 3.0 sera corrigée dans une + version + ultérieure. + </dd> + <dt>Poids total VRAC</dt> + <dd> + le plus souvent, ce poids sera similaire au poids VRAC trié Espèces et + sera donc calculé. Cependant, si seule une fraction des espèces est + observée, renseigner ici le poids d'élévation. + </dd> + <dt>Poids VRAC trié</dt> + <dd> + somme des poids VRAC observés. + </dd> + <dt>Poids total HORS VRAC</dt> + <dd> + somme des poids HORS VRAC observés. + </dd> +</dl> +<h4>Benthos</h4> +<dl> + <dt>Poids TOTAL</dt> + <dd> + Poids total VRAC Benthos + Poids total HORS VRAC Benthos.<br><span + style="font-weight: bold;">ATTENTION</span> : si la valeur du + Poids total NON TRIE est non nulle, la valeur calculée dans ce champ + n'a aucune signification car l'application va sommer un vrac qui doit + être élevé avec un hrs vrac qui n'est par définition pas élevé. Cette + anomalie sera corrigée dans une version ultérieure. + </dd> + <dt>Poids total VRAC</dt> + <dd> + le plus souvent, ce poids sera similaire au poids VRAC trié Benthos et + sera donc calculé. Cependant, si seule une fraction des Benthos est + observée, renseigner ici le poids d'élévation. + </dd> + <dt>Poids VRAC trié</dt> + <dd> + somme des poids vrac observés. + </dd> + <dt>Poids total HORS VRAC</dt> + <dd> + somme des poids hors vrac observés. + </dd> +</dl> +<h4>Macro déchets</h4> +<dl> + <dt>Poids TOTAL</dt> + <dd> + poids total de la fraction macro déchets dans la capture. + Attention, ce poids ne participe pas, au final, au poids total de la + capture. + </dd> +</dl> + +<p> + Pour information : le poids des individus saisis dans l'onglet Captures + accidentelles ne participe pas au poids total de la capture. +</p> + +<h3>Description des actions<a name="captureResumeActions"></a></h3> +<dl> + <dt>Résumé PDF</dt> + <dd> + déclenche la génération d'un fichier pdf qui contient la composition de + la capture du trait par espèce. Les poids sont élevés à l'échelle de la + capture. + </dd> + <dt>Résumé sumatra</dt> + <dd> + déclenche la + génération d'un fichier .csv qui contient la composition de la capture + du trait par espèce et benthos. les poids et nombre sont élevés à + l'échelle de la capture. Le format du fichier est compatible avec le + logiciel SUMATRA + </dd> + <dt>Piéces jointes (icone trombone)</dt> + <dd>permet d'associer des pièces jointes au trait. Contiendra aussi les + fichiers en cas d'import pupitri dans l'onglet espèces + </dd> + <dt>Réinitialiser</dt> + <dd> + si des valeurs ont été modifiées, et avant enregistrement, permet de + revenir aux valeurs initiales. + </dd> + <dt>Enregistrer</dt> + <dd> + s'active dès qu'un champ est modifié et permet d'enregistrer les + modifications. + </dd> + <dt>Supprimer les poids</dt> + <dd> + déclenche un processus de suppression des poids superflus saisis dans + les fractions espèces et benthos. Par exemple un poids sous-échantillon + équivalent au poids du père. + </dd> + <dt>Élever les poids</dt> + <dd> + déclenche le processus d’élévation des poids et complète tous les + champs calculés (écriture en bleu italique. Couleur bleue définie + dans la configuration). Si l'application ne peut calculer tous les + poids, cela déclenche un message d'erreur. + </dd> +</dl> + +<h2>Captures / Espèces<a name="captureEspeces"></a></h2> + +<p> + Sur cet écran, on peut saisir toute la composition du trait échantillonné + sur la fraction « espèces ». +</p> + +<h3>Description des champs<a name="captureEspecesFields"></a></h3> +<dl> + <dt>Poids TOTAL</dt> + <dd> + poids total VRAC Espèces + Poids total HORS VRAC Espèces. + </dd> + <dt>Poids total VRAC</dt> + <dd> + le plus souvent, ce poids sera similaire au poids VRAC trié Espèces et + sera donc calculé. Cependant, si seule une fraction des espèces est + observée, renseigner ici le poids d'élévation. + </dd> + <dt> + Poids VRAC trié + </dt> + <dd> + somme des poids vrac observés. + </dd> + <dt>Poids total HORS VRAC</dt> + <dd> + somme des poids hors vrac observés. + </dd> + <dt>Poids inerte trié</dt> + <dd> + dans la fraction triée, correspond au poids de la vase, des cailloux, + débris coquillers, etc. + </dd> + <dt>Poids vivant non détaillé trié</dt> + <dd> + dans la fraction triée, correspond au poids des espèces vivantes autres + que celles détaillées dans le tableau. Exemple : algues. + </dd> + <dt>Filtre / Aucun</dt> + <dd> + dans le tableau, tous les lots parents et feuilles sont affichés. + </dd> + <dt>Filtre Feuilles</dt> + <dd> + dans le tableau, seuls les lots feuilles sont affichés, c'est à dire les + lignes avec des mensurations ou des nombres. + </dd> + <dt>Filtre Parent</dt> + <dd> + dans le tableau,seuls les lots pères sont affichés. Entre parenthèses, + l'applicatif propose le nombre de lignes « parents » dans le + tableau. + </dd> + <dt>Espèce</dt> + <dd> + « Code campagne ou Code Rubin – nom scientifique » du lot + </dd> + <dt>V/HV</dt> + <dd> + précise si le lot se rattache à du Vrac ou à du Hors Vrac et contient le + poids du lot. Le poids peut être saisi ou calculé. + </dd> + <dt>...</dt> + + <dt style="font-style: italic;">Autres catégories de tri définies dans le + menu "Administration/Configurer les catégorisations" + </dt> + <dd>En + fonction de la configuration définie dans le + menu "Administration/Configurer les catégorisations", d'autres + colonnes permettront de catégoriser les lots.  </dd> + <dt>...</dt> + <dt>Poids sous-échantillon</dt> + <dd> + permet de saisir le poids de l'échantillon qui a été dénombré ou mesuré + dans le cas où seule une fraction des individus du lot père (a)ont été + observée(s). + </dd> + <dt>[Tailles/Poids ou Nombre]</dt> + <dd> + cliquer sur l’icône « tableau » pour accéder à l'écran de + saisie du + nombre d'individus dans le lot ou les mensurations/poids (nombre + d'individus et poids par classe de taille). Voir Capture / Espèces / + Mensurations-poids ou nombre pour le détail de l'écran de saisie. + </dd> + <dt>Commentaire</dt> + <dd> + permet d'ajouter un commentaire à la ligne. Un champ commentaire non + vide se traduit par un arrière plan vert dans le tableau. Fermer l'écran + de saisie en cliquant sur la croix rouge. + </dd> + <dt>Pièces jointes</dt> + <dd> + permet d'associer des fichiers à la ligne. Peut être utile, par exemple, + en cas de doute sur la détermination de l'espèce pour associer une photo + d'individu. + </dd> + <dt>A Confirmer</dt> + <dd> + cocher cette case dans le cas où un doute sur la détermination de + l'espèce persiste. La ligne apparaît alors en orange (couleur modifiable + dans la configuration). + </dd> +</dl> + +<h3>Description des actions<a name="captureEspecesActions"></a></h3> +<dl> + <dt>Créer un lot pour une espèce</dt> + <dd> + permet de créer un lot père dans le tableau. + <br> + Voir <a href="#captureEspecesCreeLot">Captures / Espèces / Créer un lot + espèce</a> pour le détail de l'écran de saisie. + </dd> + <dt>Clic droit sur un lot espèce + [Catégoriser le lot]</dt> + <dd> + permet de catégoriser le lot en fonction des critères listés dans la + configuration (exemple : Sexe). + </dd> + <dt>Clic droit sur un lot espèce + [Modifier la catégorie]</dt> + <dd> + sur la ligne sélectionnée, pointer la catégorisation que vous voulez + modifier (exemple modifer Vrac en Hors Vrac), clic droit + Modifier la + catégorie vous permet de choisir dans la lsite déroulante la nouvelle + valeur que vous souhaitez appliquer au lot. + </dd> + <dt>Clic droit sur un lot espèce + [Ajouter une catégorie]</dt> + <dd> + + sur la ligne sélectionnée, pointer la catégorisation que vous souhaiter + enrichir avec un autre lot (exemple : ajouter un lot male au même niveau + qu'un lot femelle déjà créé), clic droit + [Ajouter une catégorie]. + L'application ouvre l'écran de création des lots. Choisir la(les) + catégorie(s) à ajouter, compléter éventuellement les poids et + Enregistrer. + </dd> + <dt>Clic droit sur un lot espèce + [Supprimer le lot]</dt> + <dd> + supprimer le lot sélectionné et tous ses fils. + </dd> + <dt>Clic droit sur un lot espèce + [Supprimer les lots fils]</dt> + <dd> + supprime les lots fils sans supprimer le lot père. + </dd> + <dt>Clic droit sur un lot espèce + [Corriger l'espèce]</dt> + <dd> + Permet de modifier le nom de l'espèce du lot sélectionné et de ses lots + fils. + </dd> + <dt>Clic droit sur un lot espèce + [Espèce d'un MELAG (mélange)]</dt> + <dd> + Dans le cas du tri d'un mélange d'espèce(s), permet d'élever les poids + triés de l'échantillon au niveau du poids total trié. + <br> + Voir <a href="faq.html#melag">Foire Aux Questions / Gestion de la saisie + d'un mélange d'espèces</a> pour le détail de cette fonctionnalité. + </dd> + <dt>Clic droit sur un lot espèce + [Mensurations]</dt> + <dd> + Ouvre l'écran de saisie des nombres/mensurations sur le lot. + <br> + Voir <a href="#captureEspcesMensuration">Capture / Espèces / + Mensurations-poids ou nombre</a> pour le détail de l'écran de saisie. + </dd> + <dt>Import pupitri</dt> + <dd> + sur la Thalassa, il est possible d'importer les fichiers (.car et .tnk) + générés par Pupitri à l'issue du tri de la capture. A l'invitation, + sélectionner les fichiers .car et .tnk et valider. L'applicatif + importera dans l'onglet « Espèces » la liste des espèces + triées et les + poids associés. L'onglet « Résumé » sera complété par les + informations + de poids carrousel, poids trémie et Poids total NON TRIE (ligne VNT dans + le fichier .tnk). L'import ne sera effectif que si le code station des + fichiers correspond au code station du trait. Les espèces non présentent + dans le référentiel ne seront pas importées dans l'onglet « Espèces » + (cf cas particulier du tri d'un mélange). Les deux fichiers importés + sont sauvegardés comme pièce jointe dans l'onglet « Résumé ». + </dd> + <dt>Importer des lots d'espèces</dt> + <dd> + En mode "saisie multi-postes", permet d'importer une saisie des espèces + réalisée sur un autre poste. Le fichier à importer est celui généré + par l'option "Exporter les lots d'espèces". + </dd> + <dt>Exporter les lots d'espèces</dt> + <dd> + En mode "saisie multi-postes", permet d'exporter une saisie des espèces + réalisée vers un autre poste. Le fichier généré est un fichier + système non lisible. + </dd> + <dt>Réinitialiser</dt> + <dd> + si des valeurs ont été modifiées, et avant enregistrement, permet de + revenir aux valeurs initiales. + </dd> + <dt>Enregistrer</dt> + <dd> + s'active dès qu'un champ est modifié et permet d'enregistrer les + modifications. + </dd> + <dt>Supprimer les poids</dt> + <dd> déclenche un processus de suppression + des poids superflus saisis dans les fractions espèces et benthos. Par + exemple un poids sous-échantillon équivalent au poids du père. + </dd> + <dt>Élever les poids</dt> + <dd> + déclenche le processus d’élévation des poids et complète tous les champs + calculés (écriture en bleu italique. Couleur bleue définie dans la + configuration). Si l'application ne peut calculer tous les poids cela + déclenche un message d'erreur. + </dd> +</dl> + +<p> + La touche Menu du clavier (le plus souvent en bas à droite entre Alt Gr et + Ctrl) déclenche le même comportement que le clic droit de la sourie.</p> + +<p>Dans + les colonnes de catégorisation des lots, la catégorie est séparée de + son poids par un slash "/". Quand la somme des poids des lots fils est + strictement inférieure au poids du lot père (ie un échantillon du lot + père a été réalisé), alors l'application utilisera un double slash "//" + pour séparer la catégorie du poids. Cet élément visuel permet de + rapidement identifier les étapes d'échantillonnages. +</p> + +<h2>Captures / Espèces / Créér un lot espèce<a name="captureEspecesCreeLot"></a> +</h2> + +<p> + Sur cet écran, on peut créer un nouveau lot espèce dans le tableau et une + catégorisation. +</p> + +<h3>Description des champs<a name="captureEspecesCreeLotFields"></a></h3> +<dl> + <dt>Espèce du lot + </dt> + <dd> + Code campagne – Nom scientifique du lot à créer. La liste déroulante + pointe sur les espèces du protocole. Si l'espèce n'est pas listée (donc + est hors protocole), utiliser la liste élargie disponible derrière le + bouton […] en face du champ. L'ordre du tri de cette liste déroulante + peut être modifié via l'icône situé à droite de la liste. + </dd> + <dt>Poids du lot</dt> + <dd> + renseigner le poids du lot. Valeur non obligatoire, peut être renseignée + plus tard dans le tableau ou cette valeur sera calculée automatiquement + par l'application. + </dd> + <dt>Nombre</dt> + <dd> + renseigner le nombre d'individus dans le lot. Valeur non obligatoire, + peut être renseignée + plus tard dans le tableau. + </dd> + <dt>V / HV</dt> + <dd> + le lot est-il associé à du Vrac ou du Hors Vrac ? (Voir <a + href="faq.html#vrac_definition">définitions dans le chapitre Foire + aux questions</a>) L'ordre du tri de cette liste déroulante peut + être modifié via l'icone situé à droite de la liste. + </dd> +</dl> +Les +autres champs s'affichent après avoir renseigné le champ "Espèce du +lot" que si dans la configuration de l'application (menu +Administration/Configurer les catégorisations) il y a au moins une +catégorisation de listée.<br> +<dl> + <dt>Catégorie</dt> + <dd> renseigner la + catégorisation du lot souhaitée. Par défaut la valeur est renseignée + avec la première catégorisation prévue dans le protocole pour l'espèce + en cours de création. + </dd> + <dt>Poids du lot catégorisé</dt> + <dd>champ calculé qui contient la somme des poids des lots catégorie saisies + dans le tableau en dessous + </dd> + <dt>Sélection / Catégorie / Poids</dt> + <dd>permet de sélectionner les lot catégorie à créer. Les poids de ces lots + peuvent être aussi renseignés à ce stade. + </dd> +</dl> + +<h3>Description des actions<a name="captureEspecesCreeLotActions"></a></h3> +<dl> + <dt>Annuler</dt> + <dd> + ferme l'écran de saisie sans enregistrer d'éventuelles modifications + dans les champs. + </dd> + <dt>Créer</dt> + <dd> + permet d'enregistrer les modifications et réinitialise tous les champs + pour pouvoir créer un nouveau lot. + </dd> + <dt>Créer et Fermer</dt> + <dd> + permet d'enregistrer les modifications et ferme l'écran pour revenir au + tableau. + </dd> +</dl> + +<h2>Captures / Espèces / Mensurations-poids ou nombre<a + name="captureEspcesMensuration"></a></h2> + +<p> + Sur cet écran, on peut saisir le nombre d'individus dans le lot observé. Le + nombre est soit global soit détaillé par classe de tailles. Lors de la + saisie d'un nombre par classe de taille, le poids des individus de chaque + classe de tailles peut être saisi. +</p> + +<h3>Description des champs<a name="captureEspecesMensurationFields"></a></h3> +<dl> + <dt>Fil d'ariane (exemple Trait 106 - 106 - 1 - 26/10/2010 - [LOLIVUL - + Loligo vulgaris] - Vrac - Mensuration) + </dt> + <dd>rappel du contexte de la saisie en cours avec l'identifiant du trait, de + l'espèce et des catégorisations. + </dd> + <dt>Mode simple</dt> + <dd>option de saisie des mensurations qui permet une saisie libre dans la + tableau. + </dd> + <dt>Génération de classe</dt> + <dd> + permet de définir la classe de taille minimale et maximale afin + d'initialiser les lignes du tableau. Le pas des classes est déterminé + par le champ « Pas de classe de taille ». + <dl> + <dt>Classe min</dt> + <dd>valeur de la plus petite classe de tailles observée.</dd> + <dt>Classe max</dt> + <dd>valeur de la plus grande classe de tailles observée.</dd> + </dl> + </dd> + <dt>Mode « rafale »</dt> + <dd> + permet la saisie des mensurations à la volée, c'est à dire les tailles + de chaque individu. Le tableau est auto-complété avec les tailles + saisies. + </dd> + <dt>Classe de tailles à incrémenter</dt> + <dd> + saisir la taille de chaque individu mesuré. Valider la saisie entre + chaque individu. + </dd> + <dt>Mode simple dénombrement</dt> + <dd> + permet de saisir uniquement le nombre total d'individus dans le lot + (sans mensurations). + </dd> + <dt>Type de mesure</dt> + <dd> + méthode de mensuration des individus. Ce champ est auto-complété à + partir du protocole. Quand il est vide, c'est que l'espèce n'est pas + listée dans le protocole ou que le protocole ne prévoit pas de + mensurations sur cette espèce. Le champ peut être renseigné avec une des + méthodes de mensuration prévue dans le protocole (Cf Sous onglet Classe + de taille...). + </dd> + <dt>Pas de classe de taille</dt> + <dd> + pas de mesure. Exemple 1 cm, 0,5 cm, 5 cm, 1 mm (l'unité est donnée par + le champ « Type de mesure »). Le champ est auto-complété à + partir du + champ « Type de mesure » quand il est renseigné dans le + protocole, sinon + pré-rempli à 1. Sa valeur est modifiable. + </dd> + <dt>Nombre total</dt> + <dd>somme des nombres saisis dans le tableau. Ce champ ne peut être édité. + </dd> + <dt>Poids total</dt> + <dd> + somme des poids observés renseignés dans le tableau . Ce champ ne peut + être édité. + </dd> + <dt>Nombre</dt> + <dd> + en mode « simple dénombrement », permet de saisir le nombre + d'individus + composant le lot observé. + </dd> + <dt>Classe de taille</dt> + <dd> + contient la valeur de la classe de taille. L'unité est définie par le + champ « Type de mesure » et le pas par le champ « Pas de + la classe de + taille » + </dd> + <dt>Nombre</dt> + <dd> + contient le nombre d'individus dans la classe de taille. Seules les + lignes avec un nombre > 0 seront enregistrées. + </dd> + <dt>Poids observé</dt> + <dd> + contient le poids des individus dans la classe de taille. Contrainte : + si un poids est saisi sur une ligne, toutes les lignes avec un nombre + > + 0 devront avoir un poids. + </dd> + <dt> + </dt> +</dl> + +<h3>Description des actions<a name="captureEspecesMensurationActions"></a></h3> +<dl> + <dt>Réinitialiser</dt> + <dd> + permet de vider toutes les valeurs du tableau Classe de taille / Nombre + / Poids observé. + </dd> + <dt>Annuler</dt> + <dd> + ferme l'écran de saisie sans enregistrer d'éventuelles modifications + dans les champs. + </dd> + <dt>Enregistrer et continuer</dt> + <dd> + permet d'enregistrer les modifications et affiche à l'écran les + informations du lot situé juste après dans le tableau + </dd> + <dt>Enregistrer et Fermer</dt> + <dd> + permet d'enregistrer les modifications et ferme l'écran. + </dd> +</dl> + +<h2>Captures / Benthos<a name="captureBenthos"></a></h2> + +<p> + Sur cet écran, on peut saisir toute la composition du trait échantillonné + sur la fraction « benthos ». +</p> + +<h3>Description des champs<a name="captureBenthosFields"></a></h3> + +<p> + Les champs sont identiques à l'écran Captures / Espèces. + <a href="#captureEspecesFields">S'y référer pour la description</a> +</p> + +<h3>Description des actions<a name="captureBenthosActions"></a></h3> + +<p> + Les actions sont identiques à l 'écran Captures / Espèces. + <a href="#captureEspecesActions">S'y référer pour la description.</a> +</p> + +<h2>Captures / Macro déchets<a name="captureMacroDechet"></a></h2> + +<p> + Sur cet écran, on peut saisir les différentes catégories de macro déchets + remontées sur le navire à l'issue de l'opération de pêche ainsi que le poids + total de cette fraction. +</p> + +<h3>Description des champs<a name="captureMacroDechetsFields"></a></h3> +<dl> + <dt>Poids total</dt> + <dd> + poids total des macro déchets dans la capture. Dès qu'une ligne existe + dans le tableau, ce champ doit être complété ou être calculable via les + poids saisis dans le tableau. + </dd> + <dt>Catégorie</dt> + <dd> + type de macro déchets observés. Ce champ pointe sur un référentiel. + </dd> + <dt>Catégorie de taille</dt> + <dd> + classe de tailles de la catégorie observée. Ce champ pointe sur un + référentiel. + </dd> + <dt>Nombre</dt> + <dd> + nombre d'objets observés pour le couple catégorie/Catégorie de tailles. + Cette valeur est obligatoire + </dd> + <dt>Poids</dt> + <dd> + poids des objets observés. Saisie non obligatoire. Contrainte : si + un + poids est saisi sur une ligne et que le champ Poids total est non + renseigné, alors tous les poids devront être renseignés afin de + permettre le calcul du poids total. + </dd> + <dt>Commentaire</dt> + <dd> + commentaire associé à chaque ligne. + </dd> + <dt>Pièce jointe</dt> + <dd> + permet d'associer des fichiers à chaque ligne. + </dd> +</dl> + +<h3>Description des actions<a name="captureMacroDechetsActions"></a></h3> +<dl> + <dt>Créer un lot de déchet</dt> + <dd> + ouvre l'écran d'ajout d'une ligne au tableau des macro déchets.<br>L'écran + permet la saisie des champs Catégorie de déchets, Catégorie de taille, + Nombre et Poids. + </dd> + <dt></dt> + <dt>Description des actions</dt> + <dt>Annuler</dt> + <dd> + ferme l'écran de saisie sans enregistrer d'éventuelles modifications + dans les champs. + </dd> + <dt>Créer</dt> + <dd> + permet d'enregistrer les modifications et réinitialise les champs pour + pouvoir saisir un nouveau lot. + </dd> + <dt>Créer et Fermer</dt> + <dd> + permet d'enregistrer les modifications et ferme l'écran pour revenir au + tableau. + </dd> + <dt>Importer des lots de déchets</dt> + <dd> En mode "saisie multi-postes", + permet d'importer une saisie des macro-déchets réalisée sur un autre + poste. + Le fichier à importer est celui généré par l'option "Exporter les lots + de déchets". + </dd> + <dt>Exporter les lots de déchets</dt> + <dd> + En mode "saisie multi-postes", permet d'exporter une saisie de + macro-déchets réalisée vers un autre poste. Le fichier généré est + un fichier système non lisible. + </dd> + <dd><br>  </dd> +</dl> + +<h2>Captures / Observations individuelles<a + name="captureDonnesIndividuelles"></a></h2> + +<p> + Sur cet écran on peut saisir les observations réalisées sur les individus. + Une ligne du tableau = un individu. +</p> + +<h3>Description des champs<a name="captureObservationsIndividuellesFields"></a> +</h3> +<dl> + <dt>Espèce</dt> + <dd> + « Code campagne ou Code Rubin – nom scientifique » de + l'individu. + </dd> + <dt>Poids</dt> + <dd> + poids de l'individu. + </dd> + <dt>Taille</dt> + <dd> + valeur de la taille de l'individu. L'unité et la méthode sont décrits + dans la colonne « Classe de taille ». + </dd> + <dt>Classe de taille</dt> + <dd> + méthode de mensuration de l'individu et unité de mesure associée. + </dd> + <dt>...</dt> + <dd>D'autres + colonnes complètent le tableau en fonction de la liste des + caractéristiques définies dans le protocole, onglet "Caractéristiques", + sous onglet "Observations individuelles" + </dd> + <dt>...</dt> +</dl> +<dl> + <dt>[Autres caractéristiques]</dt> + <dd> + permet d'ouvrir l'écran de saisie des autres caractéristiques observées + sur l'individu. + <br> + Voir <a href="#captureDonnesIndividuellesAutresCaracteristiques">Captures + / Observations individuelles / Autre Caractéristiques</a> pour le détail + de l'écran de saisie. + </dd> + <dt>Commentaire</dt> + <dd> + commentaire associé à chaque ligne. + </dd> + <dt>Pièce jointe</dt> + <dd> + permet d'associer des fichiers à chaque ligne. + </dd> +</dl> + +<h3>Description des actions<a + name="captureObservationsIndividuellesActions"></a></h3> +<dl> + <dt>Créer une observation</dt> + <dd> + permet d'ajouter une ligne au tableau. Les champs renseignés sont alors + remontés dans le tableau. + </dd> + <dt>Réinitialiser</dt> + <dd> + si des valeurs ont été modifiées, et avant enregistrement, permet de + revenir aux valeurs initiales. + </dd> + <dt>Enregistrer</dt> + <dd> + s'active dès qu'un champ est modifié et permet d'enregistrer les + modifications. + </dd> +</dl> +<h2>Captures / Observations individuelles / Créer une observation</h2> + +<h3>Description des champs +</h3> +<dl> + <dt>Espèce</dt> + <dd> + permet de saisir le nom de l'espèce. La liste déroulante est limité aux + espèces saisies dans l'onglet "Espèces". Si l'onglet "Espèces" n'est + pas renseigné, la liste est limitée aux espèces du protocole, sinon la + liste propose les espèces du référentiel. Dans tous les cas le + bouton [...] permet d'ouvrir la liste des espèces du + référentiel.<br><br><span style="font-weight: bold;">Case à cocher "Créer les données depuis les captures"</span><br>Après + avoir sélectionné l'espèce dans le champ du dessus, permet d'intialiser + le tableau des observations individuelles avec les informations + saisies dans le tableau "Espèces". C'est utile quand par exemple un + seul individu a déjà été pesé et mesuré dans le contexte "Espèces", + cela permet de recopier les informations poids et taille de cet + individu. Dans le cas ou le lot "Espèces" contient, par exemple, 3 + individus femelles, l'application va créer 3 lignes espèce/femelle. + </dd> + <dt>Poids</dt> + <dd>saisir la valeur du poids de l'individu.</dd> + <dt>taille</dt> + <dd>saisir la valeur de la taille de l'individu.</dd> + <dt>Classe de taille</dt> + <dd>saisir + la méthode de mensuration de l'individu. Ce champ est auto renseigné + avec les informations du protocole. Ainsi, si le protocole associe une + méthode de mensuration pour l'espèce en cours de siaise, le champ sera + initialisé avec cette méthode. + </dd> + <dt>...</dt> + <dd>le + formulaire de saisie peut être complété par d'autres caractéristiques. + Ces champs sont définis dans le protocole, onglet + "Carctéristiques", sous onglet "Observations individuelles" + </dd> + <dt>...</dt> +</dl> + +<h3>Description des actions +</h3> +<dl> + <dt>Annuler</dt> + <dd> + ferme l'écran de saisie sans enregistrer d'éventuelles modifications + dans les champs. + </dd> + <dt>Créer</dt> + <dd> + permet d'enregistrer les modifications et réinitialise les champs pour + pouvoir saisir un nouveau lot. + </dd> + <dt>Créer et Fermer</dt> + <dd> + permet d'enregistrer les modifications et ferme l'écran pour revenir au + tableau. + </dd> +</dl> + +<h2>Captures / Observations individuelles / Autre Caractéristiques<a + name="captureDonnesIndividuellesAutresCaracteristiques"></a></h2> + +<h3>Description des champs<a + name="captureObservationsIndividuellesAutresCaracteristiquesFields"></a> +</h3> +<dl> + <dt>Caractéristique</dt> + <dd> + sélectionner dans la liste déroulante la caractéristique observée. + Cliquer sur [+] pour l'ajouter au tableau. + </dd> + <dt>Valeur</dt> + <dd> + contient la valeur de la caractéristique. + </dd> + +</dl> + +<h3>Description des actions<a + name="captureObservationsIndividuellesAutresCaracteristiquesActions"></a> +</h3> +<dl> + <dt>Annuler</dt> + <dd> + ferme l'écran de saisie sans enregistrer d'éventuelles modifications + dans les champs. + </dd> + <dt>Enregistrer</dt> + <dd> + permet d'enregistrer les modifications et ferme l'écran. + </dd> +</dl> + +<h2>Captures / Captures accidentelles<a name="captureCapturesAccidentelles"></a> +</h2> + +<p> + Sur cet écran, on peut saisir les informations relevées sur des individus + capturés accidentellement. Par exemple, un dauphin. +</p> + +<h3>Description des champs<a name="captureCapturesAccidentellesFields"></a></h3> +<dl> + <dt>Espèce</dt> + <dd> + « Code campagne ou Code Rubin – nom scientifique » de + l'individu + </dd> + <dt>Sexe</dt> + <dd> + sexe de l'individu. + </dd> + <dt>Poids Observé</dt> + <dd> + poids de l'individu. + </dd> + <dt>Taille</dt> + <dd> + valeur de la taille de l'individu. L'unité et la méthode sont décrits + dans la colonne « Classe de taille ». + </dd> + <dt>Classe de taille</dt> + <dd> + méthode de mensuration de l'individu et unité de mesure associée. + </dd> + <dt>Mort ou vivant</dt> + <dd> + précise dans quel état l'individu a été remis à la mer. + </dd> + <dt>Autres caractéristiques</dt> + <dd> + permet d'ouvrir l'écran de saisie des autres caractéristiques + observées sur l'individu. + </dd> + <dt>Commentaire</dt> + <dd> + commentaire associé à chaque ligne. Exemple : Préciser si le poids + est + estimé. + </dd> + <dt>Pièce jointe</dt> + <dd> + permet d'associer des fichiers à chaque ligne. + </dd> +</dl> +<h4></h4> + +<h3>Description des actions<a name="captureCapturesAccidentellesActions"></a> +</h3> +<dl> + <dt>Créer une capture accidentelle</dt> + <dd> + permet d'ajouter une ligne au tableau. Les champs renseignés sont + alors remontés dans le tableau. + </dd> + <dt>Réinitialiser</dt> + <dd> + si des valeurs ont été modifiées, et avant enregistrement, permet de + revenir aux valeurs initiales. + </dd> + <dt>Enregistrer</dt> + <dd> + s'active dès qu'un champ est modifié et permet d'enregistrer les + modifications. + </dd> + <dt>Importer des captures accidentelles</dt> + <dd> En mode "saisie multi-postes", + permet d'importer une saisie de captures accidentelles réalisée sur un + autre poste. + Le fichier à importer est celui généré par l'option "Exporter les + captures accidentelles". + </dd> + <dt>Exporter les captures accidentelles</dt> + <dd> + En mode "saisie multi-postes", permet d'exporter une saisie de captures + acidentelles réalisée vers un autre poste. Le fichier généré est + un fichier système non lisible. + </dd> +</dl> + +</div> </body> </html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de macro-déchêts</title> -</head> -<body> - -<h1>Éditer une capture de macro-déchêts</h1> - -<p>Sur cette écran on peut éditer une capture de macro-déchêts...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de plancton</title> -</head> -<body> - -<h1>Éditer une capture de plancton</h1> - -<p>Sur cette écran on peut éditer une capture de plancton...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/editProgram.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editProgram.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editProgram.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -27,28 +27,51 @@ <head> <meta charset="utf-8"/> <title>Tutti - Éditer une série de campagne</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> <body> -<h1>Éditer une série de campagne</h1> +<script type="text/javascript" src="../js/navbar.js"></script> -<p>Sur cette écran on peut éditer une campagne...</p> +<div class="container"> + <div class="page-header"> + <h1>Éditer une série de campagne</h1> + <strong>TRANSLATE ME!</strong> + </div> -<strong>Documentation à rédiger</strong> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Zone</li> - <li>Commentaire</li> -</ul> + <p>Sur cet écran on peut saisir et modifier les informations relatives à la + série de campagne.</p> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : + <h2>Description des champs<a name="fields"></a></h2> + <dl> + <dt>Nom</dt> + <dd>contient le nom de la série de campagne (exemple EVHOE). Sa valeur + est unique dans la base. + </dd> + <dt>Zone</dt> + <dd>contient le nom de la zone d'étude. Ce champ est lié au référentiel + des zones d'études des campagnes halieutiques. + </dd> + <dt>Description</dt> + <dd>ce champ libre mais obligatoire contient une description de la série + de campagne. + </dd> + </dl> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> + <h2>Description des actions<a name="actions"></a></h2> + <dl> + <dt>Enregister</dt> + <dd>permet d'enregistrer les modifications faites dans les différents + champs de l'écran. + </dd> + <dt>Fermer</dt> + <dd>permet de fermer l'écran.</dd> + </dl> + +</div> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/editProtocol.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editProtocol.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editProtocol.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,4 +1,6 @@ - -<!DOCTYPE html> -<html lang="fr"> + <meta charset="utf-8"> -<head> - <meta charset="utf-8"/> <title>Tutti - Éditer un protocole</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> <body> -<h1>Éditer un protocole</h1> +<script type="text/javascript" src="../js/navbar.js"></script> -<p>Sur cette écran on peut éditer un protocole...</p> +<div class="container"> +<div class="page-header"> + <h1>Éditer un protocole</h1> + <strong>TRANSLATE ME!</strong> +</div> -<strong>Documentation à rédiger</strong> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> +<p>Sur + cet écran on peut créer ou éditer un protocole. Le protocole associé à + une campagne permet d'initialiser les écrans de saisie afin, de + faciliter la saisie des données, d’accélérer la saisie et de limiter + les risques d'erreurs à la saisie.</p> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : +<h2>Onglet informations générales</h2> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> +<h3>Description des champs<a name="fields"></a></h3> +<dl> + <dt>Nom</dt> + <dd>nom du protocole. Sa valeur est unique dans la base</dd> + <dt>Commentaire</dt> + <dd>permet d'ajouter un commentaire libre sur le protocole</dd> +</dl> + +<h3>Description des actions<a name="actions"></a></h3> +<dl> + <dt>Fermer</dt> + <dd>permet de quitter l'écran d'édition du protocole</dd> + <dt>Enregistrer</dt> + <dd>permet d'enregistrer toutes les modifications du protocole</dd> +</dl> + +<h2>Onglet Caractéristiques</h2> + +<h3>Description des champs<a name="fieldsCaracteristics"></a></h3> +<dl> + <dt>Sous onglet Classes de taille</dt> + <dd> + Fonctionnement via le principe de la double liste. Basculer dans la + colonne de droite toutes les méthodes de mensuration qui pourront + être utilisées à la saisie. Le champ du dessus permet de faire une + recherche textuelle. Seules les méthodes listées dans ce champ + seront + disponibles dans l'onglet « Espèces » et « Benthos » + du protocole + ainsi que dans la phase de saisie des mensurations des lots et des + individus. Il est donc important d'être exhaustif dans la + constitution + de cette liste. Cependant, si en cours de saisie il apparaît qu'il + manque une référence, il est possible de revenir sur cet onglet pour + enrichir la liste. + </dd> + <dt>Sous onglet Mise en oeuvre de l'engin</dt> + <dd> + Fonctionnement via le principe de la double liste. Basculer dans la + colonne de droite toutes les caractéristiques qui décriront la mise + en + œuvre de l'engin. Le champ du dessus permet de faire une recherche + textuelle. Dans le cas où des engins ne seraient pas listés, il est + possible via le menu « Administration/Référentiels temporaires » + d'ajouter des engins. + </dd> + <dt>Sous onglet Observations individuelles</dt> + <dd> + Fonctionnement via le principe de la double liste. Basculer dans la + colonne de droite toutes les caractéristiques qui seront observées + sur + les individus conformément au protocole technique de la campagne. + Les colonnes + par défaut dans le tableau "Observations individuelles" sont Poids, + Taille et Classe de taille. Si en cours de saisie il venait à + manquer une caractéristique, elle peut être ajoutée en cours de + saisie + par modification du protocole ou sinon être saisie dans la colonne + du + tableau "Observations individuelles" dans la colonne "Autres + caractéristiques". + </dd> + <dt>Sous onglet Autres caractéristiques</dt> + <dd> + Fonctionnement via le principe de la double liste. Basculer dans la + colonne de droite toutes les caractéristiques qui décriront la mise + en œuvre du navire. Le champ du dessus permet de faire une recherche + textuelle. + </dd> +</dl> + +<h3>Description des actions<a name="actionsCaracteristics"></a></h3> +<dl> + <dt>Import les caractéristiques</dt> + <dd> + permet d'importer un fichier .csv (encodage UTF8, séparateur « ; ») + contenant les caractéristiques à lister dans la colonne de droite + (pour tous les sous onglets). + </dd> + <dt>Exporter les caractéristiques</dt> + <dd> + permet d'exporter un fichier .csv (encodage UTF8, séparateur « ; ») + contenant les caractéristiques listées dans la colonne de droite + (pour tous les sous onglets). + </dd> + <dt>Exporter toutes les caractéristiques</dt> + <dd> + permet d'exporter un fichier .csv (encodage UTF8, séparateur « ; ») + contenant les caractéristiques du référentiel. + </dd> +</dl> + +<h2>Onglet Espèces</h2> + +<p> + Cette écran permet de lister les espèces (hors benthos) couramment + observées et le type d'observations à réaliser sur les lots conformément + au protocole technique de la campagne. +</p> + +<h3>Description des champs<a name="fieldsSpecies"></a></h3> +<dl> + <dt>Espèce</dt> + <dd> + CODE RUBIN – nom scientifique de l'espèce observée. + Ce champ est renseigné à partir de la liste déroulante située en + haut du tableau. + Sélectionner une espèce et ajouter la valeur en cliquant sur + [<strong>+]</strong>. + Un clic droit sur le titre de la colonne permet de modifier l'ordre + Code Rubin - nom scientifique ou inversement. Un clic sur le titre + de + la colonne permet de déclencher un tri par ordre alphabétique. + </dd> + <dt>Code campagne</dt> + <dd> + code campagne de l'espèce utilisé au cours de la campagne. Un + clic + sur le titre de la colonne permet de déclencher un tri par ordre + alphabétique. + </dd> + <dt>Mode de mensuration</dt> + <dd> + si l'espèce est mesurée, renseigner la méthode de mensuration de + l'espèce. Les + valeurs possibles pour ce champ sont celles listées dans l'onglet + « Caractéristiques », sous onglet « Classes de taille ». + </dd> + <dt>Pesée</dt> + <dd> + case cochée si l'espèce doit être pesée. + </dd> + <dt>Dénombrement</dt> + <dd> + case cochée si le nombre d'individus pour l'espèce en question doit + être observé. + </dd> + <dt>...</dt> + <dd>D'autre colonnes peuvent apparaitre dans ce tableau en fonction de + la configuration définie dans le menu "Administration/Configurer les + catégorisations" + </dd> + <dt>...</dt> +</dl> +<dl> + <dt>Prélèvement de pièce calcifiées</dt> + <dd> + case cochée si, pour les observations individuelles, un prélèvement + de + pièces calcifiées est prévu au protocole. + </dd> +</dl> +Un +clic droit + [supprimer les espèces] sur une ligne (ou plusieurs par +sélections multiples) permet de supprimer une(des) ligne(s). <h3>Description + des actions<a name="actionsSpecies"></a></h3> +<dl> + <dt>Importer les espèces</dt> + <dd> + permet d'importer un fichier .csv (encodage UTF8, séparateur « ; ») + qui + complète (et écrase) toutes les informations du tableau. + </dd> + <dt>Exporter les espèces</dt> + <dd> + permet d'exporter un fichier .csv (encodage UTF8, séparateur « ; ») + qui + contient toutes les informations du tableau. + </dd> + <dt>Export Pupitri</dt> + <dd> + génère un fichier qui contient la liste des espèces du protocole + afin + de mettre à jour le référentiel des espèces de Pupitri (sur le + navire + océanographique Thalassa). + </dd> +</dl> + +<h2>Onglet Benthos</h2> + +<p> + Cette écran permet de lister les espèces couramment observées dans la + fraction benthos. Pour chaque espèce, on précise le type d'observations + à + réaliser sur les lots conformément au protocole technique de la + campagne. +</p> + +<p> + Le fonctionnement de cet écran est similaire à l'écran sur les espèces. + S'y référer pour les fonctionnalités. +</p> + +<h3>Description des champs<a name="fieldsBenthos"></a></h3> +<a href="#fieldsSpecies">Voir les champs des espèces</a>. + +<h3>Description des actions<a name="actionsBenthos"></a></h3> +<a href="#actionsSpecies">Voir les actions des espèces</a>. + +</div> </body> </html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editSampleCategory.html (from rev 1432, trunk/tutti-ui-swing/src/main/help/fr/editSampleCategory.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSampleCategory.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editSampleCategory.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,83 @@ +<!DOCTYPE html> +<html lang="fr"> +<head> + <meta charset="utf-8"> + + <title>Tutti - Configurer les catégories</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> + <div class="page-header"> + <h1>Configurer les catégories</h1> + <strong>TRANSLATE ME!</strong> + </div> + + + <p>Sur cet écran, on peut configurer les catégories à utiliser dans l'écran + Espèces / Benthos.</p> + + <p>L'accès + à cet écran est protégé par un mot de passe car cette configuration + modifie le format d'enregistrement des données en base. La non maîtrise + de cette configuration peu compléxifier le processus de transfert des + données d'une base à une autre.</p> + + <h2>Description des champs<a name="fields"></a></h2>Sélectionner + dans la liste déroulante du haut la caractéristique de tri des + lots observés et ajouter la au tableau en cliquant sur le [+] à droite de + l'écran.<br> + <dl> + <dt>Caractéristique</dt> + <dd>Caractéristique de tri qui sera ajoutée au tableau d'enregistrement + des Espèces et du Benthos. + </dd> + <dt>Label</dt> + <dd>Champ libre permettant de saisir l'intitulé de la colonne qui sera + ajoutée au tableau pour cette caractéristique. + </dd> + </dl> + + <h2>Description des actions<a name="actions"></a></h2> + <dl> + <dt>Fermer</dt> + <dd>ferme la fenêtre active.</dd> + <dt>Enregistrer</dt> + <dd>enregistre les modifications.</dd> + </dl> + Pour supprimer une ligne du tableau : sélectionner la ligne + clique droit + + [Supprimer]<br>Pour + réajuster l'ordre des lignes et donc l'ordre d'apparition des critères + de classement des lots dans les tableaux de saisie : clique droit sur + une ligne + [Monter] ou [Descendre]. +</div> +</body> +</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer les lots de poissons</title> -</head> -<body> - -<h1>Éditer les lots de poissons</h1> - -<p>Sur cette écran on peut éditer un lots de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer les mensurations d'un lot de poissons</title> -</head> -<body> - -<h1>Éditer les mensurations d'un lot de poissons</h1> - -<p>Sur cette écran on peut editer les mensurations d'un lot de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/faq.html (from rev 1432, trunk/tutti-ui-swing/src/main/help/fr/faq.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/faq.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/faq.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,347 @@ +<!DOCTYPE html> +<html lang="fr"> +<head> + <meta charset="utf-8"> + + <title>Tutti - Aide en ligne (Foire aux questions)</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> + + +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> +<div class="page-header"> + <h1>Foire aux questions</h1> + <strong>TRANSLATE ME!</strong> +</div> + + +<h2>Gestion de la saisie d'un mélange d'espèces<a name="melag"></a></h2> + +<p> + Dans le cas d'une capture abondante de plusieurs espèces dont les + individus sont morphologiquement proches (exemple : mélange de + Scomber scombrus et de Scomber colias), le responsable du tri peut + prendre la décision de ne pas trier ces espèces. Le mélange d'espèces + et mis en caisses qui sont pesées. Le tri en espèces scientifique se + fait dans un second temps à partir d'un échantillon représentatif tiré + de plusieurs caisses réparties sur toute la durée du tri. Si les sous + lots ainsi obtenus sont encore trop importants, un nouvel + échantillonnage peut être réalisé avant de mesurer les individus. </p> +Comment saisir cet observation dans le logiciel ? + +<pre>Exemple :<br> 500 kg de MELAG, on trie 40kg en 15kg Scomber scombrus et 25kg Scomber colias. Ensuite seuls 3.5kg de Scomber scombrus et 2.3kg de Scomber colias sont mesurés.</pre> + +La saisie sera : +<ol> + <li>créer les deux lot VRAC Scomber scombrus et Scomber colias sans poids. + </li> + <li>saisir dans la colonne "poids sous-échantillonnés (kg)" les valeurs 15kg + et 25kg. + </li> + <li>sélectionner les deux lignes + clic droit et saisir la valeur du MELAG + de 500kg. + </li> + <li>modifier les valeurs de la colonne "poids sous-échantillonnés (kg)" à + 3.5kg et 2.3kg. + </li> + <li>finir en saisissant les valeurs des mensurations.</li> +</ol> + +<h2>Gestion du protocole<a name="gestion_du_protocole"></a></h2> + +<p> + Associer un protocole de saisie à une campagne est une étape + indispensable avant toute saisie. Le protocole permet de configurer les + écrans de saisie, ce qui permet de limiter les risques d'erreurs et de + faciliter la saisie (ce qui se traduit par un gain de temps). Cette + étape doit être réalisée idéalement en mode connecté car cela permet de + configurer le protocole avec des références à jour. Le protocole pourra + être ajusté en cours de saisie. </p> +Il y a trois manière de préparer un protocole : +<ul> + <li> + Créer un nouveau protocole (bouton <i> nouveau </i>) et + compléter les + différents onglets directement sur les écrans. + <br> + Cette méthode sera cependant assez longue à réaliser. + </li> + <li> + Créer un nouveau protocole (bouton <i> nouveau </i>) et + compléter les + différents onglets à partir d’import de fichier <i>.csv</i> + (bouton <i> importer les caractéristiques </i> par exemple). + <br> + Les différents fichiers .csv étant préparés et manipulés dans un + tableur (Libre office par exemple). + </li> + <li> + Créer un nouveau protocole à partir d'un protocole existant + (bouton <i> Éditer/Cloner </i>). + <br> + Le fichier à importer provenant d'un protocole existant (classiquement + le protocole de la campagne de l'année précédente). + </li> +</ul> + +<h2>Quelles sont les informations à renseigner dans le protocole<a + name="information_dans_protocole"></a></h2> + +<h3>Onglet <i> informations générales </i></h3> +Le protocole doit porter un nom unique sur votre ordinateur. +Un commentaire peut lui être associé. + +<h3>Onglet <i> Caractéristiques/Classes de taille </i></h3> +Sélectionner à partir de la colonne de gauche toutes les méthodes de +mensurations appliquées sur les différentes espèces observées au cours de la +campagne. Seules les méthodes listées dans la colonne de droite seront +disponibles dans les écrans de saisie. + +<h3>Onglet <i> Caractéristiques/Mise en œuvre de l'engin </i></h3> +Sélectionner à partir de la colonne de gauche toutes les observations qui +seront enregistrées pour décrire la mise en œuvre de l'engin +(exemple : profondeur de l'engin).<br> + +<h3>Onglet <i> Caractéristiques/Observations individuelles </i></h3> +Sélectionner à partir de la colonne de gauche toutes les +caractéristiques qui seront observées pour décrire les individus. Par +défaut l'application propose le nom de l'espèce, son poids, sa taille +et sa méthode de mensuration. Pour pouvoir renseigner sous forme de +colonnes supplémentaires dans le tableau, d'autres caractéristiques, il +faut les ajouter dans la colonne de droite. L'ordre des +caractéristiques (de haut en bas) sera celui appliqué dans le tableau +(de gauche à droite) + +<h3>Onglet <i> Caractéristiques/Mise en œuvre du navire </i></h3> +Sélectionner à partir de la colonne de gauche toutes les observations qui seront +enregistrées pour décrire la mise en œuvre du navire (exemple : état de la +mer). + +<h3>Onglet <i> Espèces </i></h3> + +<p> + Lister dans ce tableau l'ensemble des espèces les plus couramment observées, + leur code associé et l'ensemble des observations attendues (exemple : + l'espèce + doit-elle être pesée, doit-elle être mesurée ? Si oui, quelle sera la + méthode + de mesure ?) +</p> +<strong>Important à retenir</strong> : +dans la colonne <i> Espèce </i> seuls les taxons référents sont +listés. +Si vous essayez d'importer un fichier avec des synonymes ou si vous ajoutez +une ligne avec un taxon synonyme, le logiciel basculera automatiquement +la ligne vers le taxon référent. +<h3>Onglet <i> Benthos </i></h3> +idem <i> Espèces </i> + +<h3>Information importante</h3> + +<p> + le logiciel permet une saisie séparée des fractions <i> +  Espèces </i> et <i> Benthos </i>. + Cette séparation permet l'enregistrement de taux d'échantillonnages + différents entre ces deux fractions. +</p> + +<p> + Dans le cas où le protocole de la campagne entraîne une observation commune + des deux fractions, la saisie des espèces et du benthos pourra être réalisée + sur le même tableau. Dans ce dernier cas, ne pas utiliser la notion de + benthos dans le logiciel. + Même chose pour les méduses qui appartiennent normalement au groupe + Plancton. +</p> + +<h2>Format des fichiers d'imports dans le logiciel<a + name="format_fichier_import"></a></h2> + +<p> + Afin de connaître le format des différents fichier qu'il est possible + d'importer dans le logiciel, l'utilisateur est invité à ajouter une ou + plusieurs valeurs à partir des écrans puis à exporter le résultat. + Le fichier ainsi créé sera ouvert dans un éditeur de + texte (Libre Office idéalement) pour prendre connaissance du format du + fichier. L'utilisateur peut alors modifier le fichier selon son besoin + avant de l'importer dans le logiciel. +</p> + +<h2>Manipulation des fichiers d'import/export<a + name="manipulation_fichiers"></a></h2> + +<p>Le logiciel génère et importe deux formats de fichiers.</p> +<ol> + <li>des format propres au logiciel (exemple : export du protocole à + partir du menu Éditer/Exporter en face du champ Protocole de saisie). + <br> + Ces fichiers peuvent être ouverts et modifiés à partir d'un éditeur de + type Notepad++). + <br> + La syntaxe est cependant difficilement compréhensible pour un + utilisateur normal du logiciel. Ces fichiers serviront donc le plus + souvent d'export/import sans modification du contenu. + </li> + <li> + des formats <i>.csv</i>. Ces fichiers sont à ouvrir sous Libre Office + et à sauvegarder en respectant le formatage suivant : + Encodage de caractère UTF8 et séparateur de champ <i> ; </i>. + Ces fichiers sont facilement compréhensibles par les utilisateurs et + peuvent donc être modifiés avant import dans le logiciel. + </li> +</ol> +<h2>Sauvegarde du protocole dans Harmonie<a name="sauvegarde_protocole"></a> +</h2> + +<p> + Avant synchronisation vers Harmonie, exporter le protocole de la campagne + et l'importer comme pièce jointe associé au premier trait de la campagne + afin de le sauvegarder. + <br> + Cela vous permettra de le récupérer l'année suivante pour initialiser + la nouvelle campagne et/ou corriger les données. +</p> + +<h2>Vrac / Hors Vrac : définitions<a name="vrac_definition"></a></h2> + +<dl> + <dt>HORS VRAC</dt> + <dd> + catégorie associée à un lot ou un individu qui a été prélevé + directement sur la capture sans passer par le pesage automatique ni + le tri. + </dd> + <dt>Cas 1</dt> + <dd> + Cette notion est utile dans les cas de capture abondante où seule une + fraction de la capture va être observée. Dans cette configuration, + les lots (catégorisés à VRAC) observés dans l'échantillon seront + élevés (facteur d'élévation) pour obtenir les poids et nombre + totaux dans la capture. + </dd> + <dt>Cas 2</dt> + <dd>Les individus rares ou atypiques qui auront été extraits de la capture + avant échantillonnage ne devront pas être élevés car leur facteur + d'élévation = 1. + </dd> + <dt>Cas 3</dt> + <dd>par convention, lorsque la totalité de la capture est observée + (pesée et triée), on catégorise tous les lots à VRAC. + </dd> +</dl> +<h2>Saisie multi-ordinateurs<a name="saisie_multiposte"></a></h2> + +<p> + L'applicatif permet d'envisager la saisie des informations sur plusieurs + ordinateurs en parallèle. + Par exemple, pour accélérer le temps de saisie, il est possible de saisir + la composition du benthos sur un ordinateur et toutes les autres + informations (les espèces, les macro-déchets etc.) sur un autre ordinateur. + Il faut cependant décider à l'avance quel sera l'ordinateur dit + <i> maître </i> et le(s) ordinateur(s) <i> +  satellites </i>. L'ordinateur + <i> maître </i> centralisera toutes les données alors que les + ordinateurs + <i> satellites </i> ne seront utilisés que pour saisir une parties + des + fractions de la capture. +</p> + +<p> + Pour cela il faut initialiser la saisie sur le poste <i> +  maître </i> (définir + la série, la campagne et le protocole). Exporter la base dans le menu + Fichier/Gestionnaire de base...Exporter. + Sur les postes <i> satellites </i>, lancer l'installation de + l'applicatif en pointant sur la base ainsi exportée. +</p> + +<p> + Pour la saisie sur les postes <i> satellites </i>, créer les + traits en ne complétant + que les trois champs <i> Code station </i>, <i> Numéro de + trait </i> et <i> date de début de traîne </i>. + Compléter les données sur l'onglet approprié (exemple Benthos). +</p> + +<p> + En haut à gauche de l'écran utiliser l'option <i> exporter les ... </i>. +</p> + +<p> + Enregistrer le fichier sur le réseau ou sur une clef usb. +</p> + +<p> + Sur le poste <i> maître </i>, se positionner sur le bon trait et + l'onglet que vous souhaitez importer. +</p> + +<p> + En haut à droite de l'écran cliquer sur <i> Importer des ... </i>, + pointer sur le fichier précédemment généré. +</p> + +<p> + Toutes les données saisie sur le poste satellite sont rapatriées sur le + poste <i> maître </i>. +</p> + +<p> + Fonctionnement de l'import de données : seuls les champs non renseignés + dans l'écran d'import peuvent être complétés par les données du fichier + importé. </p> + +<p> Les poids saisis dans l'écran d'import et les + espèces saisies dans l'écran ne pourront pas être écrasés par le + fichier importé. </p> + +<p> + Les données non importées seront listées. Ainsi, les données saisies sur le + poste <i> maître </i> sont prioritaires sur les importations des + postes <i> satellites </i> et ne seront donc pas écrasées. +</p> + +<h2>Sauvegarde régulière de la base<a name="sauvegarde_reguliere"></a></h2> + +<p> + L'application utilise une base de données qui peut être sensible à des + erreurs machine. Il est donc nécessaire de réaliser des sauvegardes + régulières (tous les soirs) de la base afin de se prémunir de toutes + pertes de données. Pour cela utiliser l'option "Exorter" du menu + "Fichier/Gestionnaire de base". Le répertoire de sauvegarde de la base + est défini dansle menu "Fichier/Configuration/Technique/Répertoire de + sauvegarde de base". </p> + +</div> +</body> +</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer / Créer des traits</title> -</head> -<body> - -<h1>Éditer / Créer des traits</h1> - -<p>Sur cette écran on peut créer / éditer des traits...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html (from rev 1432, trunk/tutti-ui-swing/src/main/help/fr/fonctionnalites_transversales.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,137 @@ +<!DOCTYPE html> +<html lang="fr"> +<head> + <meta charset="utf-8"> + + <title>Tutti - Aide en ligne (Fonctionnalités transversales)</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> + <div class="page-header"> + <h1>Fonctionnalités transversales</h1> + <strong>TRANSLATE ME!</strong> + </div> + + + <h2>Recherche dans une liste<a name="recherche_liste"></a></h2> + + Pour les recherches textuelles dans les listes il y a deux possibilités : + <ul> + <li>Taper du texte direct et dans ce cas la recherche se fait à partir + du début des informations saisies dans le champ + </li> + <li>Faire précéder votre recherche de <i>*</i> (astérisque) et dans ce + cas l'applicatif recherche le texte n'importe où dans le champ. + </li> + </ul> + + <h2>Tri dans une liste<a name="tri_liste"></a></h2> + + Les listes déroulantes peuvent être triées de différentes manières via le + menu + proposé par le bouton <i> carnet </i> situé en bout de champ. + + <h2>Vider la valeur d'un champ<a name="vider_valeur"></a></h2> + + Le bouton <i> flèche noire avec croix blanche </i> situé devant + les champs permet + de <i> vider </i> les champs. + + <h2>Raccourcis clavier<a name="raccourcis_clavier"></a></h2> + + Les raccourcis clavier sont identifiés à l'écran par des lettres soulignées + et + activés par la combinaison de touche Alt + lettre soulignée. + + <h2>Origine des poids affichés<a name="origine_poids"></a></h2> + + Dans l'ensemble des écrans le code d’affichage des poids est le suivant : + + <pre>12 = valeur saisie de 12 (kg ou g)</pre> + + <pre style="color: blue; font-style: italic;">24 = valeur calculée par l’applicatif de 24 (kg ou g)</pre> + + <pre>Femelle // 1,2 : le lot femelle de 1,2 kg est un sous échantillon du lot père.</pre> + + Cela est marqué par les <i> // </i>. + Dans le cas où on n'a pas procédé à un échantillonnage le poids associé à la + catégorie est séparé par un simple <i> / </i>. + + <h2>Contrôle de la saisie<a name="controle_saisie"></a></h2> + + <p> + Il y a un processus de contrôle en temps réel qui analyse la saisie sur + les écrans. + </p> + + <p> + L'accès à la liste des anomalies se fait via le drapeau situé dans la + barre + d'état en bas à droite de la fenêtre de l'application. + </p> + <dl> + <dt>Le drapeau est vert</dt> + <dd>aucune anomalie n'est détectée dans l'écran.</dd> + <dt>Le drapeau est rouge</dt> + <dd>une liste d'anomalies est proposée avec le champ en anomalie et un + message indiquant le type d'anomalie. Pour y accéder, cliquer sur + le drapeau. + </dd> + </dl> + <p>Fermer l'écran en cliquant sur la croix rouge.</p> + + <p> + Le présence d'anomalie sur un écran ne bloque pas l’enregistrement des + valeurs + saisies et la fermeture de l'écran. Les erreurs bloquantes qui demandent + une + correction immédiate seront signalées par un message spécifique + entraînant + une action immédiate du saisisseur. + </p> + + <h2>Rappel du context de saisie<a name="rappel_context"></a></h2> + + <p> + L'applicatif permet la saisie de données de plusieurs séries, campagnes, + trait, lots etc. sur une même base de données. Ceci est par exemple + nécessaire pendant les campagnes Pelgas qui associent la Thalassa avec + des + navires professionnels. Afin de rappeler le contexte de saisie + (sur quel trait je me situe, sur quel lot, sur quel campagne, etc.), + plusieurs bandeaux rappellent le contexte de saisie : + </p> + <pre>Série de campagne CGFS / campagne CGFS / Protocole 2013 ou Trait R0233 – 1 – 1 – 17/03/2013 – Mensuration.</pre> + +</div> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/index.html (from rev 1432, trunk/tutti-ui-swing/src/main/help/fr/index.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/index.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/index.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,208 @@ + +<!DOCTYPE html> +<html lang="fr"> +<head> + <meta charset="utf-8"> + + <title>Tutti - Aide en ligne</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> + + +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> + <div class="page-header"> + <h1>Documentation de Allegro Campagne</h1> + <strong>TRANSLATE ME!</strong> + </div> + + <h2>Table des matières</h2> + <ul> + <li><a href="menu.html">Description du Menu</a> + <ul> + <li><a href="menu.html#menu_fichier">Menu Fichier</a> + <ul> + <li><a href="menu.html#menu_fichier_configuration">Configuration</a> + </li> + <li> + <a href="menu.html#menu_fichier_mise_a_jour_logicelle">Vérifier + les mises à jour logiciels</a></li> + <li> + <a href="menu.html#menu_fichier_mise_a_jour_rapport">Vérifier + les mises à jour des rapports</a></li> + <li><a href="menu.html#menu_fichier_gestionnaire_base">Gestionnaire + de bases</a></li> + <li><a href="menu.html#menu_fichier_quitter">Quitter</a> + </li> + </ul> + </li> + <li><a href="menu.html#menu_action">Menu Actions</a> + <ul> + <li><a href="menu.html#menu_action_selection">Sélectionne + une campagne</a></li> + <li><a href="menu.html#menu_action_serie">Série de + campagne</a></li> + <li> + <a href="menu.html#menu_action_campagne">Campagne</a> + </li> + <li> + <a href="menu.html#menu_action_protocole">Protocole</a> + </li> + <li><a href="menu.html#menu_action_saisie_capture">Saisir + les captures</a></li> + <li><a href="menu.html#menu_action_valider_capture">Valider + les captures</a></li> + <li><a href="menu.html#menu_action_rapport">Rapport</a></li> + </ul> + </li> + <li><a href="menu.html#menu_administration">Menu + Administrations</a> + <ul> + <li><a href="menu.html#menu_administration_referentiel">Référentiels + temporaires</a></li> + <li> + <a href="menu.html#menu_administration_sample_category">Configurer + les catégorisations</a></li> + </ul> + </li> + <li><a href="menu.html#menu_aide">Menu Aide</a> + <ul> + <li><a href="menu.html#menu_aide_aide">Aide</a></li> + <li><a href="menu.html#menu_aide_site">Site</a></li> + <li><a href="menu.html#menu_aide_about">À propos</a> + </li> + <li><a href="menu.html#menu_aide_langue">Langue</a></li> + </ul> + </li> + </ul> + </li> + <li>Description des écrans de saisie de données + <ul> + <li><a href="selectCruise.html">Sélection Série / Campagne / + Protocole</a></li> + <li><a href="editProgram.html">Créer / Éditer une série de + campagne</a></li> + <li><a href="editCruise.html">Créer / Éditer une campagne</a> + </li> + <li><a href="editProtocol.html">Créer / Éditer un protocole</a> + </li> + <li><a href="editFishingOperation.html">Saisie du trait et de la + capture</a> + <ul> + <li><a href="editFishingOperation.html#trait">Trait + / Trait</a></li> + <li> + <a href="editFishingOperation.html#traitMiseEnOuvreEngin">Trait + / Mise en œuvre de l'engin</a></li> + <li> + <a href="editFishingOperation.html#traitAutreParametres">Trait + / Autres paramètres</a></li> + <li><a href="editFishingOperation.html#captureResume">Captures + / Résumé</a></li> + <li><a href="editFishingOperation.html#captureEspeces">Captures + / Espèces</a></li> + <li><a href="editFishingOperation.html#captureBenthos">Captures + / Benthos</a></li> + <li> + <a href="editFishingOperation.html#captureMacroDechet">Captures + / Macro déchets</a></li> + <li> + <a href="editFishingOperation.html#captureDonnesIndividuelles">Captures + / Observations individuelles</a></li> + <li> + <a href="editFishingOperation.html#captureCapturesAccidentelles">Captures + / Captures accidentelles</a></li> + </ul> + </li> + <li><a href="editFishingOperation.html">Saisie du trait et de la + capture</a></li> + + <li><a href="dbManager.html">Gestionnaire de base</a></li> + <li><a href="config.html">Configuration</a></li> + <li><a href="manageTemporaryReferential.html">Gestionnaire de + référentiels temporaires</a></li> + </ul> + </li> + <li> + <a href="fonctionnalites_transversales.html">Fonctionnalités + transversales</a> + <ul> + <li> + <a href="fonctionnalites_transversales.html#recherche_liste">Recherche + dans une liste</a></li> + <li><a href="fonctionnalites_transversales.html#tri_liste">Tri + dans + une liste</a></li> + <li><a href="fonctionnalites_transversales.html#vider_valeur">Vider + la valeur d'un champ</a></li> + <li> + <a href="fonctionnalites_transversales.html#raccourcis_clavier">Raccourcis + clavier</a></li> + <li><a href="fonctionnalites_transversales.html#origine_poids">Origine + des poids affichés</a></li> + <li> + <a href="fonctionnalites_transversales.html#controle_saisie">Contrôle + de la saisie</a></li> + <li><a href="fonctionnalites_transversales.html#rappel_context">Rappel + du context de saisie</a></li> + </ul> + </li> + <li><a href="faq.html">Foire aux questions</a> + <ul> + <li><a href="faq.html#melag">Gestion de la saisie d'un mélange + d'espèces</a></li> + <li><a href="faq.html#gestion_du_protocole">Gestion du + protocole</a> + </li> + <li><a href="faq.html#information_dans_protocole">Quelles sont + les + informations à renseigner dans le protocole</a></li> + <li><a href="faq.html#format_fichier_import">Format des fichiers + d'imports dans le logiciel</a></li> + <li><a href="faq.html#manipulation_fichiers">Manipulation des + fichiers d'import/export</a></li> + <li><a href="faq.html#sauvegarde_protocole">Sauvegarde du + protocole + dans Harmonie</a></li> + <li><a href="faq.html#vrac_definition">Vrac / Hors Vrac : + définitions</a></li> + <li><a href="faq.html#saisie_multiposte">Saisie + multi-ordinateurs</a></li> + <li><a href="faq.html#sauvegarde_reguliere">Sauvegarde régulière + de + la base</a></li> + </ul> + </li> + </ul> + +</div> +</body> +</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,4 +1,6 @@ - -<!DOCTYPE html> -<html lang="fr"> + <meta charset="utf-8"> -<head> - <meta charset="utf-8"/> <title>Tutti - Gérer les référentiels temporaires</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> <body> -<h1>Gérer les référentiels temporaires</h1> +<script type="text/javascript" src="../js/navbar.js"></script> -<p>Sur cette écran on peut gérer les référentiels temporaires...</p> +<div class="container"> + <div class="page-header"> + <h1>Gérer les référentiels temporaires</h1> + <strong>TRANSLATE ME!</strong> + </div> -<strong>Documentation à rédiger</strong> + <p>Sur cette écran on peut gérer les référentiels temporaires.<br>L'accès + à cet écran est protégé par un mot de passe afin d'éviter un usage + abusif des références temporaires. En effet, l'utilisation de + références temporaires empêchera l'archivage des données vers une + base + centralisée et peut compléxifier l'échange de fichiers.</p> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> + <p>Seul + quatre référentiels peuvent être modifiés par l'ajout de références + temporaires : espèces, navires, engins et individus.</p> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : + <p>Les fichiers manipulés dans cet écran sont des fichiers .csv - + encodage UTF8 - séparateur ";"<br>Afin + de respecter ce formatage il est fortement recommendé de les ouvrir + et + de les modifier avec un logiciel de type Notepad++ (et surtout pas + Excel)</p> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> + <p>Une référence temporaire ainsi importée est immédiatement disponible + dans les écrans de saisie de l'application. </p><strong></strong> + + <h2>Actions<a name="actions"></a></h2> + <dl> + <dt>Exporter un exemple de référentiel Espèce</dt> + <dd>permet d'exporter un fichier .csv qui servira d'exemple pour + préparer le fichier à importer afin de créer une espèce + temporaire. + </dd> + <dt>Importer des référentiels Espèces temporaires</dt> + <dd>permet + d'importer un fichier .csv contenant la(les) nouvelle(s) + référence. + Bien respecter le format proposé par le fichier d'export. + </dd> + </dl> + Concernant + une espèce temporaire ajouté à l'applicatif, il est possible de lui + associer un code campagne en l'ajoutant au protocole (onglet "Espèces") + et en complétant le champ "Code campagne". + <dl> + <dt>Exporter un exemple de référentiel Navire</dt> + <dd>idem espèce</dd> + <dt>Importer des référentiels Navires temporaires</dt> + <dd>idem espèce</dd> + <dt></dt> + <dt>Exporter un exemple de référentiel Engin</dt> + <dd>idem espèce</dd> + <dt>Importer des référentiels Engins temporaires</dt> + <dd>idem espèce</dd> + <dt></dt> + <dt>Exporter un exemple de référentiel Personne</dt> + <dd>idem espèce</dd> + <dt>Importer des référentiels Personnes temporaires</dt> + <dd>idem espèce</dd> + <dt><br></dt> + </dl> + +</div> </body> </html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/menu.html (from rev 1432, trunk/tutti-ui-swing/src/main/help/fr/menu.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/menu.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/menu.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,269 @@ +<!DOCTYPE html> +<html lang="fr"> +<head> + <meta charset="utf-8"> + + <title>Tutti - Aide en ligne (Menu)</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> +<div class="page-header"> + <h1>Description du menu</h1> + <strong>TRANSLATE ME!</strong> +</div> + + +Le menu est accessible en haut à gauche de l'écran + +<h2>Menu Fichier<a name="menu_fichier"></a></h2> + +<h3>Configuration<a name="menu_fichier_configuration"></a></h3> + +<p>La configuration définie dans ce menu est propre à la machine + (ordinateur).</p> + +<p>Cette configuration n'est pas <i>exportable</i> vers un autre ordinateur. +</p> + +<ul> + <li> + Pour enregistrer toutes les modifications dans les différents + onglets, + cliquer sur <strong>Enregistrer</strong>. + </li> + <li> + Pour ne pas enregistrer une modification, cliquer sur + <strong>Annuler</strong>. + </li> + <li>Pour quitter ce menu, cliquer sur <strong>Quitter</strong>.</li> +</ul> +<h3>Vérifier les mises à jour logiciels</h3> +<a name="menu_fichier_mise_a_jour_logicelle"></a> +Permet de vérifier les mises à jour logicielles de l'applicatif +(application / traductions / aide en ligne).<br> + +<h3>Vérifier les mises à jour des rapports</h3> +<a name="menu_fichier_mise_a_jour_rapport"></a> +Permet de vérifier les mises à jour des rapports utilisés dans l'aplication.<br> + +<h3>Gestionnaire de base</h3> +<a name="menu_fichier_gestionnaire_base"></a> + +<p>Cet écran permet de gérer la base de données</p> + +<p>L'application utilise une base de travail compatible Allegro, + l'application permet de + gérer ces bases, à savoir Installer une base à partir d'une url distante + via le mécanisme de mise à jour intégré. +</p> + +<dl> + <dt>Réinstaller</dt> + <dd> + Permet de réinstaller l'application afin de repartir sur une base + vide + de donnée. Une sauvegarde obligatoire des données sera faite. + </dd> + <dt>Importer une base</dt> + <dd>Permet d'importer une base précédement générer via l'option + Exporter. + </dd> + <dt>Mettre à jour les référentiels</dt> + <dd> + En mode connecté, permet de déclencher le processus de + synchronisation des référentiels + </dd> + <dt>Exporter</dt> + <dd> + Permet d'exporter toute la base embarquée sous un format <i>.zip</i>. + </dd> +</dl> +<h3>Quitter <a name="menu_fichier_quitter"></a></h3> + +<p>Permet de fermer l'application.</p> + +<h2>Menu Actions<a name="menu_action"></a></h2> + +<h3>Sélectionner une campagne<a name="menu_action_selection"></a></h3> + +<p>Ouvre l'écran d'édition / sélection des Séries de campagnes + Campagne + + Protocole de saisie.</p> + +<h3>Série de campagne<a name="menu_action_serie"></a></h3> + +<p>Ouvre l'écran d'édition de la dernière série de campagne + sélectionnée.</p> + +<h3>Campagne<a name="menu_action_campagne"></a></h3> + +<p>Ouvre l'écran d'édition de la dernière campagne sélectionnée.</p> + +<h3>Protocole<a name="menu_action_protocole"></a></h3> + +<p>Ouvre l'écran d'édition du dernier protocole sélectionné.</p> + +<h3>Saisir les captures<a name="menu_action_saisie_capture"></a></h3> + +<p>Ouvre l'écran d'édition de la saisie des captures sur la dernière + campagne + sélectionnée.</p> + +<h3>Valider les captures<a name="menu_action_valider_capture"></a></h3> + +<p> + Déclenche le processus de validation des données sur la dernière + campagne + sélectionnée. Le processus peut prendre plusieurs secondes/minutes s'il + y a de + nombreux traits dans la campagne. +</p> + +<p> + La liste des erreurs (rond rouge avec un point + d'exclamation) et des warning (triangle jaune avec un point + d'exclamation) + est listée pour chaque trait. +</p> + +<p> + Le résultat peut être exporté (icône en haut à droite + de l'écran) dans un fichier pour être sauvegardé. Un clic sur un message + ouvre dans la partie droite de l'écran le trait contenant le champ en + anomalie. +</p> + +<p> + La sauvegarde par synchronisation des données vers la base de données + centralisée Harmonie de l'Ifremer ne sera possible que si plus aucune + erreur + bloquante (rond rouge avec un point d'exclamation) n'est listée à + l'issue du + processus de validation. +</p> + +<h3>Rapports<a name="menu_action_rapport"></a></h3> + +<p> + Permet de générer des rapports sur la campagne sélectionnée. +</p> + +<h2>Menu Administration<a name="menu_administration"></a></h2> + +<h3>Référentiels temporaires<a name="menu_administration_referentiel"></a> +</h3> + +<p> + Permet la création de référentiels temporaires dans la base de + l'application. +</p> + +<p> + L'accès à ce menu est sécurisé par un mot de passe afin de limiter la + création de références temporaires qui peuvent complexifier l'archivage + des données vers une autre base. +</p> +Quatre référentiels peuvent être mis à jour via ce menu : +<ul> + <li>le référentiel des espèces</li> + <li>le référentiel des engins</li> + <li>le référentiel des personnes</li> + <li>le référentiel des navires</li> +</ul> + +Pour faire un nouvel import, procédez ainsi: + +<ul> + <li> + Afin de connaître le format du fichier d'import, commencer par + exporter + un fichier exemple en cliquant sur <strong>Exporter</strong> en face + du + référentiel. + </li> + <li> + Ouvrir le fichier sur Notepad++ ou LibreOffice afin de respecter le + formatage du fichier (encodage UTF8, séparateur <i> ; </i>). + </li> + <li>Modifier les valeurs.</li> + <li> + Enregistrer le fichier (en respectant le formatage décrit + précédemment). + </li> + <li> + L'importer via <strong>Importer</strong>. + Les références temporaires sont immédiatement disponibles dans les + écrans de l'application. + </li> +</ul> + +<h4>Description des actions</h4> + +<dl> + <dt>Exporter</dt> + <dd>permet d'exporter un fichier d'exemple (format .csv, encodage UTF8, + séparateur <i> ; </i>) + </dd> + <dt>Importer</dt> + <dd>permet d'importer le fichier avec la(les) référence(s) + temporaire(s) (format .csv, encodage UTF8, séparateur <i> +  ; </i>) + </dd> +</dl> +<h3>Configurer les catégorisations<a + name="menu_administration_sample_category"></a></h3> + + +Permet d'adapter les colonnes du tableau des saisie des données "espèces" et +"benthos" au protocole d'observation<br> +L'accès à ce menu est sécurisé par un mot de passe car il structure le +format de saisie des données.<br> + +<h2>Menu Aide<a name="menu_aide"></a></h2> + +<h3>Aide<a name="menu_aide_aide"></a></h3> +Permet d'accéder à l'aide sur l'application. +<h3>Site<a name="menu_aide_site"></a></h3> +En mode connecté, permet d'accéder au site du projet Tutti qui coordonne le +développement de cette application. +<h3>À propos<a name="menu_aide_about"></a></h3> +Permet d'accéder aux informations légales sur l’application, à des +informations +sur la traduction de l'application et aux différentes versions des logiciels +utilisés. +<h3>Langue<a name="menu_aide_langue"></a></h3> +Permet de sélectionner la langue de fonctionnement de l'application : +anglais ou +français. + +</div> +</body> +</html> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/help/en/report.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/report.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/report.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,52 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Générer des rapports</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> + <div class="page-header"> + <h1>Générer des rapports</h1> + <strong>TRANSLATE ME</strong> + </div> + + + <p>Sur cet écran on générer des rapports sur un trait sélectionné d'une campagne.</p> + + <h2>Description des champs<a name="fields"></a></h2> + <dl> + <dt>Trait</dt> + <dd>pour sélectionner l'un des traits de la campagne. + </dd> + <dt>Rapport</dt> + <dd>pour sélectionner le modèle de rapport à utiliser. + </dd> + <dt>Nom du rapport</dt> + <dd>pour renseigner le chemin du fichier de rapport à générer. + </dd> + </dl> + + <h2>Description des actions<a name="actions"></a></h2> + <dl> + <dt>générer</dt> + <dd>permet de générer le rapport. + </dd> + <dt>visualiser la rapport</dt> + <dd>permet d'ouvrir le rapport généré. + </dd> + <dt>Quitter</dt> + <dd>permet de fermer l'écran.</dd> + </dl> + +</div> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/en/report.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/en/selectCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/selectCruise.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/selectCruise.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,4 +1,6 @@ - -<!DOCTYPE html> -<html lang="fr"> + <meta charset="utf-8"> -<head> - <meta charset="utf-8"/> <title>Tutti - Choisir la campagne</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> </head> + + <body> -<h1>Choisir la campagne</h1> +<script type="text/javascript" src="../js/navbar.js"></script> -<p>Sur cette écran on peut choisir la campagne à utiliser...</p> +<div class="container"> + <div class="page-header"> + <h1>Sélection Série / Campagne / Protocole</h1> + <strong>TRANSLATE ME!</strong> + </div> -<strong>Documentation à rédiger</strong> + <p> + Sur cet écran on peut sélectionner, éditer et/ou créer des séries, des + campagnes et des protocoles. Il est aussi possible d'exporter des + données et d'exporter / importer un protocole. + </p> -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> + <h2>Description des champs<a name="fields"></a></h2> + <dl> + <dt>Série de campagne</dt> + <dd>dans la liste déroulante, sélectionner la série à laquelle se + rattachera la campagne. + </dd> + <dt>Campagne</dt> + <dd>dans la liste déroulante, sélectionner la campagne sur laquelle + portera les données. + </dd> + <dt>Protocole</dt> + <dd> + dans la liste déroulante, sélectionner le protocole qui sera + appliqué + au cours de la saisie des données. La sélection d'un protocole n'est + pas obligatoire pour visualiser des données mais nécessaire pour la + saisie de données (voir liste des caractéristiques pour mesurer les + espèces par exemple). Il conseillé d'importer le protocole de + l'année + N-1 pour préparer une nouvelle campagne. + </dd> + </dl> -<h2>Actions<a name="actions"></a></h2> -Actions possibles : + <h2>Description des actions<a name="actions"></a></h2> -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> + <dl> + <dt>Série de campagne <strong>Éditer</strong></dt> + <dd>permet d'éditer la série sélectionnée</dd> + <dt>Série de campagne <strong>Editer...Exporter</strong></dt> + <dd>permet d'exporter toutes les données brutes de la série sélectionnée + dans un fichier .zip contenant des fichiers .csv. + </dd> + <dt>Série de campagne <strong>Nouveau</strong></dt> + <dd>permet de créer une nouvelle série de campagne.</dd> + <dt>Campagne <strong>Éditer</strong></dt> + <dd>permet d'éditer la campagne sélectionnée dans le champ.</dd> + <dt>Campagne <strong>Éditer...Exporter</strong> </dt> + <dd> permet d'exporter toutes les données brutes de la campagne + sélectionnée dans un fichier .zip contenant des fichiers .csv. + </dd> + <dt>Campagne <strong>Éditer...Envoyer</strong></dt> + <dd>génère + un courriel et un fichier PDF qui présente la composition de toutes + les + captures saisies (composition de la capture en espèces scientifiques + et + poids associés). Le courriel est alors prêt à être transmis à une + liste + de destinataires. + </dd> + <dt>Campagne <strong>Éditer...Sumatra</strong></dt> + <dd>génère + un fichier .csv qui résume la composition des captures saisies en + espèces scientifiques et les poids associés. Le fichier créé est + compatible avec le système Sumatra disponible à bord de la Thalassa. + </dd> + <dt>Campagne <strong>Nouveau</strong></dt> + <dd>permet de créer une nouvelle campagne.</dd> + <dt>Protocole de saisie <strong>Éditer</strong></dt> + <dd>permet d'éditer le protocole sélectionné dans le champ.</dd> + <dt>Protocole de saisie <strong>Éditer...Cloner</strong></dt> + <dd>permet de créer un protocole par import du fichier généré par + l'option <strong>Éditer...Exporter</strong> ci-dessous. + </dd> + <dt>Protocole de saisie <strong>Éditer...Exporter</strong></dt> + <dd>génère + un fichier (formatage propre à l'applicatif) qui contient toutes les + informations du protocole. Le fichier généré peut alors être + réimporté + dans l'applicatif, via l'option <strong>Éditer...Cloner</strong> + afin + de créer un nouveau protocole. Cela peut être utile pour partager + son + protocole avec une autre série et/ou sauvegarder un protocole d'une + année sur l'autre. + </dd> + <dt>Protocole de saisie <strong>Éditer...Supprimer</strong></dt> + <dd>permet de supprimer le protocole sélectionné de la base de + données. + </dd> + <dt>Protocole de saisie <strong>Nouveau</strong></dt> + <dd>permet de créer un nouveau protocole de saisie.</dd> + <dt>Protocole de saisie <strong>Nouveau...Importer</strong></dt> + <dd>permet de créer un nouveau protocole à partir d'un fichier protocole + exporté. + </dd> + <dt>Saisir les captures</dt> + <dd>permet + de saisir les données de capture sur le couple série de + campagne/campagne sélectionné au dessus. Le protocole de saisie + appliqué sera celui sélectionné au dessus. + </dd> + <dt>Valider les captures</dt> + <dd>permet de déclencher le processus de validation des données sur le + couple série de campagne/campagne sélectionné au dessus + </dd> + </dl> + +</div> </body> </html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -1,53 +0,0 @@ - -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Catégoriser une capture de poissons</title> -</head> -<body> - -<h1>Catégoriser une capture de poissons</h1> - -<p>Sur cette écran on peut catégoriser une capture de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs<a name="fields"></a></h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions<a name="actions"></a></h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/index.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -79,6 +79,7 @@ les captures</a></li> <li><a href="menu.html#menu_action_valider_capture">Valider les captures</a></li> + <li><a href="menu.html#menu_action_rapport">Rapport</a></li> </ul> </li> <li><a href="menu.html#menu_administration">Menu @@ -147,39 +148,6 @@ <li><a href="config.html">Configuration</a></li> <li><a href="manageTemporaryReferential.html">Gestionnaire de référentiels temporaires</a></li> - - - <li><a href="editCatchBatch.html">Editer une capture</a></li> - <li><a href="editSpeciesBatch.html">Editer les captures - poisson</a> - </li> - <li><a href="createSpeciesBatch.html">Créer une capture - poisson</a> - </li> - <li><a href="splitSpeciesBatch.html">Catégoriser une capture - poisson</a></li> - <li><a href="editSpeciesFrequencies.html">Editer les - mensurations - poisson</a></li> - <li><a href="editBenthosBatch.html">Editer les captures - benthos</a> - </li> - <li><a href="createBenthosBatch.html">Créer une capture - benthos</a> - </li> - <li><a href="splitBenthosBatch.html">Catégories une capture - benthos</a></li> - <li><a href="editBenthosFrequencies.html">Editer les - mensurations - benthos</a></li> - <li><a href="editAccidentalBatch.html">Editer les captures - accidentelles</a></li> - <li><a href="createAccidentalBatch.html">Créer une capture - accidentelle</a></li> - <li><a href="editIndividualObservationBatch.html">Éditer les - observations indivuduelles</a></li> - <li><a href="createIndividualObservationBatch.html">Créer une - observation individuelle</a></li> </ul> </li> <li> Modified: trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -38,65 +38,65 @@ <div class="container"> <div class="page-header"> <h1>Gérer les référentiels temporaires</h1> + </div> - <p>Sur cette écran on peut gérer les référentiels temporaires.<br>L'accès - à cet écran est protégé par un mot de passe afin d'éviter un usage - abusif des références temporaires. En effet, l'utilisation de - références temporaires empêchera l'archivage des données vers une - base - centralisée et peut compléxifier l'échange de fichiers.</p> + <p>Sur cette écran on peut gérer les référentiels temporaires.<br>L'accès + à cet écran est protégé par un mot de passe afin d'éviter un usage + abusif des références temporaires. En effet, l'utilisation de + références temporaires empêchera l'archivage des données vers une + base + centralisée et peut compléxifier l'échange de fichiers.</p> - <p>Seul - quatre référentiels peuvent être modifiés par l'ajout de références - temporaires : espèces, navires, engins et individus.</p> + <p>Seul + quatre référentiels peuvent être modifiés par l'ajout de références + temporaires : espèces, navires, engins et individus.</p> - <p>Les fichiers manipulés dans cet écran sont des fichiers .csv - - encodage UTF8 - séparateur ";"<br>Afin - de respecter ce formatage il est fortement recommendé de les ouvrir - et - de les modifier avec un logiciel de type Notepad++ (et surtout pas - Excel)</p> + <p>Les fichiers manipulés dans cet écran sont des fichiers .csv - + encodage UTF8 - séparateur ";"<br>Afin + de respecter ce formatage il est fortement recommendé de les ouvrir + et + de les modifier avec un logiciel de type Notepad++ (et surtout pas + Excel)</p> - <p>Une référence temporaire ainsi importée est immédiatement disponible - dans les écrans de saisie de l'application. </p><strong></strong> + <p>Une référence temporaire ainsi importée est immédiatement disponible + dans les écrans de saisie de l'application. </p><strong></strong> - <h2>Actions<a name="actions"></a></h2> - <dl> - <dt>Exporter un exemple de référentiel Espèce</dt> - <dd>permet d'exporter un fichier .csv qui servira d'exemple pour - préparer le fichier à importer afin de créer une espèce - temporaire. - </dd> - <dt>Importer des référentiels Espèces temporaires</dt> - <dd>permet - d'importer un fichier .csv contenant la(les) nouvelle(s) - référence. - Bien respecter le format proposé par le fichier d'export. - </dd> - </dl> - Concernant - une espèce temporaire ajouté à l'applicatif, il est possible de lui - associer un code campagne en l'ajoutant au protocole (onglet "Espèces") - et en complétant le champ "Code campagne". - <dl> - <dt>Exporter un exemple de référentiel Navire</dt> - <dd>idem espèce</dd> - <dt>Importer des référentiels Navires temporaires</dt> - <dd>idem espèce</dd> - <dt></dt> - <dt>Exporter un exemple de référentiel Engin</dt> - <dd>idem espèce</dd> - <dt>Importer des référentiels Engins temporaires</dt> - <dd>idem espèce</dd> - <dt></dt> - <dt>Exporter un exemple de référentiel Personne</dt> - <dd>idem espèce</dd> - <dt>Importer des référentiels Personnes temporaires</dt> - <dd>idem espèce</dd> - <dt><br></dt> - </dl> + <h2>Actions<a name="actions"></a></h2> + <dl> + <dt>Exporter un exemple de référentiel Espèce</dt> + <dd>permet d'exporter un fichier .csv qui servira d'exemple pour + préparer le fichier à importer afin de créer une espèce + temporaire. + </dd> + <dt>Importer des référentiels Espèces temporaires</dt> + <dd>permet + d'importer un fichier .csv contenant la(les) nouvelle(s) + référence. + Bien respecter le format proposé par le fichier d'export. + </dd> + </dl> + Concernant + une espèce temporaire ajouté à l'applicatif, il est possible de lui + associer un code campagne en l'ajoutant au protocole (onglet "Espèces") + et en complétant le champ "Code campagne". + <dl> + <dt>Exporter un exemple de référentiel Navire</dt> + <dd>idem espèce</dd> + <dt>Importer des référentiels Navires temporaires</dt> + <dd>idem espèce</dd> + <dt></dt> + <dt>Exporter un exemple de référentiel Engin</dt> + <dd>idem espèce</dd> + <dt>Importer des référentiels Engins temporaires</dt> + <dd>idem espèce</dd> + <dt></dt> + <dt>Exporter un exemple de référentiel Personne</dt> + <dd>idem espèce</dd> + <dt>Importer des référentiels Personnes temporaires</dt> + <dd>idem espèce</dd> + <dt><br></dt> + </dl> - </div> </div> </body> </html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/help/fr/menu.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/menu.html 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/fr/menu.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -105,7 +105,7 @@ Permet d'exporter toute la base embarquée sous un format <i>.zip</i>. </dd> </dl> -<h3>Quitter</h3> +<h3>Quitter <a name="menu_fichier_quitter"></a></h3> <p>Permet de fermer l'application.</p> @@ -168,6 +168,12 @@ processus de validation. </p> +<h3>Rapports<a name="menu_action_rapport"></a></h3> + +<p> + Permet de générer des rapports sur la campagne sélectionnée. +</p> + <h2>Menu Administration<a name="menu_administration"></a></h2> <h3>Référentiels temporaires<a name="menu_administration_referentiel"></a> Added: trunk/tutti-ui-swing/src/main/help/fr/report.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/report.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/report.html 2013-12-09 15:44:42 UTC (rev 1439) @@ -0,0 +1,50 @@ +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Générer des rapports</title> + <link href="../css/bootstrap.min.css" rel="stylesheet"> + <link href="../css/style.css" rel="stylesheet"> + <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> + <script type="text/javascript" src="../js/bootstrap.min.js"></script> +</head> +<body> + +<script type="text/javascript" src="../js/navbar.js"></script> + +<div class="container"> + <div class="page-header"> + <h1>Générer des rapports</h1> + </div> + + <p>Sur cet écran on générer des rapports sur un trait sélectionné d'une campagne.</p> + + <h2>Description des champs<a name="fields"></a></h2> + <dl> + <dt>Trait</dt> + <dd>pour sélectionner l'un des traits de la campagne. + </dd> + <dt>Rapport</dt> + <dd>pour sélectionner le modèle de rapport à utiliser. + </dd> + <dt>Nom du rapport</dt> + <dd>pour renseigner le chemin du fichier de rapport à générer. + </dd> + </dl> + + <h2>Description des actions<a name="actions"></a></h2> + <dl> + <dt>générer</dt> + <dd>permet de générer le rapport. + </dd> + <dt>visualiser la rapport</dt> + <dd>permet d'ouvrir le rapport généré. + </dd> + <dt>Quitter</dt> + <dd>permet de fermer l'écran.</dd> + </dl> + +</div> +</body> +</html> \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/help/fr/report.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/help/js/navbar.js =================================================================== --- trunk/tutti-ui-swing/src/main/help/js/navbar.js 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/help/js/navbar.js 2013-12-09 15:44:42 UTC (rev 1439) @@ -52,6 +52,7 @@ document.write(' <li><a href="menu.html#menu_action_protocole">Protocole</a></li>'); document.write(' <li><a href="menu.html#menu_action_saisie_capture">Saisir les captures</a></li>'); document.write(' <li><a href="menu.html#menu_action_valider_capture">Valider les captures</a></li>'); +document.write(' <li><a href="menu.html#menu_action_rapport">Rapport</a></li>'); document.write(' </ul>'); document.write(' </li>'); document.write(' <li class="dropdown-submenu">'); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 15:01:12 UTC (rev 1438) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 15:44:42 UTC (rev 1439) @@ -282,7 +282,7 @@ @Override public String getI18nPrefix() { - return "i18n.property."; + return "tutti.property."; } @Override @@ -455,7 +455,7 @@ _("tutti.help.mkDir.error", helpDirectory)); // load help mapping - String mappingProperties = "/tutti-help.properties"; + String mappingProperties = "/tutti-help-fr.properties"; try { InputStream resourceAsStream =

1 0

r1438 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/resources/i18n tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic tutti-service/src/main/java/fr/ifremer/tutti/service/report tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 16:01:12 +0100 (Mon, 09 Dec 2013) New Revision: 1438 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1438 Log: refs #3624: [Rapport] Int?\195?\169gration de rapports g?\195?\169n?\195?\169r?\195?\169s par Birt Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-09 15:01:12 UTC (rev 1438) @@ -458,9 +458,9 @@ return result; } - /** @return {@link TuttiConfigurationOption#REPORT_LOG_FILE} value */ - public File getReportLogFile() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_FILE.getKey()); + /** @return {@link TuttiConfigurationOption#REPORT_LOG_DIRECTORY} value */ + public File getReportLogDirectory() { + File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_DIRECTORY.getKey()); return result; } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 15:01:12 UTC (rev 1438) @@ -94,10 +94,10 @@ n_("tutti.config.option.report.directory.description"), "${tutti.report.home.directory}/allegro-tutti/reports", File.class), - REPORT_LOG_FILE( - "tutti.report.log.file", + REPORT_LOG_DIRECTORY( + "tutti.report.log.directory", n_("tutti.config.option.report.log.file.description"), - "${tutti.data.directory}/report-${version}.log", + "${tutti.data.directory}/reportlogs", File.class), DB_DIRECTORY( "tutti.persistence.db.directory", Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-09 15:01:12 UTC (rev 1438) @@ -162,7 +162,7 @@ tutti.config.option.report.backup.directory.description=Répertoire contenant les rapports générés tutti.config.option.report.directory.description=Répertoire contenant les modèles de rapports tutti.config.option.report.home.directory.description=Répertoire contenant la structure nécessaire pour les rapport -tutti.config.option.report.log.file.description=Fichier de log utilisé lors de la génération des rapport Birt +tutti.config.option.report.log.directory.description=Répertoire contenant les logs de la génération des rapports Birt tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2013-12-09 15:01:12 UTC (rev 1438) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.shared.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -43,6 +44,7 @@ import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.ValidationService; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorResult; @@ -88,20 +90,27 @@ * Result keys are fishing operation id, values the first error for * the fishing operation. * - * @param cruiseId id of the cruise to check. + * @param cruiseId id of the cruise to check. + * @param uniqueFishingOperationId optional unique fishing operation to check * @return map of errors, or empty map if no error found. * @since 1.4 */ - public Map<String, String> checkCruise(String cruiseId) { + public Map<String, String> checkCruise(String cruiseId, + String uniqueFishingOperationId) { if (log.isDebugEnabled()) { log.debug("Will check cruise: " + cruiseId); } Map<String, String> result = Maps.newTreeMap(); - List<String> allFishingOperation = - persistenceService.getAllFishingOperationIds(cruiseId); + List<String> allFishingOperation; + if (StringUtils.isNotBlank(uniqueFishingOperationId)) { + allFishingOperation = Lists.newArrayList(uniqueFishingOperationId); + } else { + allFishingOperation = persistenceService.getAllFishingOperationIds(cruiseId); + } + for (String fishingOperationId : allFishingOperation) { boolean withCatchBatch = Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2013-12-09 15:01:12 UTC (rev 1438) @@ -191,7 +191,7 @@ // check cruise fishing operations ApplicationBusinessException checkError = null; try { - checkCruise(progressionModel, cruise); + checkCruise(progressionModel, cruise, null); } catch (ApplicationBusinessException e) { // error while checking cruise if (log.isDebugEnabled()) { @@ -226,13 +226,16 @@ } /** - * Export a cruise to file system in a temporary directory. + * Export the given fishing operation of a cruise to file system + * in a temporary directory. * - * @param cruiseId id of the cruise to export + * @param cruiseId id of the cruise to export + * @param fishingOperationId id of the fishing operation to export * @return the directory containing the export files * @since 3.0-rc-2 */ - public File exportCruiseToFileSystem(String cruiseId) { + public File exportFishingOperation(String cruiseId, + String fishingOperationId) { Preconditions.checkNotNull(cruiseId); @@ -246,7 +249,7 @@ // check cruise fishing operations ApplicationBusinessException checkError = null; try { - checkCruise(null, cruise); + checkCruise(null, cruise, fishingOperationId); } catch (ApplicationBusinessException e) { // error while checking cruise if (log.isDebugEnabled()) { @@ -262,8 +265,14 @@ ExportContext exportContext = createExportContext(basedir); + FishingOperation fishingOperation = + persistenceService.getFishingOperation(fishingOperationId); + try { - exportCruise(cruise, exportContext, null); + exportCruise(cruise, + Lists.newArrayList(fishingOperation), + exportContext, + null); ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); } finally { IOUtils.closeQuietly(exportContext); @@ -297,7 +306,9 @@ speciesById); } - protected void checkCruise(ProgressionModel progressionModel, Cruise cruise) { + protected void checkCruise(ProgressionModel progressionModel, + Cruise cruise, + String fishingOperationId) { Preconditions.checkNotNull(cruise); increments(progressionModel, @@ -305,7 +316,8 @@ // check cruise fishing operations Map<String, String> errors = - weightComputingService.checkCruise(cruise.getId()); + weightComputingService.checkCruise(cruise.getId(), + fishingOperationId); if (MapUtils.isNotEmpty(errors)) { @@ -318,8 +330,8 @@ decoratorService.getDecoratorByType(FishingOperation.class); StringBuilder sb = new StringBuilder(); for (Map.Entry<String, String> entry : errors.entrySet()) { - String fishingOperationId = entry.getKey(); - FishingOperation fishingOperation = persistenceService.getFishingOperation(fishingOperationId); + String operationId = entry.getKey(); + FishingOperation fishingOperation = persistenceService.getFishingOperation(operationId); String fishingOperationStr = fishingOperationDecorator.toString(fishingOperation); sb.append(_("tutti.service.export.invalid.fishingOperation", fishingOperationStr, entry.getValue())); } @@ -343,6 +355,14 @@ List<FishingOperation> operations = persistenceService.getAllFishingOperation(cruise.getId()); + exportCruise(cruise, operations, exportContext, progressionModel); + } + + protected void exportCruise(Cruise cruise, + List<FishingOperation> operations, + ExportContext exportContext, + ProgressionModel progressionModel) { + // load fully operations List<FishingOperation> loadedOperations = Lists.newArrayListWithCapacity(operations.size()); @@ -388,7 +408,6 @@ increments(progressionModel, _("tutti.service.exportCruise.exportSpecies", cruiseName)); exportSpecies(exportContext, exportContext.getSpeciesToExport()); - } protected void exportSurvey(ExportContext exportContext, Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-09 15:01:12 UTC (rev 1438) @@ -138,7 +138,7 @@ engineConfig = new EngineConfig(); engineConfig.setBIRTHome(context.getConfig().getReportHomeDirectory().getAbsolutePath()); engineConfig.setResourcePath(context.getConfig().getReportHomeDirectory().getAbsolutePath()); - engineConfig.setLogConfig(context.getConfig().getReportLogFile().getAbsolutePath(), Level.FINE); + engineConfig.setLogConfig(context.getConfig().getReportLogDirectory().getAbsolutePath(), Level.FINE); // Get the instance of the engine try { @@ -177,7 +177,8 @@ // export fishing operation progressionModel.increments(_("tutti.report.step.export.fishingOperation")); File exportDirectory = getService(TuttiExportService.class). - exportCruiseToFileSystem(model.getCruiseId()); + exportFishingOperation(model.getCruiseId(), + model.getFishingOperationId()); ReportContext reportContext = new ReportContext(model, operation, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-12-09 15:01:12 UTC (rev 1438) @@ -221,8 +221,8 @@ .addOption(TuttiConfigurationOption.REPORT_DIRECTORY) .setOptionShortLabel(_("tutti.config.option.service.report.directory.shortLabel")) - .addOption(TuttiConfigurationOption.REPORT_LOG_FILE) - .setOptionShortLabel(_("tutti.config.option.service.report.log.file.shortLabel")) + .addOption(TuttiConfigurationOption.REPORT_LOG_DIRECTORY) + .setOptionShortLabel(_("tutti.config.option.service.report.log.directory.shortLabel")) .addOption(TuttiConfigurationOption.DB_DIRECTORY) .setOptionShortLabel(_("tutti.config.option.persistence.db.directory.shortLabel")) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-09 15:01:12 UTC (rev 1438) @@ -139,6 +139,8 @@ tutti.config.option.protocolId.description= tutti.config.option.service.report.backup.directory.shortLabel= tutti.config.option.service.report.directory.shortLabel= +tutti.config.option.service.report.log.directory.shortLabel= +tutti.config.option.service.report.log.file.shortLabel= tutti.config.option.site.url.shortLabel= tutti.config.option.startActionFile.description= tutti.config.option.tmp.directory.shortLabel= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-09 14:04:30 UTC (rev 1437) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-09 15:01:12 UTC (rev 1438) @@ -131,7 +131,7 @@ tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport -tutti.config.option.service.report.log.file.shortLabel=Fichier de log de la génération des rapports +tutti.config.option.service.report.log.directory.shortLabel=Répertoire des log de génération des rapports tutti.config.option.site.url.shortLabel=URL du site technique tutti.config.option.startActionFile.description=Fichier tutti.config.option.tmp.directory.shortLabel=Répertoire temporaire

1 0

r1437 - birt-runtime/trunk
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 15:04:30 +0100 (Mon, 09 Dec 2013) New Revision: 1437 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1437 Log: finalize release 3.4.1-1 Modified: birt-runtime/trunk/pom.xml Modified: birt-runtime/trunk/pom.xml =================================================================== --- birt-runtime/trunk/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) +++ birt-runtime/trunk/pom.xml 2013-12-09 14:04:30 UTC (rev 1437) @@ -33,10 +33,9 @@ <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> - <version>4.3.1-1-SNAPSHOT</version> - <packaging>pom</packaging> + <version>4.3.1-1</version> - <name>Birt runtime (repackage)</name> + <name>Birt runtime (repackage by Code Lutin)</name> <description> Birt-runtime repackage to fix some Module commun à l'écriture d'applications Ifremer. @@ -82,20 +81,6 @@ scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk </developerConnection> </scm> - <distributionManagement> - <snapshotRepository> - <id>nuiton-nexus-deploy</id> - <url> - http://nexus.nuiton.org/nexus/content/repositories/tutti-snapshot - </url> - </snapshotRepository> - <repository> - <id>nuiton-nexus-deploy</id> - <url> - http://nexus.nuiton.org/nexus/content/repositories/tutti-third-parties - </url> - </repository> - </distributionManagement> <properties> @@ -114,368 +99,13 @@  <skipPostRelease>false</skipPostRelease> + + <mdep.analyze.skip>true</mdep.analyze.skip> </properties> - <repositories> - <repository> - <id>tutti-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>tutti-public-group</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <dependencyManagement> <dependencies> - <dependency> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.birt.runtime</artifactId> - <version>${birtVersion}</version> - <exclusions> - <exclusion> - <groupId>milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - <exclusion> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.hsqldb.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.mysql</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.ibm.informix - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId> - org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId> - org.eclipse.datatools.enablement.ibm.informix.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.postgresql</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId> - org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId> - org.eclipse.datatools.connectivity.apache.derby.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.oracle</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.msft.sqlserver - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.oracle.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.mysql.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId> - org.eclipse.datatools.enablement.postgresql.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.modelbase.derby</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.connectivity.apache.derby - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.connectivity.console.profile - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.connectivity.oda.design - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.oda.ws</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.modelbase.sql</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.modelbase.sql.query</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId> - org.eclipse.datatools.connectivity.dbdefinition.genericJDBC - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.enablement.oda.xml</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.connectivity.db.generic - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.modelbase.dbdefinition - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.connectivity.oda.profile - </artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.datatools.connectivity.sqm.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.emf.ecore.change</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.core.expressions</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.emf</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.core.resources</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.core.filesystem</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.core.contenttype</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.apache.commons.logging</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.pdf</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.dom.svg</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.dom</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.css</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.ext.awt</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.transcoder</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.xml</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.orbit.mongodb</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.commons.codec</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.bridge</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.parser</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.util.gui</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.batik.svggen</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.equinox.app</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.equinox.preferences</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.osgi.services</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.xerces</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>derby</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.xml.resolver</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.apache.xml.serializer</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.w3c.dom.svg</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.w3c.css.sac</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>javax.wsdl</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>org.w3c.dom.smil</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>javax.xml.stream</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>Tidy</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime.3_7_1</groupId> - <artifactId>com.lowagie.text</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>com.ibm.icu</artifactId> - </exclusion> - - <exclusion> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.update.configurator</artifactId> - </exclusion> - - <exclusion> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml-schemas</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> @@ -505,13 +135,78 @@ <dependencies> -  <dependency> <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.birt.runtime</artifactId> - <version>${birtVersion}</version> + <artifactId>org.eclipse.datatools.connectivity</artifactId> + <version>1.2.9.v201307261105</version> </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.oda.flatfile</artifactId> + <version>3.1.6.v201308131104</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.equinox.registry</artifactId> + <version>3.5.301.v20130717-1549</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.emf.common</artifactId> + <version>2.9.1.v20130827-0309</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.emf.ecore</artifactId> + <version>2.9.1.v20130827-0309</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.emf.ecore.xmi</artifactId> + <version>2.9.1.v20130827-0309</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>3.9.1.v20130814-1242</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.oda</artifactId> + <version>3.4.1.v201308160907</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.equinox.common</artifactId> + <version>3.6.200.v20130402-1505</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.oda.consumer</artifactId> + <version>3.2.6.v201305170644</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.mozilla.javascript</artifactId> + <version>1.7.2</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.core.runtime</artifactId> + <version>3.9.0.v20130326-1255</version> + </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.3.0</version> + </dependency> +  <dependency> <groupId>commons-io</groupId> @@ -671,6 +366,23 @@ <excludedGroups>milyn</excludedGroups> </configuration> </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <skipIfEmpty>true</skipIfEmpty> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> </build> @@ -680,18 +392,15 @@ </reporting> <profiles> - <profile> - <id>license-profile</id> + <id>prepare-artifacts</id> <activation> <property> <name>performRelease</name> <value>true</value> </property> </activation> - <build> - <defaultGoal>generate-resources</defaultGoal> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -716,9 +425,65 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>get-birt-runtimes-jars</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.birt.runtime</artifactId> + <version>${birtVersion}</version> + <destFileName>org.eclipse.birt.runtime-${birtVersion}.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.birt.runtime</artifactId> + <version>${birtVersion}</version> + <classifier>sources</classifier> + <destFileName>org.eclipse.birt.runtime-${birtVersion}-sources.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>attach-main-jar</id> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}.jar</file> + <classifier>codelutin</classifier> + </artifact> + <artifact> + <file>${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}-sources.jar</file> + <classifier>codelutin-sources</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> - </profiles> </project>

1 0

r1436 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/resources/i18n tutti-service tutti-service/src/license tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic tutti-service/src/main/java/fr/ifremer/tutti/service/report tutti-service/src/main/resources/i18n tutti-service/src/test/java/fr/ifremer/tutti/service/report tutti-service/src/test/resources/report tutti-service/src/test/res
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 14:51:06 +0100 (Mon, 09 Dec 2013) New Revision: 1436 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1436 Log: fixes #3624: [Rapport] Int?\195?\169gration de rapports g?\195?\169n?\195?\169r?\195?\169s par Birt Added: trunk/tutti-service/src/test/resources/report/exportCruise/ trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv trunk/tutti-service/src/test/resources/report/exportCruise/species.csv trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties Removed: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/pom.xml trunk/tutti-service/src/license/THIRD-PARTY.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties trunk/tutti-ui-swing/src/main/assembly/min/launch.bat trunk/tutti-ui-swing/src/main/assembly/min/launch.sh trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -139,7 +139,7 @@ <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.4.1</adagioVersion> - <birtVersion>4.2.1a</birtVersion> + <birtVersion>4.3.1-1</birtVersion> <bluecoveVersion>2.1.0</bluecoveVersion> @@ -410,22 +410,8 @@ <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> <version>${birtVersion}</version> - <exclusions> - <exclusion> - <groupId>milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - <exclusion> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - </exclusions> + <classifier>codelutin</classifier> </dependency> - <dependency> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - <version>1.3</version> - </dependency>  <dependency> @@ -560,6 +546,31 @@ </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0| + Apache License, Version 2.0 + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU LESSER GENERAL PUBLIC LICENSE + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU Lesser General Public License + </licenseMerge> + <licenseMerge> + Common Development and Distribution License (CDDL) v1.0| + COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + </licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> + <excludedGroups>milyn</excludedGroups> + <addSvnKeyWords>false</addSvnKeyWords> + </configuration> + </plugin> + </plugins> </pluginManagement> <extensions> @@ -654,7 +665,7 @@ <includes> <include>pom.xml</include> </includes> - <addSvnKeyWords>false</addSvnKeyWords> +  <verbose>false</verbose> </configuration> </execution> @@ -665,78 +676,6 @@ </profile> <profile> - <id>deploy-update-tutti-update</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <build> - <defaultGoal>deploy</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy update-tutti.properties to site</id> - <phase>package</phase> - <inherited>false</inherited> - <configuration> - <tasks> - <echo message="copy tutti-application.properties to site" /> - <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> - <filterset> - <filter value="${project.version}" token="projectVersion" /> - <filter value="${jreVersion}" token="jreVersion" /> - <filter value="${dbVersion}" token="dbVersion" /> - <filter value="${reportVersion}" token="reportVersion" /> - </filterset> - <fileset dir="${basedir}/src/update/"> - <include name="update-tutti.properties" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> - <executions> - <execution> - <id>deploy update-tutti.properties</id> - <phase>deploy</phase> - <inherited>false</inherited> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>forge.codelutin.com</serverId> - <fromFile> - ${project.build.directory}/update/update-tutti.properties - </fromFile> - <url> - scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti - </url> - </configuration> - </execution> - </executions> - - </plugin> - </plugins> - </build> - - </profile> - - <profile> <id>deploy-tutti-application-update</id> <activation> <property> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -278,7 +278,8 @@ try { applicationConfig.save(file, false, optionKeyToNotSave); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.config.save.error", file), e); + throw new ApplicationTechnicalException( + _("tutti.config.save.error", file), e); } } @@ -457,6 +458,12 @@ return result; } + /** @return {@link TuttiConfigurationOption#REPORT_LOG_FILE} value */ + public File getReportLogFile() { + File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_FILE.getKey()); + return result; + } + /** @return {@link TuttiConfigurationOption#REPORT_BACKUP_DIRECTORY} value */ public File getReportBackupDirectory() { File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY.getKey()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -94,7 +94,11 @@ n_("tutti.config.option.report.directory.description"), "${tutti.report.home.directory}/allegro-tutti/reports", File.class), - + REPORT_LOG_FILE( + "tutti.report.log.file", + n_("tutti.config.option.report.log.file.description"), + "${tutti.data.directory}/report-${version}.log", + File.class), DB_DIRECTORY( "tutti.persistence.db.directory", n_("tutti.config.option.persistence.db.directory.description"), Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -32,6 +32,7 @@ tutti.config.option.report.backup.directory.description= tutti.config.option.report.directory.description= tutti.config.option.report.home.directory.description= +tutti.config.option.report.log.file.description= tutti.config.option.samplingCategoryOrderIds.description= tutti.config.option.site.url.description= tutti.config.option.startActionFile.description= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -162,6 +162,7 @@ tutti.config.option.report.backup.directory.description=Répertoire contenant les rapports générés tutti.config.option.report.directory.description=Répertoire contenant les modèles de rapports tutti.config.option.report.home.directory.description=Répertoire contenant la structure nécessaire pour les rapport +tutti.config.option.report.log.file.description=Fichier de log utilisé lors de la génération des rapport Birt tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -41,6 +41,335 @@ <dependencies> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  + +  +  +  +  + +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <dependency> <groupId>${project.groupId}</groupId> @@ -140,13 +469,8 @@ <dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> + <classifier>codelutin</classifier> </dependency> -  - <dependency> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - <scope>runtime</scope> - </dependency>  <dependency> @@ -185,6 +509,7 @@ <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> </property> </properties> + <argLine>-Xmx1024M -XX:MaxPermSize=256m</argLine> </configuration> </plugin> </plugins> Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -6,18 +6,22 @@ # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU Affero General Public License v3 # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - HSQLDB License +# - ICU License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Java HTML Tidy License # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - Mozilla Public License # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 @@ -27,8 +31,21 @@ # Please fill the missing licenses for dependencies : # # -#Wed Dec 04 12:30:42 CET 2013 +#Sun Dec 08 20:03:42 CET 2013 antlr--antlr--2.7.6=BSD License +batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 +batik--batik-bridge--1.6=The Apache Software License, Version 2.0 +batik--batik-css--1.6=The Apache Software License, Version 2.0 +batik--batik-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-ext--1.6=The Apache Software License, Version 2.0 +batik--batik-gvt--1.6=The Apache Software License, Version 2.0 +batik--batik-parser--1.6=The Apache Software License, Version 2.0 +batik--batik-script--1.6=The Apache Software License, Version 2.0 +batik--batik-svg-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-svggen--1.6=The Apache Software License, Version 2.0 +batik--batik-transcoder--1.6=The Apache Software License, Version 2.0 +batik--batik-util--1.6=The Apache Software License, Version 2.0 +batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -113,14 +113,13 @@ registerTuttiDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); registerTuttiDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); -// registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY_WITH_UNIT, "${parameterName}$s (${unit}$s)", SEPARATOR, " - "); registerDecorator(CARACTERISTIC_PARAMETER_ONLY_WITH_UNIT, new SimpleCaracteristicDecorator("${parameterName}$s")); registerTuttiDecorator(CaracteristicQualitativeValue.class, "${description}$s", SEPARATOR, " - "); registerTuttiDecorator(SpeciesProtocol.class, "${speciesReferenceTaxonId}", SEPARATOR, " - "); registerTuttiDecorator(Attachment.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(LabelAware.class, "${label}$s", SEPARATOR, " - "); - registerTuttiDecorator(File.class, "${absolutePath}$s", SEPARATOR, " - "); + registerTuttiDecorator(File.class, "${name}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Float>(Float.class) { private static final long serialVersionUID = 1L; @@ -135,7 +134,6 @@ registerDecorator(new SpeciesDecorator()); registerDecorator(FROM_PROTOCOL, new SpeciesFromProtocolDecorator()); -// registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerDecorator(CARACTERISTIC_WITH_UNIT, new SimpleCaracteristicDecorator("${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s")); TuttiDecorator<FishingOperation> fishingOperationTuttiDecorator = (TuttiDecorator<FishingOperation>) getDecoratorByType(FishingOperation.class); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -165,11 +165,10 @@ } ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); - progressionModel.setMessage( - _("tutti.service.exportCruise.buildZip", exportFile)); + increments(progressionModel, + _("tutti.service.exportCruise.buildZip", exportFile)); ApplicationIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); - progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); } @@ -212,11 +211,10 @@ exportCruise(cruise, exportContext, progressionModel); ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); - progressionModel.setMessage( + progressionModel.increments( _("tutti.service.exportCruise.buildZip", exportFile)); ApplicationIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); - progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); } @@ -227,6 +225,57 @@ } } + /** + * Export a cruise to file system in a temporary directory. + * + * @param cruiseId id of the cruise to export + * @return the directory containing the export files + * @since 3.0-rc-2 + */ + public File exportCruiseToFileSystem(String cruiseId) { + + Preconditions.checkNotNull(cruiseId); + + Cruise cruise = persistenceService.getCruise(cruiseId); + Preconditions.checkNotNull(cruise); + + if (log.isDebugEnabled()) { + log.debug("Will export cruise: " + cruiseId); + } + + // check cruise fishing operations + ApplicationBusinessException checkError = null; + try { + checkCruise(null, cruise); + } catch (ApplicationBusinessException e) { + // error while checking cruise + if (log.isDebugEnabled()) { + log.debug("Got a check cruise error", e); + } + checkError = e; + } + + File basedir = new File(context.getConfig().newTempFile( + "exportCruise"), "exportCruise-" + cruiseId); + + ApplicationIOUtil.forceMkdir(basedir, _("tutti.io.mkDir.error", basedir)); + + ExportContext exportContext = createExportContext(basedir); + + try { + exportCruise(cruise, exportContext, null); + ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); + } finally { + IOUtils.closeQuietly(exportContext); + } + + if (checkError != null) { + // rethrow error + throw checkError; + } + return basedir; + } + protected ExportContext createExportContext(File basedir) { @@ -251,16 +300,13 @@ protected void checkCruise(ProgressionModel progressionModel, Cruise cruise) { Preconditions.checkNotNull(cruise); + increments(progressionModel, + _("tutti.service.exportCruise.checkCruise", cruise.getName())); - progressionModel.setMessage( - _("tutti.service.exportCruise.checkCruise", cruise.getName())); - // check cruise fishing operations Map<String, String> errors = weightComputingService.checkCruise(cruise.getId()); - progressionModel.increments(1); - if (MapUtils.isNotEmpty(errors)) { // there is some fishing operations with some errors @@ -283,6 +329,13 @@ } } + protected void increments(ProgressionModel progressionModel, + String message) { + if (progressionModel != null) { + progressionModel.increments(message); + } + } + protected void exportCruise(Cruise cruise, ExportContext exportContext, ProgressionModel progressionModel) { @@ -300,51 +353,42 @@ } String cruiseName = cruise.getName(); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportSurvey", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportSurvey", cruiseName)); exportSurvey(exportContext, cruise); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportGearCaracteristics", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportGearCaracteristics", cruiseName)); exportGearCaracteristics(exportContext, cruise); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportOperations", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportOperations", cruiseName)); exportOperations(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportParameters", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportParameters", cruiseName)); exportParameters(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportMarineLitters", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportMarineLitters", cruiseName)); exportMarineLitters(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportIndividualObservations", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportIndividualObservations", cruiseName)); exportIndividualObservations(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportAccidentalCatches", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportAccidentalCatches", cruiseName)); exportAccidentalCatch(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportCatches", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportCatches", cruiseName)); exportCatches(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportSpecies", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportSpecies", cruiseName)); + exportSpecies(exportContext, exportContext.getSpeciesToExport()); - exportSpecies(exportContext, exportContext.getSpeciesToExport()); - progressionModel.increments(1); } protected void exportSurvey(ExportContext exportContext, @@ -444,7 +488,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(_("tutti.service.export.marineLitters.error"), e); } } @@ -470,7 +514,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(_("tutti.service.export.individualObservations.error"), e); } } @@ -489,7 +533,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(_("tutti.service.export.accidentalCatch.error"), e); } } @@ -593,7 +637,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("tutti.service.export.catches.error"), e); + _("tutti.service.export.species.error"), e); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -25,8 +25,6 @@ */ -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; - import java.io.File; import java.io.Serializable; @@ -43,17 +41,19 @@ /** Report to use. */ protected File report; - /** Input data file. */ - protected File inputFile; + /** + * Selected cruise id (of fishing operation). + */ + protected String cruiseId; + /** + * Selected fishing operation to report. + */ + protected String fishingOperationId; + /** Where to generate the report. */ protected File outputFile; - /** - * Selected - */ - protected FishingOperation fishingOperation; - public File getReport() { return report; } @@ -62,14 +62,22 @@ this.report = report; } - public File getInputFile() { - return inputFile; + public String getCruiseId() { + return cruiseId; } - public void setInputFile(File inputFile) { - this.inputFile = inputFile; + public void setCruiseId(String cruiseId) { + this.cruiseId = cruiseId; } + public String getFishingOperationId() { + return fishingOperationId; + } + + public void setFishingOperationId(String fishingOperationId) { + this.fishingOperationId = fishingOperationId; + } + public File getOutputFile() { return outputFile; } @@ -77,12 +85,4 @@ public void setOutputFile(File outputFile) { this.outputFile = outputFile; } - - public FishingOperation getFishingOperation() { - return fishingOperation; - } - - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; - } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -27,10 +27,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationIOUtil; import fr.ifremer.shared.application.ApplicationTechnicalException; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.AbstractTuttiService; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.service.export.generic.TuttiExportService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.birt.core.exception.BirtException; @@ -54,6 +57,8 @@ import java.util.Map; import java.util.logging.Level; +import static org.nuiton.i18n.I18n._; + /** * To generate some reports. * @@ -83,6 +88,48 @@ protected EngineConfig engineConfig; + protected static class ReportContext { + + /** + * Incoming reportm model. + */ + final ReportModel model; + + /** + * Selected fishing operation. + */ + final FishingOperation fishingOperation; + + /** + * Where export is exploded. + */ + final File exportDirectory; + + public ReportContext(ReportModel model, + FishingOperation fishingOperation, + File exportFileDirectory) { + this.model = model; + this.fishingOperation = fishingOperation; + this.exportDirectory = exportFileDirectory; + } + + public File getExportDirectory() { + return exportDirectory; + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public File getReport() { + return model.getReport(); + } + + public File getOutputFile() { + return model.getOutputFile(); + } + } + @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); @@ -91,7 +138,7 @@ engineConfig = new EngineConfig(); engineConfig.setBIRTHome(context.getConfig().getReportHomeDirectory().getAbsolutePath()); engineConfig.setResourcePath(context.getConfig().getReportHomeDirectory().getAbsolutePath()); - engineConfig.setLogConfig(null, Level.FINE); + engineConfig.setLogConfig(context.getConfig().getReportLogFile().getAbsolutePath(), Level.FINE); // Get the instance of the engine try { @@ -102,8 +149,6 @@ factory = (IReportEngineFactory) Platform.createFactoryObject( IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY); - - } public ReportModel createModel() { @@ -114,45 +159,57 @@ return model; } - public void generateReport(ReportModel model) { + public void generateReport(ReportModel model, + ProgressionModel progressionModel) { Preconditions.checkNotNull(model); - Preconditions.checkNotNull(model.getFishingOperation()); Preconditions.checkNotNull(model.getReport()); - Preconditions.checkNotNull(model.getInputFile()); + Preconditions.checkState(model.getReport().exists()); + Preconditions.checkNotNull(model.getCruiseId()); + Preconditions.checkNotNull(model.getFishingOperationId()); Preconditions.checkNotNull(model.getOutputFile()); - Preconditions.checkState(model.getReport().exists()); - Preconditions.checkState(model.getInputFile().exists()); + // load fishing operation + progressionModel.increments(_("tutti.report.step.load.fishingOperation")); + FishingOperation operation = getService(PersistenceService.class). + getFishingOperation(model.getFishingOperationId()); + + // export fishing operation + progressionModel.increments(_("tutti.report.step.export.fishingOperation")); + File exportDirectory = getService(TuttiExportService.class). + exportCruiseToFileSystem(model.getCruiseId()); + + ReportContext reportContext = new ReportContext(model, + operation, + exportDirectory); + + generateReport(reportContext, progressionModel); + } + + protected void generateReport(ReportContext reportContext, + ProgressionModel progressionModel) { + + Preconditions.checkNotNull(reportContext.getFishingOperation()); + Preconditions.checkNotNull(reportContext.getExportDirectory()); + Preconditions.checkState(reportContext.getExportDirectory().exists()); + // explode input zip file - File dataDirectory = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - model.getInputFile(), - "Could not explode data zip file"); - // get all directories of exploded archive - File[] directories = dataDirectory.listFiles(new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.isDirectory(); - } - }); - // should have a unique directory - Preconditions.checkState(directories.length == 1, - "Archive should contains a unique directory"); - dataDirectory = directories[0]; + File dataDirectory = reportContext.getExportDirectory(); if (log.isInfoEnabled()) { log.info("Will generate report using report " + - model.getReport().getName()); + reportContext.getReport().getName()); } + progressionModel.increments(_("tutti.report.step.generateReport", reportContext.getReport().getName())); + IReportEngine engine = factory.createReportEngine(engineConfig); try { // Get the report document IReportRunnable rptDoc = - engine.openReportDesign(model.getReport().getAbsolutePath()); + engine.openReportDesign(reportContext.getReport().getAbsolutePath()); // Report context Map<String, Object> context = Maps.newHashMap(); @@ -166,7 +223,7 @@ // Configure the render options IRenderOption renderOption = new RenderOption(); - renderOption.setOutputFileName(model.getOutputFile().getAbsolutePath()); + renderOption.setOutputFileName(reportContext.getOutputFile().getAbsolutePath()); renderOption.setOutputFormat(IRenderOption.OUTPUT_FORMAT_PDF); // Create the render task @@ -174,8 +231,8 @@ task.setRenderOption(renderOption); task.setAppContext(context); task.setParameterValue("rpt-param_dirfile", dataDirectory.getAbsolutePath()); - task.setParameterValue("rpt-param_codestation", model.getFishingOperation().getStationNumber()); - task.setParameterValue("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); + task.setParameterValue("rpt-param_codestation", reportContext.getFishingOperation().getStationNumber()); + task.setParameterValue("rpt-param_numerotrait", reportContext.getFishingOperation().getFishingOperationNumber()); // render task.run(); @@ -184,7 +241,7 @@ task.close(); if (log.isInfoEnabled()) { - log.info("Report generated at " + model.getOutputFile()); + log.info("Report generated at " + reportContext.getOutputFile()); } } catch (Exception e) { Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -64,18 +64,25 @@ tutti.propety.no.vessel.name= tutti.propety.no.zone= tutti.propety.vessel.nation.registrationCode= +tutti.report.step.export.fishingOperation= +tutti.report.step.generateReport= +tutti.report.step.load.fishingOperation= tutti.service.compressZipFile.error= tutti.service.context.serviceInstanciation.error= tutti.service.csv.parse.entityNotFound= tutti.service.cvs.format.error= tutti.service.cvs.mandatory.value= +tutti.service.export.accidentalCatch.error= tutti.service.export.catches.error= tutti.service.export.closeContext.error= tutti.service.export.context.error= +tutti.service.export.individualObservations.error= tutti.service.export.invalid.cruise= tutti.service.export.invalid.fishingOperation= +tutti.service.export.marineLitters.error= tutti.service.export.operations.error= tutti.service.export.parameters.error= +tutti.service.export.species.error= tutti.service.export.survey.error= tutti.service.export.zip.error= tutti.service.exportCruise.buildZip= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -64,18 +64,25 @@ tutti.propety.no.vessel.name=Nom inconnu tutti.propety.no.zone=Pas de zone tutti.propety.vessel.nation.registrationCode=%s (nat.) +tutti.report.step.export.fishingOperation=Exporter le trait sélectionné +tutti.report.step.generateReport=Générer le rapport +tutti.report.step.load.fishingOperation=Charger le trait sélectionné tutti.service.compressZipFile.error=Erreur lors de la compression du dossier %1s dans le fichier %2s tutti.service.context.serviceInstanciation.error=Erreur lors de l'instanciation du service %s tutti.service.csv.parse.entityNotFound=L'entité de type %1s avec la propriété %2s de valeur %3s n'a pas été trouvée tutti.service.cvs.format.error=Erreur lors du formatage de la valeur %s tutti.service.cvs.mandatory.value=Valeur obligatoire +tutti.service.export.accidentalCatch.error=Erreur lors de l'export des captures accidentelles tutti.service.export.catches.error=Erreur lors de l'export des captures tutti.service.export.closeContext.error=Erreur lors de la fermeture du contexte d'export tutti.service.export.context.error=Erreur lors de la création des fichiers pour l'export +tutti.service.export.individualObservations.error=Erreur lors de l'export des observations individuelles tutti.service.export.invalid.cruise=Erreur d'élévation de poids sur les traits de la campagne %s \:<ul>%s</ul> tutti.service.export.invalid.fishingOperation=<li>L'élévation des poids ne peut pas être réalisée sur le trait %s, pour la raison suivante \:<ul><li>%s</li></ul></li> +tutti.service.export.marineLitters.error=Erreur lors de l'export des macro-déchets tutti.service.export.operations.error=Erreur lors de l'export des traits tutti.service.export.parameters.error=Erreur lors de l'export des paramètres +tutti.service.export.species.error=Erreur lors de l'export des espèces tutti.service.export.survey.error=Erreur lors de l'export de la campagne tutti.service.export.zip.error=Erreur lors de la création du zip d'export %s tutti.service.exportCruise.buildZip=Création de l'archive de l'export (fichier %s) Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -3,9 +3,9 @@ import fr.ifremer.shared.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.export.generic.TuttiExportService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -53,21 +53,56 @@ dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID); service = serviceContext.getService(ReportService.class); - } @Test public void testGenerateReport() throws Exception { - // export campaign data - File exportFile = new File(dbResource.getConfig().getTmpDirectory(), "exportMEDITS-2013.zip"); + // copy report resources from class-path + File sourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "2013.12.05"); + File targetDirectory = dbResource.getConfig().getReportHomeDirectory(); if (log.isInfoEnabled()) { - log.info("Export to " + exportFile); + log.info("Prepare report birt home at " + targetDirectory); } + ApplicationIOUtil.copyDirectory(sourceDirectory, targetDirectory, "Could not copy report directory"); + + // get reports + List<File> availableReports = service.getAvailableReports(); + Assert.assertNotNull(availableReports); + Assert.assertFalse(availableReports.isEmpty()); + Assert.assertEquals(1, availableReports.size()); + + // get unique report file + File reportFileName = availableReports.get(0); + + ReportModel model = createReportModel(); + model.setReport(reportFileName); + model.setCruiseId(CRUISE_ID); + model.setFishingOperationId(OPERATION_1_ID); + + // report must NOT exist + Assert.assertFalse(model.getOutputFile().exists()); + ProgressionModel progressionModel = new ProgressionModel(); - progressionModel.setTotal(9); - dbResource.getServiceContext().getService(TuttiExportService.class).exportCruise(CRUISE_ID, exportFile, progressionModel); + progressionModel.setTotal(3); + FishingOperation fishingOperation = FishingOperations.newFishingOperation(); + fishingOperation.setId(OPERATION_1_ID); + fishingOperation.setFishingOperationNumber(53); + fishingOperation.setStationNumber("G101"); + + + + // generate report + service.generateReport(model, progressionModel); + + // report must exist + Assert.assertTrue(model.getOutputFile().exists()); + } + + @Test + public void testGenerateReportFromExport() throws Exception { + // copy report resources from class-path File sourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "2013.12.05"); File targetDirectory = dbResource.getConfig().getReportHomeDirectory(); @@ -76,7 +111,15 @@ } ApplicationIOUtil.copyDirectory(sourceDirectory, targetDirectory, "Could not copy report directory"); - ReportModel model = service.createModel(); + // copy export resources from class-path + File exportSourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "exportCruise"); + File exportTargetDirectory = dbResource.getConfig().newTempFile("exportCruise"); + if (log.isInfoEnabled()) { + log.info("Prepare export at " + exportTargetDirectory); + } + ApplicationIOUtil.copyDirectory(exportSourceDirectory, exportTargetDirectory, "Could not copy report directory"); + + // get reports List<File> availableReports = service.getAvailableReports(); Assert.assertNotNull(availableReports); Assert.assertFalse(availableReports.isEmpty()); @@ -84,18 +127,39 @@ // get unique report file File reportFileName = availableReports.get(0); + + ReportModel model = createReportModel(); model.setReport(reportFileName); - model.setInputFile(exportFile); + model.setCruiseId(CRUISE_ID); + model.setFishingOperationId(OPERATION_1_ID); - // set fishing operation - FishingOperation fishingOperation = dataContext.operations.get(0); - model.setFishingOperation(fishingOperation); + // report must NOT exist + Assert.assertFalse(model.getOutputFile().exists()); + ProgressionModel progressionModel = new ProgressionModel(); + progressionModel.setTotal(3); + + FishingOperation fishingOperation = FishingOperations.newFishingOperation(); + fishingOperation.setId(OPERATION_1_ID); + fishingOperation.setFishingOperationNumber(53); + fishingOperation.setStationNumber("G101"); + + ReportService.ReportContext reportContext = new ReportService.ReportContext( + model, + fishingOperation, + exportTargetDirectory + ); + // generate report - Assert.assertFalse(model.getOutputFile().exists()); - service.generateReport(model); + service.generateReport(reportContext, progressionModel); // report must exist Assert.assertTrue(model.getOutputFile().exists()); } + + public ReportModel createReportModel() { + ReportModel model = service.createModel(); + model.setOutputFile(new File(model.getOutputFile().getAbsolutePath()+"_"+System.nanoTime())); + return model; + } } Added: trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue Added: trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,186 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;1;;cm;0.5;1;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;2;;cm;0.5;1;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;3;;cm;0.5;2;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;4;;cm;0.5;1;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;1;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;2;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;3;;cm;0.5;10;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;4;;cm;0.5;13;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;5;;cm;0.5;18;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.0;6;;cm;0.5;11;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;7;;cm;0.5;4;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.0;8;;cm;0.5;4;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;9;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;10;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;11;;cm;0.5;3;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;12;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;1;;cm;0.5;1;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;3;;cm;0.5;3;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.0;4;;cm;0.5;7;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;5;;cm;0.5;4;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.0;6;;cm;0.5;6;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;7;;cm;0.5;5;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;8;;cm;0.5;4;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.5;9;;cm;0.5;9;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;10;;cm;0.5;5;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;11;;cm;0.5;4;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;12;;cm;0.5;2;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;13;;cm;0.5;1;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;14;;cm;0.5;1;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;1;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;2;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;3;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;4;;cm;0.5;4;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;5;;cm;0.5;12;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;6;;cm;0.5;9;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;7;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;8;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;9;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;10;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;11;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.0;12;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.5;13;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;1;;cm;0.5;3;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.5;2;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;3;;cm;0.5;3;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;4;;cm;0.5;3;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;5;;cm;0.5;6;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;6;;cm;0.5;5;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;7;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;8;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;9;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;10;;cm;0.5;1;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;11;;cm;0.5;4;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;12;;cm;0.5;1;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;23.5;13;;cm;0.5;1;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;1;;cm;0.5;4;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;2;;cm;0.5;3;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;3;;cm;0.5;8;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;4;;cm;0.5;17;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;5;;cm;0.5;7;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;6;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;7;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.5;8;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;22.0;9;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;1;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;2;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;3;;cm;0.5;2;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;4;;cm;0.5;3;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.5;5;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;6;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;7;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;1;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;2;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;3;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;4;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.0;5;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;6;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.0;7;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;8;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;9;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;10;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;11;;cm;0.5;4;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;12;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;13;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;14;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;15;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;16;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.5;17;;cm;0.5;5;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;18;;cm;0.5;5;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.5;19;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.0;20;;cm;0.5;4;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.5;21;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;22.0;22;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;22.5;23;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;23.0;24;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;23.5;25;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;24.0;26;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;24.5;27;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;25.5;28;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;26.0;29;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;6.5;1;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;7.0;2;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;7.5;3;;cm;0.5;4;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.0;4;;cm;0.5;9;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.5;5;;cm;0.5;6;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;6;;cm;0.5;6;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;7;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;8;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;9;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;10;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;11;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;12;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;13;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;14;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1899;Scorpaena notata;;Vrac;17;0.13;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;3;0.13;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1629;Serranus hepatus;;Vrac;18;0.435;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;32;0.435;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;491;Alloteuthis;;Vrac;19;0.14;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;17;0.14;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1356;Sprattus sprattus;;Vrac;20;0.925;0.18;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;30;0.18;14.805499; +2013;MEDITS;;GOC73;G101;53;1;;1971;Arnoglossus laterna;;Vrac;21;0.055;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;13;0.055;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1791;Lesueurigobius friesii;;Vrac;22;0.125;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;29;0.125;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1785;Gobius niger;;Vrac;23;0.13;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;8;0.13;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1917;Lepidotrigla cavillone;;Vrac;24;0.03;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.03;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;2004;Buglossidium luteum;;Vrac;25;0.02;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.02;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1812;Callionymus maculatus;;Vrac;26;0.004;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.004;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;468;Sepia elegans;;Vrac;27;0.012;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.012;2.8810704; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;1;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;2;;cm;0.5;3;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;3;;cm;0.5;6;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;4;;cm;0.5;3;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;5;;cm;0.5;2;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;6;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;7;;cm;0.5;5;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.5;8;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;9;;cm;0.5;2;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.5;10;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;7.5;1;;cm;0.5;1;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.0;2;;cm;0.5;9;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.5;3;;cm;0.5;9;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;4;;cm;0.5;4;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;5;;cm;0.5;2;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;6;;cm;0.5;2;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;7;;cm;0.5;2;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;8;;cm;0.5;1;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;;Hors Vrac;1;;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.445;1.0; +2013;MEDITS;;GOC73;G101;53;1;;2049;Lophius piscatorius;;Hors Vrac;2;;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;1.175;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1704;Diplodus vulgaris;;Hors Vrac;3;2.25;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;2.25;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1713;Pagellus erythrinus;;Hors Vrac;4;0.76;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.76;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1996;Solea solea;;Hors Vrac;5;1.35;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;1.35;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Hors Vrac;6;0.02;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.02;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1922;Trigloporus lastoviza;;Hors Vrac;7;0.04;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.04;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1818;Blennius ocellaris;;Hors Vrac;8;0.015;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.015;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1628;Serranus cabrilla;;Hors Vrac;9;0.845;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;14;0.845;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1899;Scorpaena notata;;Hors Vrac;10;0.995;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;22;0.995;1.0; +2013;MEDITS;;GOC73;G101;53;1;;521;Eledone moschata;;Hors Vrac;11;0.23;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.23;1.0; +2013;MEDITS;;GOC73;G101;53;1;;514;Octopus vulgaris;;Hors Vrac;12;11.6;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;11.6;1.0; +2013;MEDITS;;GOC73;G101;53;1;;831;Squilla mantis;;Hors Vrac;13;0.037;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.037;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1896;Scorpaena porcus;;Hors Vrac;14;0.935;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;7;0.935;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1956;Scophthalmus rhombus;;Hors Vrac;15;1.14;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;1.14;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1467;Conger conger;;Hors Vrac;16;1.04;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;7;1.04;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1654;Cepola macrophthalma;;Hors Vrac;17;0.045;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.045;1.0; +2013;MEDITS;;GOC73;G101;53;1;;522;Eledone cirrhosa;;Hors Vrac;18;4.65;1.82;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;4.65;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1183;Ascidia mentula;;Vrac;1;0.033;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;5;0.033;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1182;Ascidiacea;;Vrac;2;0.102;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;7;0.102;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;3005;Phallusia mammillata;;Vrac;3;0.005;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.005;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;3037;Alcyonium;;Vrac;4;0.014;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.014;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4410;Nudibranchia;;Vrac;5;0.003;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;3;0.003;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1136;Macropodia rostrata;;Vrac;6;0.003;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.003;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1140;Medorippe lanata;;Vrac;7;0.011;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.011;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1128;Inachus dorsettensis;;Vrac;8;0.016;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;8;0.016;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;8;Suberites;;Vrac;9;0.076;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.076;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;989;Dardanus arrosor;;Vrac;10;0.012;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.012;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4378;Calliactis parasitica;;Vrac;11;0.012;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;4;0.012;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;7;Porifera;;Vrac;12;0.072;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.072;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;11181;Astropecten irregularis pentacanthus;;Vrac;13;0.137;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;20;0.137;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1067;Liocarcinus;;Vrac;14;0.076;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;5;0.076;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;2184;Ocnus planci;;Vrac;15;0.4;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;11;0.4;21.347397; +2013;MEDITS;;GOC73;G101;53;1;;994;Pagurus prideaux;;Vrac;16;0.36;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;29;0.36;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4626;Adamsia carciniopados;;Vrac;17;0.03;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;29;0.03;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;3007;Veretillum cynomorium;;Vrac;18;0.675;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;108;0.675;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;150;Annelida;;Vrac;19;1.1;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;40;1.1;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4667;Nemertesia ramosa;;Vrac;20;0.002;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.002;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;317;Philine aperta;;Vrac;21;0.003;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.003;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1184;Botryllus;;Hors Vrac;1;0.142;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.142;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1158;Ophiothrix fragilis;;Hors Vrac;2;0.005;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.005;1.0; Added: trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Engin;Code_PMFM;Libelle_PMFM;Valeur Added: trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,31 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;220;0.11; +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;307;11.5; +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;220;0.11; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;307;14.0; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100020;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100020;1540;Merluccius merluccius;;307;15.0; +2013;MEDITS;;GOC73;G101;53;1;;100020;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100021;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100021;1540;Merluccius merluccius;;307;15.0; +2013;MEDITS;;GOC73;G101;53;1;;100021;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;220;0.11; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;307;15.5; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;220;0.05; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;307;12.5; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;220;0.05; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;307;15.0; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;220;0.395; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;307;34.5; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;196;Femelle; Added: trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,9 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire +2013;MEDITS;;GOC73;G101;53;1;;L1b Bouteilles;X: UNK - catégorisation non réalisée;3;0.435;; +2013;MEDITS;;GOC73;G101;53;1;;L1c Emballages alimentaires;X: UNK - catégorisation non réalisée;12;0.12;; +2013;MEDITS;;GOC73;G101;53;1;;"L1e Objets en plastique dur - Caisse, récipients, tubes, cendrier, couvercles, etc.";X: UNK - catégorisation non réalisée;4;0.635;; +2013;MEDITS;;GOC73;G101;53;1;;L1g lignes de pêche;X: UNK - catégorisation non réalisée;1;1.7;; +2013;MEDITS;;GOC73;G101;53;1;;L2a Pneus;X: UNK - catégorisation non réalisée;1;3.1;; +2013;MEDITS;;GOC73;G101;53;1;;L3b Autres canettes alimentaires/emballages;X: UNK - catégorisation non réalisée;1;0.16;; +2013;MEDITS;;GOC73;G101;53;1;;L4c Pots en céramique;X: UNK - catégorisation non réalisée;1;0.13;; +2013;MEDITS;;GOC73;G101;53;1;;L8 AUTRES;X: UNK - catégorisation non réalisée;1;40.0;; Added: trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,2 @@ +Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule +2013;MEDITS;;G101;53;1;GOC73;;13/06/2013 05:32:00;42.975418;3.095972;13/06/2013 06:01:00;42.450695;3.09375;29;NA;NA;NA;Y;N;2778.0;NA;NA;NA;Luisa METRAL;;;203.6;Y;61.05;Y;27.72;Y;114.8;N;;?;;?;65.34;Y;37.77;Y;37.767998;Y;27.57;Y;3.907;N;0.0;Y;23.43;Y;23.282;N;3.142;Y;0.147;Y;0.0;Y;0.0;Y;46.28;Y; Added: trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,8 @@ +Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur +2013;MEDITS;;G101;53;1;826;Longueur des funes - opération - totale - Instrument de bord;220.0; +2013;MEDITS;;G101;53;1;905;Longueur d'un bras - engin - bras - Inconnue;100.0; +2013;MEDITS;;G101;53;1;833;Ouverture verticale (chalut ou drague) - opération - totale - Instrument de bord;1.8; +2013;MEDITS;;G101;53;1;828;Ouverture Horizontale aux pointes d'ailes - opération - totale - Instrument de bord;20.0; +2013;MEDITS;;G101;53;1;863;"Température - masse d'eau, eau brute - Fond début de pêche - Instrument de bord";13.9; +2013;MEDITS;;G101;53;1;862;"Température - masse d'eau, eau brute - Fond fin de pêche - Instrument de bord";13.8; +2013;MEDITS;;G101;53;1;173;"Profondeur fond - masse d'eau, eau brute - totale - Inconnue";31.5; Added: trunk/tutti-service/src/test/resources/report/exportCruise/species.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/species.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/species.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,59 @@ +Id;Code_Rubin;Nom Scientifique;Code campagne +7;MBPORIF;Porifera;; +8;SUBE;Suberites;; +150;MBANNEL;Annelida;; +317;PHILAPE;Philine aperta;; +468;SEPIELE;Sepia elegans;; +491;ALLO;Alloteuthis;; +514;OCTPVUL;Octopus vulgaris;; +521;ELEDMOS;Eledone moschata;; +522;ELEDCIR;Eledone cirrhosa;; +831;SQUIMAN;Squilla mantis;; +989;DARDARR;Dardanus arrosor;; +994;PAGUPRI;Pagurus prideaux;; +1067;LIOC;Liocarcinus;; +1128;INACDOR;Inachus dorsettensis;; +1136;MACRROS;Macropodia rostrata;; +1140;MEDOLAN;Medorippe lanata;; +1158;OPHOFRA;Ophiothrix fragilis;; +1182;CLASCID;Ascidiacea;; +1183;ASCDMEN;Ascidia mentula;; +1184;BOTR;Botryllus;; +1356;SPRASPR;Sprattus sprattus;; +1467;CONGCON;Conger conger;; +1540;MERLMER;Merluccius merluccius;; +1558;TRISMIN;Trisopterus minutus;; +1628;SERRCAB;Serranus cabrilla;; +1629;SERRHEP;Serranus hepatus;; +1654;CEPOMAC;Cepola macrophthalma;; +1662;TRACTRA;Trachurus trachurus;; +1663;TRACMED;Trachurus mediterraneus;; +1689;MULLBAR;Mullus barbatus;; +1698;BOOPBOO;Boops boops;; +1704;DIPDVUL;Diplodus vulgaris;; +1713;PAGEERY;Pagellus erythrinus;; +1714;PAGEACA;Pagellus acarne;; +1723;SPICMAE;Spicara maena;; +1785;GOBINIG;Gobius niger;; +1791;LESUFRI;Lesueurigobius friesii;; +1812;CALMMAC;Callionymus maculatus;; +1818;BLENOCE;Blennius ocellaris;; +1896;SCORPOR;Scorpaena porcus;; +1899;SCORNOT;Scorpaena notata;; +1917;LEPRCAV;Lepidotrigla cavillone;; +1920;EUTRGUR;Eutrigla gurnardus;; +1922;TRGPLAS;Trigloporus lastoviza;; +1956;SCOPRHO;Scophthalmus rhombus;; +1971;ARNOLAT;Arnoglossus laterna;; +1996;SOLESOL;Solea solea;; +2004;BUGLLUT;Buglossidium luteum;; +2049;LOPHPIS;Lophius piscatorius;; +2184;OCNUPLA;Ocnus planci;; +3005;PHLLMAM;Phallusia mammillata;; +3007;VERECYN;Veretillum cynomorium;; +3037;ALCY;Alcyonium;; +4378;CLLCPAR;Calliactis parasitica;; +4410;ORNUDIB;Nudibranchia;; +4626;ADAMCAR;Adamsia carciniopados;; +4667;NEMERAM;Nemertesia ramosa;; +11181;ASTPIRP;Astropecten irregularis pentacanthus;; Added: trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,2 @@ +Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire +2013;MEDITS;;;FRA;MEDITS - Golfe du Lion / Corse;MEDITS_2013;;23/05/2013 00:00:00;Toulon;26/06/2013 00:00:00;Sète-Mole et canaux;Angélique JADAUD|Luisa METRAL;Luisa METRAL|Angélique JADAUD;; Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -307,24 +307,6 @@ <goal>update-project-license</goal> <goal>add-third-party</goal> </goals> - <configuration> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0| - Apache License, Version 2.0 - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU LESSER GENERAL PUBLIC LICENSE - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU Lesser General Public License - </licenseMerge> - <licenseMerge> - Common Development and Distribution License (CDDL) v1.0| - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - </licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - </configuration> </execution> </executions> </plugin> Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -7,17 +7,21 @@ # - BSD-style license # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU Affero General Public License v3 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - HSQLDB License +# - ICU License +# - Java HTML Tidy License # - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - MPL 1.1 +# - Mozilla Public License # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 @@ -26,8 +30,21 @@ # Please fill the missing licenses for dependencies : # # -#Tue Dec 03 12:02:44 CET 2013 +#Mon Dec 09 13:48:21 CET 2013 antlr--antlr--2.7.6=BSD License +batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 +batik--batik-bridge--1.6=The Apache Software License, Version 2.0 +batik--batik-css--1.6=The Apache Software License, Version 2.0 +batik--batik-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-ext--1.6=The Apache Software License, Version 2.0 +batik--batik-gvt--1.6=The Apache Software License, Version 2.0 +batik--batik-parser--1.6=The Apache Software License, Version 2.0 +batik--batik-script--1.6=The Apache Software License, Version 2.0 +batik--batik-svg-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-svggen--1.6=The Apache Software License, Version 2.0 +batik--batik-transcoder--1.6=The Apache Software License, Version 2.0 +batik--batik-util--1.6=The Apache Software License, Version 2.0 +batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=Common Development and Distribution License (CDDL) v1.0 Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-12-09 13:51:06 UTC (rev 1436) @@ -4,7 +4,7 @@ cd /d %~dp0% echo lauch java -%JAVA_COMMAND% -Xmx1024M -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=256m -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 set exitcode=%ERRORLEVEL% echo Stop Tutti with exitcode: %exitcode% cd %OLDDIR% Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-12-09 13:51:06 UTC (rev 1436) @@ -1,6 +1,6 @@ #!/bin/bash -MEMORY="-Xmx1024M" +MEMORY="-Xmx1024M -XX:MaxPermSize=256m" #TUTTI_JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" REP=$(dirname $0) Deleted: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -1,368 +0,0 @@ -#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Nov 11 09:59:58 CET 2013 -tutti.config.help=config.html -tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets -tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot -tutti.dbManager.action.closeDb.help=dbManager.html\#actions -tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tutti.dbManager.action.exportDb.help=dbManager.html\#actions -tutti.dbManager.action.importDb.help=dbManager.html\#actions -tutti.dbManager.action.installDb.help=dbManager.html\#actions -tutti.dbManager.action.openDb.help=dbManager.html\#actions -tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions -tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions -tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.reset.help= -tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos -tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.help=editFishingOperation.html\#captureResume -tutti.editCruise.action.close.help=editCruise.html\#actions -tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions -tutti.editCruise.action.generateName.help=editCruise.html\#actions -tutti.editCruise.action.save.help=editCruise.html\#actions -tutti.editCruise.action.viewGearCaracteristics.help= -tutti.editCruise.field.beginDate.help=editCruise.html\#fields -tutti.editCruise.field.comment.help=editCruise.html\#fields -tutti.editCruise.field.country.help=editCruise.html\#fields -tutti.editCruise.field.departureLocation.help=editCruise.html\#fields -tutti.editCruise.field.endDate.help=editCruise.html\#fields -tutti.editCruise.field.gear.help=editCruise.html\#fields -tutti.editCruise.field.headOfMission.help=editCruise.html\#fields -tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields -tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields -tutti.editCruise.field.name.help=editCruise.html\#fields -tutti.editCruise.field.program.help=editCruise.html\#fields -tutti.editCruise.field.returnLocation.help=editCruise.html\#fields -tutti.editCruise.field.surveyPart.help=editCruise.html\#fields -tutti.editCruise.field.vessel.help=editCruise.html\#fields -tutti.editCruise.field.year.help=editCruise.html\#fields -tutti.editCruise.filterVessel.help=editCruise.html\#fields -tutti.editCruise.help=editCruise.html -tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.secondaryVessel.help= -tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.filterSecondaryVesselType.help= -tutti.editFishingOperation.help=editFishingOperation.html\#traitFields -tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions -tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.description.help=editProgram.html\#fields -tutti.editProgram.field.name.help=editProgram.html\#fields -tutti.editProgram.field.zone.help=editProgram.html\#fields -tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos -tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics -tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.help=editSampleCategory.html -tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help= -tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration -tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields -tutti.fishingOperations.help=editFishingOperation.html -tutti.index.help=index.html -tutti.main.action.changeLocale.help=menu.html\#menu_aide -tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.action.showHelp.help=menu.html\#menu_aide -tutti.main.help=index.html -tutti.main.menu.action.about.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration -tutti.main.menu.action.editCatches.help=menu.html\#menu_action -tutti.main.menu.action.editCruise.help=menu.html\#menu_action -tutti.main.menu.action.editProgram.help=menu.html\#menu_action -tutti.main.menu.action.editProtocol.help=menu.html\#menu_action -tutti.main.menu.action.editSampleCategoryModel.help= -tutti.main.menu.action.exit.help=menu.html\#menu_fichier -tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration -tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier -tutti.main.menu.action.report.help= -tutti.main.menu.action.selectCruise.help=menu.html\#menu_action -tutti.main.menu.action.showHelp.help=menu.html\#menu_aide -tutti.main.menu.action.site.help=menu.html\#menu_aide -tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier -tutti.main.menu.action.updateReport.help= -tutti.main.menu.action.validateCatches.help=menu.html\#menu_action -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel -tutti.report.action.cancel.help= -tutti.report.action.chooseInputFile.help= -tutti.report.action.chooseOutputFile.help= -tutti.report.action.generate.help= -tutti.report.action.showOutputFile.help= -tutti.report.field.inputFile.help= -tutti.report.field.outputFile.help= -tutti.report.field.report.help= -tutti.report.help= -tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions -tutti.selectCruise.field.cruise.help=selectCruise.html\#fields -tutti.selectCruise.field.program.help=selectCruise.html\#fields -tutti.selectCruise.field.protocol.help=selectCruise.html\#fields -tutti.selectCruise.help=selectCruise.html -tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Deleted: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -1,368 +0,0 @@ -#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Nov 11 09:59:58 CET 2013 -tutti.config.help=config.html -tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets -tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot -tutti.dbManager.action.closeDb.help=dbManager.html\#actions -tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tutti.dbManager.action.exportDb.help=dbManager.html\#actions -tutti.dbManager.action.importDb.help=dbManager.html\#actions -tutti.dbManager.action.installDb.help=dbManager.html\#actions -tutti.dbManager.action.openDb.help=dbManager.html\#actions -tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions -tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions -tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.reset.help= -tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos -tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.help=editFishingOperation.html\#captureResume -tutti.editCruise.action.close.help=editCruise.html\#actions -tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions -tutti.editCruise.action.generateName.help=editCruise.html\#actions -tutti.editCruise.action.save.help=editCruise.html\#actions -tutti.editCruise.action.viewGearCaracteristics.help= -tutti.editCruise.field.beginDate.help=editCruise.html\#fields -tutti.editCruise.field.comment.help=editCruise.html\#fields -tutti.editCruise.field.country.help=editCruise.html\#fields -tutti.editCruise.field.departureLocation.help=editCruise.html\#fields -tutti.editCruise.field.endDate.help=editCruise.html\#fields -tutti.editCruise.field.gear.help=editCruise.html\#fields -tutti.editCruise.field.headOfMission.help=editCruise.html\#fields -tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields -tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields -tutti.editCruise.field.name.help=editCruise.html\#fields -tutti.editCruise.field.program.help=editCruise.html\#fields -tutti.editCruise.field.returnLocation.help=editCruise.html\#fields -tutti.editCruise.field.surveyPart.help=editCruise.html\#fields -tutti.editCruise.field.vessel.help=editCruise.html\#fields -tutti.editCruise.field.year.help=editCruise.html\#fields -tutti.editCruise.filterVessel.help=editCruise.html\#fields -tutti.editCruise.help=editCruise.html -tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.secondaryVessel.help= -tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.filterSecondaryVesselType.help= -tutti.editFishingOperation.help=editFishingOperation.html\#traitFields -tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions -tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.description.help=editProgram.html\#fields -tutti.editProgram.field.name.help=editProgram.html\#fields -tutti.editProgram.field.zone.help=editProgram.html\#fields -tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos -tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics -tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.help=editSampleCategory.html -tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help= -tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration -tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields -tutti.fishingOperations.help=editFishingOperation.html -tutti.index.help=index.html -tutti.main.action.changeLocale.help=menu.html\#menu_aide -tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.action.showHelp.help=menu.html\#menu_aide -tutti.main.help=index.html -tutti.main.menu.action.about.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration -tutti.main.menu.action.editCatches.help=menu.html\#menu_action -tutti.main.menu.action.editCruise.help=menu.html\#menu_action -tutti.main.menu.action.editProgram.help=menu.html\#menu_action -tutti.main.menu.action.editProtocol.help=menu.html\#menu_action -tutti.main.menu.action.editSampleCategoryModel.help= -tutti.main.menu.action.exit.help=menu.html\#menu_fichier -tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration -tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier -tutti.main.menu.action.report.help= -tutti.main.menu.action.selectCruise.help=menu.html\#menu_action -tutti.main.menu.action.showHelp.help=menu.html\#menu_aide -tutti.main.menu.action.site.help=menu.html\#menu_aide -tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier -tutti.main.menu.action.updateReport.help= -tutti.main.menu.action.validateCatches.help=menu.html\#menu_action -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel -tutti.report.action.cancel.help= -tutti.report.action.chooseInputFile.help= -tutti.report.action.chooseOutputFile.help= -tutti.report.action.generate.help= -tutti.report.action.showOutputFile.help= -tutti.report.field.inputFile.help= -tutti.report.field.outputFile.help= -tutti.report.field.report.help= -tutti.report.help= -tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions -tutti.selectCruise.field.cruise.help=selectCruise.html\#fields -tutti.selectCruise.field.program.help=selectCruise.html\#fields -tutti.selectCruise.field.protocol.help=selectCruise.html\#fields -tutti.selectCruise.help=selectCruise.html -tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Copied: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties (from rev 1432, trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties) =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,368 @@ +#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo +#Sun Dec 08 10:30:36 CET 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles +tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles +tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets +tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot +tutti.dbManager.action.closeDb.help=dbManager.html\#actions +tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions +tutti.dbManager.action.exportDb.help=dbManager.html\#actions +tutti.dbManager.action.importDb.help=dbManager.html\#actions +tutti.dbManager.action.installDb.help=dbManager.html\#actions +tutti.dbManager.action.openDb.help=dbManager.html\#actions +tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions +tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions +tutti.dbManager.help=dbManager.html +tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles +tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.reset.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos +tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.help=editFishingOperation.html\#captureResume +tutti.editCruise.action.close.help=editCruise.html\#actions +tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions +tutti.editCruise.action.generateName.help=editCruise.html\#actions +tutti.editCruise.action.save.help=editCruise.html\#actions +tutti.editCruise.action.viewGearCaracteristics.help= +tutti.editCruise.field.beginDate.help=editCruise.html\#fields +tutti.editCruise.field.comment.help=editCruise.html\#fields +tutti.editCruise.field.country.help=editCruise.html\#fields +tutti.editCruise.field.departureLocation.help=editCruise.html\#fields +tutti.editCruise.field.endDate.help=editCruise.html\#fields +tutti.editCruise.field.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields +tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields +tutti.editCruise.field.name.help=editCruise.html\#fields +tutti.editCruise.field.program.help=editCruise.html\#fields +tutti.editCruise.field.returnLocation.help=editCruise.html\#fields +tutti.editCruise.field.surveyPart.help=editCruise.html\#fields +tutti.editCruise.field.vessel.help=editCruise.html\#fields +tutti.editCruise.field.year.help=editCruise.html\#fields +tutti.editCruise.filterVessel.help=editCruise.html\#fields +tutti.editCruise.help=editCruise.html +tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.secondaryVessel.help= +tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.filterSecondaryVesselType.help= +tutti.editFishingOperation.help=editFishingOperation.html\#traitFields +tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles +tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions +tutti.editProgram.action.saveProgram.help=editProgram.html\#actions +tutti.editProgram.field.description.help=editProgram.html\#fields +tutti.editProgram.field.name.help=editProgram.html\#fields +tutti.editProgram.field.zone.help=editProgram.html\#fields +tutti.editProgram.help=editProgram.html +tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos +tutti.editProtocol.field.comment.help=editProtocol.html\#fields +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.name.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.help=editProtocol.html +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics +tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.help=editSampleCategory.html +tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration +tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields +tutti.fishingOperations.help=editFishingOperation.html +tutti.index.help=index.html +tutti.main.action.changeLocale.help=menu.html\#menu_aide +tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide +tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide +tutti.main.action.showHelp.help=menu.html\#menu_aide +tutti.main.help=index.html +tutti.main.menu.action.about.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide +tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration +tutti.main.menu.action.editCatches.help=menu.html\#menu_action +tutti.main.menu.action.editCruise.help=menu.html\#menu_action +tutti.main.menu.action.editProgram.help=menu.html\#menu_action +tutti.main.menu.action.editProtocol.help=menu.html\#menu_action +tutti.main.menu.action.editSampleCategoryModel.help= +tutti.main.menu.action.exit.help=menu.html\#menu_fichier +tutti.main.menu.action.generateCruiseReport.help=menu.html\#menu_action +tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration +tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier +tutti.main.menu.action.selectCruise.help=menu.html\#menu_action +tutti.main.menu.action.showHelp.help=menu.html\#menu_aide +tutti.main.menu.action.site.help=menu.html\#menu_aide +tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier +tutti.main.menu.action.updateReport.help= +tutti.main.menu.action.validateCatches.help=menu.html\#menu_action +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel +tutti.report.action.cancel.help=report.html\#action +tutti.report.action.chooseOutputFile.help=report.html\#action +tutti.report.action.generate.help=report.html\#action +tutti.report.action.showOutputFile.help=report.html\#fields +tutti.report.field.fishingOperation.help=report.html\#fields +tutti.report.field.outputFile.help=report.html\#fields +tutti.report.field.report.help=report.html\#fields +tutti.report.help=report.html +tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.generateCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions +tutti.selectCruise.field.cruise.help=selectCruise.html\#fields +tutti.selectCruise.field.program.help=selectCruise.html\#fields +tutti.selectCruise.field.protocol.help=selectCruise.html\#fields +tutti.selectCruise.help=selectCruise.html +tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions +tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions +tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions +tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -455,8 +455,7 @@ _("tutti.help.mkDir.error", helpDirectory)); // load help mapping - String mappingProperties = - "/tutti-help-" + i18nLocale.getLanguage() + ".properties"; + String mappingProperties = "/tutti-help.properties"; try { InputStream resourceAsStream = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.report.ReportModel; import fr.ifremer.tutti.ui.swing.content.report.ReportUI; import fr.ifremer.tutti.ui.swing.content.report.ReportUIHandler; @@ -60,8 +61,12 @@ public void doAction() throws Exception { Preconditions.checkState(getModel().isValid()); + ProgressionModel progressionModel = new ProgressionModel(); + setProgressionModel(progressionModel); + progressionModel.setTotal(4); // get data / export / generate ReportModel reportModel = getModel().toBean(); - getContext().getReportService().generateReport(reportModel); + getContext().getReportService().generateReport( + reportModel, progressionModel); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-12-09 13:51:06 UTC (rev 1436) @@ -62,16 +62,6 @@ _help: {"tutti.main.menu.action.editSampleCategoryModel.help"}; } -#menuFileReport { - actionIcon: report; - text: "tutti.main.action.report"; - toolTipText: "tutti.main.action.report.tip"; - i18nMnemonic: "tutti.main.action.report.mnemonic"; - enabled: {model.getScreen() != TuttiScreen.REPORT}; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ShowReportAction.class}; - _help: {"tutti.main.menu.action.report.help"}; -} - #menuFileExit { actionIcon: exit; text: "tutti.main.action.exit"; @@ -174,6 +164,16 @@ _help: {"tutti.main.menu.action.editCruise.help"}; } +#menuActionGenerateCruiseReport { + actionIcon: report; + text: "tutti.main.action.generateSelectedCruiseReport"; + toolTipText: "tutti.main.action.generateSelectedCruiseReport.tip"; + i18nMnemonic: "tutti.main.action.generateSelectedCruiseReport.mnemonic"; + enabled: {model.getScreen() != TuttiScreen.REPORT && model.isCruiseFilled()}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ShowReportAction.class}; + _help: {"tutti.main.menu.action.generateSelectedCruiseReport.help"}; +} + #menuActionEditProtocol { actionIcon: protocol; text: "tutti.main.action.editSelectedProtocol"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-12-09 13:51:06 UTC (rev 1436) @@ -73,8 +73,6 @@ <JMenuItem id='menuFileUpdateReport'/> <JSeparator/> <JMenuItem id='menuFileManageDb'/> -  -  <JSeparator/> <JMenuItem id='menuFileExit'/> </JMenu> @@ -86,6 +84,7 @@ <JMenuItem id='menuActionEditProtocol'/> <JMenuItem id='menuActionEditCatches'/> <JMenuItem id='menuActionValidateCatches'/> + <JMenuItem id='menuActionGenerateCruiseReport'/> </JMenu> <JMenu id='menuAdministration'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -48,6 +48,7 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; +import fr.ifremer.tutti.ui.swing.content.report.ReportUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -443,12 +444,12 @@ icon = ui.getMenuActionValidateCatches().getIcon(); break; -// case REPORT: -// -// screenUI = new ReportUI(ui); -// screenTitle = _("tutti.report.title"); -// icon = ui.getMenuFileReport().getIcon(); -// break; + case REPORT: + + screenUI = new ReportUI(ui); + screenTitle = _("tutti.report.title"); + icon = ui.getMenuActionGenerateCruiseReport().getIcon(); + break; } JButton showHelp = ui.getShowHelp(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -221,6 +221,9 @@ .addOption(TuttiConfigurationOption.REPORT_DIRECTORY) .setOptionShortLabel(_("tutti.config.option.service.report.directory.shortLabel")) + .addOption(TuttiConfigurationOption.REPORT_LOG_FILE) + .setOptionShortLabel(_("tutti.config.option.service.report.log.file.shortLabel")) + .addOption(TuttiConfigurationOption.DB_DIRECTORY) .setOptionShortLabel(_("tutti.config.option.persistence.db.directory.shortLabel")) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2013-12-09 13:51:06 UTC (rev 1436) @@ -56,16 +56,17 @@ _validatorLabel: {_("tutti.report.field.report")}; } -#inputFileLabel { - text: "tutti.report.field.inputFile"; - labelFor: {inputFileField}; - toolTipText: "tutti.report.field.inputFile.tip"; - _help: {"tutti.report.field.inputFile.help"}; +#fishingOperationLabel { + text: "tutti.report.field.fishingOperation"; + labelFor: {fishingOperationComboBox}; + toolTipText: "tutti.report.field.fishingOperation.tip"; + _help: {"tutti.report.field.fishingOperation.help"}; } -#inputFileField { - selectedFile: {model.getInputFile()}; - _validatorLabel: {_("tutti.report.field.inputFile")}; +#fishingOperationComboBox { + property: fishingOperation; + selectedItem: {model.getFishingOperation()}; + _validatorLabel: {_("tutti.report.field.fishingOperation")}; } #outputFileLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2013-12-09 13:51:06 UTC (rev 1436) @@ -25,6 +25,8 @@ implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<ReportUIModel, ReportUIHandler>'> <import> + fr.ifremer.tutti.persistence.entities.data.FishingOperation + fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -39,7 +41,6 @@ </import> <script><![CDATA[ - public ReportUI(TuttiUI parentUI) { TuttiUIUtil.setParentUI(this, parentUI); } @@ -52,15 +53,27 @@ <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <field name='fishingOperation' component='fishingOperationComboBox'/> <field name='report' component='reportComboBox'/> - <field name='inputFile' component='inputFileField'/> <field name='outputFile' component='outputFileField'/> </BeanValidator> <Table id='form' fill='both'> -  +  <row> + <cell> + <JLabel id='fishingOperationLabel'/> + </cell> + <cell> + <BeanFilterableComboBox id='fishingOperationComboBox' + constructorParams='this' + genericType='FishingOperation'/> + </cell> + </row> + +  + <row> <cell anchor='west'> <JLabel id='reportLabel'/> </cell> @@ -70,20 +83,9 @@ </cell> </row> -  +  <row> <cell> - <JLabel id='inputFileLabel'/> - </cell> - <cell> - <FileEditor id='inputFileField' - onActionPerformed='handler.setFile(event, "inputFile")'/> - </cell> - </row> - -  - <row> - <cell> <JLabel id='outputFileLabel'/> </cell> <cell> @@ -99,7 +101,7 @@ </cell> </row> -  +  <row anchor='south'> <cell columns='2'> <JPanel layout='{new GridLayout(1, 0)}'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.shared.application.swing.util.CloseableUI; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -61,14 +62,21 @@ ReportService reportService = getContext().getReportService(); - getDataContext().resetValidationDataContext(); - ReportUIModel model = new ReportUIModel(); + // set cruiseId + String cruiseId = getDataContext().getCruiseId(); + model.setCruiseId(cruiseId); + // get all report availables List<File> reports = reportService.getAvailableReports(); model.setReports(reports); + // get all fishing operation + List<FishingOperation> fishingOperations = + getContext().getPersistenceService().getAllFishingOperation(cruiseId); + model.setFishingOperations(fishingOperations); + // get default output file name File outputFile = reportService.getDefaultOutputFile(); model.setOutputFile(outputFile); @@ -89,17 +97,15 @@ Lists.newArrayList(model.getReports()), model.getReport()); - FileEditor inputFileField = ui.getInputFileField(); - inputFileField.setDirectoryEnabled(false); - inputFileField.setFileEnabled(true); - inputFileField.setExts(".csv"); - inputFileField.setExtsDescription("Fichier csv"); + initBeanFilterableComboBox(ui.getFishingOperationComboBox(), + Lists.newArrayList(model.getFishingOperations()), + model.getFishingOperation()); FileEditor outputFileField = ui.getOutputFileField(); outputFileField.setDirectoryEnabled(false); outputFileField.setFileEnabled(true); outputFileField.setExts(".pdf"); - outputFileField.setExtsDescription("Fichier pdf"); + outputFileField.setExtsDescription(_("tutti.common.file.pdf")); SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); @@ -109,7 +115,7 @@ @Override protected JComponent getComponentToFocus() { - return getUI().getReportComboBox(); + return getUI().getFishingOperationComboBox(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; @@ -46,9 +47,10 @@ public static final String PROPERTY_REPORT = "report"; - public static final String PROPERTY_INPUT_FILE = "inputFile"; + public static final String PROPERTY_FISHING_OPERATION = "fishingOperationId"; public static final String PROPERTY_OUTPUT_FILE = "outputFile"; + public static final String PROPERTY_OUTPUT_FILE_EXISTS = "outputFileExists"; protected static Binder<ReportUIModel, ReportModel> toBeanBinder = @@ -57,8 +59,12 @@ protected List<File> reports; - protected final ReportModel editObject = new ReportModel(birtReportHome); + protected List<FishingOperation> fishingOperations; + protected final ReportModel editObject = new ReportModel(); + + protected FishingOperation fishingOperation; + public ReportUIModel() { super(null, toBeanBinder); } @@ -73,6 +79,14 @@ firePropertyChange(PROPERTY_REPORTS, oldValue, reports); } + public List<FishingOperation> getFishingOperations() { + return fishingOperations; + } + + public void setFishingOperations(List<FishingOperation> fishingOperations) { + this.fishingOperations = fishingOperations; + } + public File getReport() { return editObject.getReport(); } @@ -83,16 +97,28 @@ firePropertyChange(PROPERTY_REPORT, oldValue, report); } - public File getInputFile() { - return editObject.getInputFile(); + public String getCruiseId() { + return editObject.getCruiseId(); } - public void setInputFile(File inputFile) { - Object oldValue = getInputFile(); - editObject.setInputFile(inputFile); - firePropertyChange(PROPERTY_INPUT_FILE, oldValue, inputFile); + public void setCruiseId(String cruiseId) { + editObject.setCruiseId(cruiseId); } + public String getFishingOperationId() { + return fishingOperation == null ? null : fishingOperation.getId(); + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public void setFishingOperation(FishingOperation fishingOperation) { + Object oldValue = this.fishingOperation; + this.fishingOperation = fishingOperation; + firePropertyChange(PROPERTY_FISHING_OPERATION, oldValue, fishingOperation); + } + public File getOutputFile() { return editObject.getOutputFile(); } @@ -108,12 +134,13 @@ firePropertyChange(PROPERTY_OUTPUT_FILE_EXISTS, null, isOutputFileExists()); } + public boolean isOutputFileExists() { return getOutputFile() != null && getOutputFile().exists(); } @Override protected ReportModel newEntity() { - return new ReportModel(birtReportHome); + return new ReportModel(); } } Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -32,12 +32,15 @@ </field-validator> </field> - <field name="inputFile"> + <field name="cruiseId"> <field-validator type="required" short-circuit="true"> - <message>tutti.validator.error.report.inputFile.required</message> + <message>tutti.validator.error.report.cruiseId.required</message> </field-validator> - <field-validator type="existingFile" short-circuit="true"> - <message>tutti.validator.error.report.inputFile.notExists</message> + </field> + + <field name="fishingOperation"> + <field-validator type="required" short-circuit="true"> + <message>tutti.validator.error.report.fishingOperation.required</message> </field-validator> </field> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -1275,6 +1275,12 @@ tutti.main.action.exit= tutti.main.action.exit.mnemonic= tutti.main.action.exit.tip= +tutti.main.action.generateCruiseReport= +tutti.main.action.generateCruiseReport.mnemonic= +tutti.main.action.generateCruiseReport.tip= +tutti.main.action.generateSelectedCruiseReport= +tutti.main.action.generateSelectedCruiseReport.mnemonic= +tutti.main.action.generateSelectedCruiseReport.tip= tutti.main.action.goto.previousScreen.tip= tutti.main.action.importTemporaryReferential= tutti.main.action.importTemporaryReferential.mnemonic= @@ -1431,6 +1437,8 @@ tutti.report.action.showOutputFile= tutti.report.action.showOutputFile.mnemonic= tutti.report.action.showOutputFile.tip= +tutti.report.field.fishingOperation= +tutti.report.field.fishingOperation.tip= tutti.report.field.inputFile= tutti.report.field.inputFile.tip= tutti.report.field.outputFile= @@ -1465,6 +1473,8 @@ tutti.selectCruise.action.exportProgram.tip= tutti.selectCruise.action.exportProtocol= tutti.selectCruise.action.exportProtocol.tip= +tutti.selectCruise.action.generateCruiseReport= +tutti.selectCruise.action.generateCruiseReport.tip= tutti.selectCruise.action.importProtocol= tutti.selectCruise.action.importProtocol.tip= tutti.selectCruise.action.newCruise= @@ -1598,6 +1608,9 @@ tutti.validator.error.longitude.second.outOfBounds= tutti.validator.error.longitude.start.required= tutti.validator.error.program.zone.required= +tutti.validator.error.report.cruiseId.required= +tutti.validator.error.report.fishingOperation.required= +tutti.validator.error.report.fishingOperationId.required= tutti.validator.error.report.inputFile.notExists= tutti.validator.error.report.inputFile.required= tutti.validator.error.report.outputFile.required= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -131,6 +131,7 @@ tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport +tutti.config.option.service.report.log.file.shortLabel=Fichier de log de la génération des rapports tutti.config.option.site.url.shortLabel=URL du site technique tutti.config.option.startActionFile.description=Fichier tutti.config.option.tmp.directory.shortLabel=Répertoire temporaire @@ -1262,6 +1263,9 @@ tutti.main.action.exit=Quitter tutti.main.action.exit.mnemonic=Q tutti.main.action.exit.tip=Quitter l'application +tutti.main.action.generateSelectedCruiseReport=Rapport +tutti.main.action.generateSelectedCruiseReport.mnemonic=R +tutti.main.action.generateSelectedCruiseReport.tip=Générer des rapports tutti.main.action.goto.previousScreen.tip=Retour à l'écran précédent tutti.main.action.importTemporaryReferential=Référentiels temporaires tutti.main.action.importTemporaryReferential.mnemonic=R @@ -1270,9 +1274,6 @@ tutti.main.action.manageDb.mnemonic=G tutti.main.action.manageDb.tip=Gérer la base de données utilisée par l'application tutti.main.action.reloadTutti=Redémarrer l'application -tutti.main.action.report=Rapport -tutti.main.action.report.mnemonic=R -tutti.main.action.report.tip=Générer des rapports tutti.main.action.selectCruise=Sélectionner une campagne tutti.main.action.selectCruise.mnemonic=S tutti.main.action.selectCruise.tip=Sélectionner la campagne à utiliser @@ -1412,7 +1413,8 @@ tutti.report.action.showOutputFile=Voir tutti.report.action.showOutputFile.mnemonic=V tutti.report.action.showOutputFile.tip=Voir le rapport -tutti.report.field.inputFile=Fichier de données +tutti.report.field.fishingOperation=Trait +tutti.report.field.fishingOperation.tip=Sélectionner le trait tutti.report.field.inputFile.tip=Chemin vers le fichier de données tutti.report.field.outputFile=Rapport tutti.report.field.outputFile.tip=Chemin où générer le rapport @@ -1580,8 +1582,8 @@ tutti.validator.error.longitude.second.outOfBounds=La seconde de la longitude doit être comprise entre 0 et 59 tutti.validator.error.longitude.start.required=La longitude de début de traîne est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire -tutti.validator.error.report.inputFile.notExists=Le fichier d'entrée n'eixste pas -tutti.validator.error.report.inputFile.required=Le fichier d'entrée est obligatoire +tutti.validator.error.report.cruiseId.required=La campagne est obligatoire +tutti.validator.error.report.fishingOperation.required=Un trait doit être sélectionné tutti.validator.error.report.outputFile.required=Le fichier de sortie est obligatoire tutti.validator.error.report.report.required=Un modèle de rapport doit être sélectionné tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire

1 0

r1435 - in birt-runtime/trunk: . src src/license
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 07:27:39 +0100 (Mon, 09 Dec 2013) New Revision: 1435 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1435 Log: import fixed pom Added: birt-runtime/trunk/LICENSE.txt birt-runtime/trunk/README.txt birt-runtime/trunk/pom.xml birt-runtime/trunk/src/ birt-runtime/trunk/src/license/ birt-runtime/trunk/src/license/THIRD-PARTY.properties Modified: birt-runtime/trunk/ Property changes on: birt-runtime/trunk ___________________________________________________________________ Added: svn:ignore + target *.log *.ipr .idea *.iws *.iml .project .classpath Added: birt-runtime/trunk/LICENSE.txt =================================================================== --- birt-runtime/trunk/LICENSE.txt (rev 0) +++ birt-runtime/trunk/LICENSE.txt 2013-12-09 06:27:39 UTC (rev 1435) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: birt-runtime/trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: birt-runtime/trunk/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: birt-runtime/trunk/pom.xml =================================================================== --- birt-runtime/trunk/pom.xml (rev 0) +++ birt-runtime/trunk/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) @@ -0,0 +1,724 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>4.3</version> + </parent> + + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.birt.runtime</artifactId> + <version>4.3.1-1-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Birt runtime (repackage)</name> + <description> + Birt-runtime repackage to fix some Module commun à l'écriture d'applications + Ifremer. + </description> + <url>http://www.eclipse.org/projects/project.php?id=birt</url> + <inceptionYear>2013</inceptionYear> + <organization> + <name>CodeLutin</name> + <url>http://www.ifremer.fr/</url> + </organization> + <licenses> + <license> + <name>Lesser General Public License (LGPL)</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + <license> + <name>Eclipse Public License - v 1.0</name> + <url>http://www.eclipse.org/org/documents/epl-v10.html</url> + </license> + </licenses> + + <developers> + <developer> + <id>chemit</id> + <name>Tony Chemit</name> + <email>chemit at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + </developers> + + <scm> + <url>http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk</url> + <connection> + scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk + </connection> + <developerConnection> + scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk + </developerConnection> + </scm> + <distributionManagement> + <snapshotRepository> + <id>nuiton-nexus-deploy</id> + <url> + http://nexus.nuiton.org/nexus/content/repositories/tutti-snapshot + </url> + </snapshotRepository> + <repository> + <id>nuiton-nexus-deploy</id> + <url> + http://nexus.nuiton.org/nexus/content/repositories/tutti-third-parties + </url> + </repository> + </distributionManagement> + + <properties> + + <platform>forge.codelutin.com</platform> + <projectId>tutti</projectId> + <redmine.versionId>birt-runtime-4.3.1-1</redmine.versionId> + +  + <birtVersion>4.3.1</birtVersion> + <batikVersion>1.6</batikVersion> + +  + <license.organizationName>CodeLutin</license.organizationName> + <license.licenseName>lgpl_v3</license.licenseName> + <license.acceptPomPackaging>true</license.acceptPomPackaging> + +  + <skipPostRelease>false</skipPostRelease> + </properties> + + <repositories> + <repository> + <id>tutti-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>tutti-public-group</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.birt.runtime</artifactId> + <version>${birtVersion}</version> + <exclusions> + <exclusion> + <groupId>milyn</groupId> + <artifactId>flute</artifactId> + </exclusion> + <exclusion> + <groupId>org.milyn</groupId> + <artifactId>flute</artifactId> + </exclusion> + <exclusion> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.hsqldb.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.mysql</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.ibm.informix + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId> + org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId> + org.eclipse.datatools.enablement.ibm.informix.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.postgresql</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId> + org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId> + org.eclipse.datatools.connectivity.apache.derby.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.oracle</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.msft.sqlserver + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.oracle.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.mysql.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId> + org.eclipse.datatools.enablement.postgresql.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.modelbase.derby</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.apache.derby + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.console.profile + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.oda.design + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.oda.ws</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.modelbase.sql</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.modelbase.sql.query</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId> + org.eclipse.datatools.connectivity.dbdefinition.genericJDBC + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.enablement.oda.xml</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.db.generic + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.modelbase.dbdefinition + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.oda.profile + </artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.datatools.connectivity.sqm.core</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.emf.ecore.change</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.core.expressions</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.emf</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.core.resources</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.core.filesystem</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.core.contenttype</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.apache.commons.logging</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.pdf</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.dom.svg</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.dom</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.css</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.ext.awt</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.transcoder</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.util</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.xml</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.orbit.mongodb</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.commons.codec</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.bridge</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.parser</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.util.gui</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.batik.svggen</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.equinox.app</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.equinox.preferences</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.osgi.services</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.xerces</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>derby</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.xml.resolver</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.apache.xml.serializer</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.w3c.dom.svg</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.w3c.css.sac</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>javax.wsdl</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>org.w3c.dom.smil</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>javax.xml.stream</artifactId> + </exclusion> +  + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>Tidy</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime.3_7_1</groupId> + <artifactId>com.lowagie.text</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>com.ibm.icu</artifactId> + </exclusion> + + <exclusion> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.update.configurator</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml-schemas</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.7</version> + <exclusions> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcmail-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bctsp-jdk14</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + </dependencyManagement> + + <dependencies> + +  + <dependency> + <groupId>org.eclipse.birt.runtime</groupId> + <artifactId>org.eclipse.birt.runtime</artifactId> + <version>${birtVersion}</version> + </dependency> + +  + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>batik</groupId> + <artifactId>batik-util</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-xml</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-gvt</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-script</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-transcoder</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-parser</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-bridge</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-dom</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-awt-util</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-svggen</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-ext</artifactId> + <version>${batikVersion}</version> + <scope>runtime</scope> + </dependency> +  + +  + <dependency> + <groupId>net.sf.jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>r938</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.7</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>50.1.1</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>org.milyn</groupId> + <artifactId>flute</artifactId> + <version>1.3</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <build> + <extensions> +  + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0</version> + </extension> + </extensions> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <excludedGroups>milyn</excludedGroups> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> + + <profiles> + + <profile> + <id>license-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <defaultGoal>generate-resources</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <executions> + <execution> + <id>update-file-header-on-pom</id> + <goals> + <goal>update-file-header</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <roots> + <root>${project.basedir}</root> + </roots> + <includes> + <include>pom.xml</include> + </includes> + <addSvnKeyWords>false</addSvnKeyWords> + <verbose>false</verbose> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> +</project> Property changes on: birt-runtime/trunk/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: birt-runtime/trunk/src/license/THIRD-PARTY.properties =================================================================== --- birt-runtime/trunk/src/license/THIRD-PARTY.properties (rev 0) +++ birt-runtime/trunk/src/license/THIRD-PARTY.properties 2013-12-09 06:27:39 UTC (rev 1435) @@ -0,0 +1,33 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License - v 1.0 +# - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Java HTML Tidy License +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Mozilla Public License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Dec 09 06:56:00 CET 2013 +dom4j--dom4j--1.6.1=BSD License +batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 +batik--batik-bridge--1.6=The Apache Software License, Version 2.0 +batik--batik-css--1.6=The Apache Software License, Version 2.0 +batik--batik-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-ext--1.6=The Apache Software License, Version 2.0 +batik--batik-gvt--1.6=The Apache Software License, Version 2.0 +batik--batik-parser--1.6=The Apache Software License, Version 2.0 +batik--batik-script--1.6=The Apache Software License, Version 2.0 +batik--batik-svg-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-svggen--1.6=The Apache Software License, Version 2.0 +batik--batik-transcoder--1.6=The Apache Software License, Version 2.0 +batik--batik-util--1.6=The Apache Software License, Version 2.0 +batik--batik-xml--1.6=The Apache Software License, Version 2.0 Property changes on: birt-runtime/trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1434 - / birt-runtime
by tchemit＠users.forge.codelutin.com 09 Dec '13

09 Dec '13

Author: tchemit Date: 2013-12-09 06:19:38 +0100 (Mon, 09 Dec 2013) New Revision: 1434 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1434 Log: project to package birt-runtime Added: birt-runtime/ birt-runtime/trunk/

1 0

r1433 - in trunk/tutti-service: . src/main/java/fr/ifremer/tutti/service/report src/test/java/fr/ifremer/tutti/service/report
by tchemit＠users.forge.codelutin.com 08 Dec '13

08 Dec '13

Author: tchemit Date: 2013-12-08 08:23:27 +0100 (Sun, 08 Dec 2013) New Revision: 1433 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1433 Log: refs #3624: [Rapport] Int?\195?\169gration de rapports g?\195?\169n?\195?\169r?\195?\169s par Birt (reports works) Modified: trunk/tutti-service/ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java Property changes on: trunk/tutti-service ___________________________________________________________________ Modified: svn:ignore - target .idea *.ipr *.iws *.iml + target .idea *.ipr *.iws *.iml *.log Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-05 17:37:15 UTC (rev 1432) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-08 07:23:27 UTC (rev 1433) @@ -37,7 +37,6 @@ import org.eclipse.birt.core.framework.Platform; import org.eclipse.birt.report.engine.api.EngineConfig; import org.eclipse.birt.report.engine.api.EngineConstants; -import org.eclipse.birt.report.engine.api.EngineException; import org.eclipse.birt.report.engine.api.IRenderOption; import org.eclipse.birt.report.engine.api.IReportEngine; import org.eclipse.birt.report.engine.api.IReportEngineFactory; @@ -130,8 +129,21 @@ context.getConfig().getTmpDirectory(), model.getInputFile(), "Could not explode data zip file"); + // get all directories of exploded archive + File[] directories = dataDirectory.listFiles(new FileFilter() { + @Override + public boolean accept(File pathname) { + return pathname.isDirectory(); + } + }); + // should have a unique directory + Preconditions.checkState(directories.length == 1, + "Archive should contains a unique directory"); + dataDirectory = directories[0]; + if (log.isInfoEnabled()) { - log.info("Will generate report using report " + model.getReport().getName()); + log.info("Will generate report using report " + + model.getReport().getName()); } IReportEngine engine = factory.createReportEngine(engineConfig); @@ -145,9 +157,6 @@ // Report context Map<String, Object> context = Maps.newHashMap(); context.put(EngineConstants.APPCONTEXT_CHART_RESOLUTION, RENDER_DPI); - context.put("rpt-param_dirfile", dataDirectory.getAbsolutePath()); - context.put("rpt-param_codestation", model.getFishingOperation().getStationNumber()); - context.put("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); /** * rpt-param_dirfile : répertoire contant les fichiers @@ -164,6 +173,9 @@ IRunAndRenderTask task = engine.createRunAndRenderTask(rptDoc); task.setRenderOption(renderOption); task.setAppContext(context); + task.setParameterValue("rpt-param_dirfile", dataDirectory.getAbsolutePath()); + task.setParameterValue("rpt-param_codestation", model.getFishingOperation().getStationNumber()); + task.setParameterValue("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); // render task.run(); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-05 17:37:15 UTC (rev 1432) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-08 07:23:27 UTC (rev 1433) @@ -1,7 +1,6 @@ package fr.ifremer.tutti.service.report; import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.ServiceDbResource; @@ -57,8 +56,7 @@ } - // remove exception when it will work - @Test(expected = ApplicationTechnicalException.class) + @Test public void testGenerateReport() throws Exception { // export campaign data

1 0

r1432 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/resources/i18n tutti-service tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/report tutti-service/src/test/java/fr/ifremer/tutti/service tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf tutti-service/src/test/java/fr/ifremer/tutti/service/report tutti-service/src/test/resources tutti-service/src/test/resources/report tutti-se
by tchemit＠users.forge.codelutin.com 05 Dec '13

05 Dec '13

Author: tchemit Date: 2013-12-05 18:37:15 +0100 (Thu, 05 Dec 2013) New Revision: 1432 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1432 Log: refs #3624: [Rapport] Int?\195?\169gration de rapports g?\195?\169n?\195?\169r?\195?\169s par Birt Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java trunk/tutti-service/src/test/resources/report/ trunk/tutti-service/src/test/resources/report/2013.12.05/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/images/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/images/logo-ifremer.PNG trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign trunk/tutti-service/src/test/resources/report/2013.12.05/version.appup Removed: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/sumatra/ Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java trunk/tutti-service/src/test/resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/pom.xml 2013-12-05 17:37:15 UTC (rev 1432) @@ -453,6 +453,12 @@ <version>9.0.2</version> </dependency> + <dependency> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> + <version>5.4.1</version> + </dependency> +  <dependency> <groupId>org.freemarker</groupId> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -445,6 +445,12 @@ return result; } + /** @return {@link TuttiConfigurationOption#REPORT_HOME_DIRECTORY} value */ + public File getReportHomeDirectory() { + File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_HOME_DIRECTORY.getKey()); + return result; + } + /** @return {@link TuttiConfigurationOption#REPORT_DIRECTORY} value */ public File getReportDirectory() { File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_DIRECTORY.getKey()); @@ -453,7 +459,7 @@ /** @return {@link TuttiConfigurationOption#REPORT_BACKUP_DIRECTORY} value */ public File getReportBackupDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_DIRECTORY.getKey()); + File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY.getKey()); return result; } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -84,10 +84,15 @@ "${tutti.data.directory}/temp", File.class), + REPORT_HOME_DIRECTORY( + "tutti.report.home.directory", + n_("tutti.config.option.report.home.directory.description"), + "${tutti.basedir}/report", + File.class), REPORT_DIRECTORY( "tutti.report.directory", n_("tutti.config.option.report.directory.description"), - "${tutti.basedir}/report", + "${tutti.report.home.directory}/allegro-tutti/reports", File.class), DB_DIRECTORY( Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-05 17:37:15 UTC (rev 1432) @@ -31,6 +31,7 @@ tutti.config.option.protocolId.description= tutti.config.option.report.backup.directory.description= tutti.config.option.report.directory.description= +tutti.config.option.report.home.directory.description= tutti.config.option.samplingCategoryOrderIds.description= tutti.config.option.site.url.description= tutti.config.option.startActionFile.description= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-05 17:37:15 UTC (rev 1432) @@ -161,6 +161,7 @@ tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.config.option.report.backup.directory.description=Répertoire contenant les rapports générés tutti.config.option.report.directory.description=Répertoire contenant les modèles de rapports +tutti.config.option.report.home.directory.description=Répertoire contenant la structure nécessaire pour les rapport tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-service/pom.xml 2013-12-05 17:37:15 UTC (rev 1432) @@ -137,16 +137,16 @@ </dependency>  -  + </dependency>  -  + </dependency>  <dependency> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -24,6 +24,9 @@ * #L% */ + +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; + import java.io.File; import java.io.Serializable; @@ -46,6 +49,11 @@ /** Where to generate the report. */ protected File outputFile; + /** + * Selected + */ + protected FishingOperation fishingOperation; + public File getReport() { return report; } @@ -69,4 +77,12 @@ public void setOutputFile(File outputFile) { this.outputFile = outputFile; } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public void setFishingOperation(FishingOperation fishingOperation) { + this.fishingOperation = fishingOperation; + } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -24,17 +24,36 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.shared.application.ApplicationIOUtil; +import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.tutti.service.AbstractTuttiService; +import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.eclipse.birt.core.exception.BirtException; +import org.eclipse.birt.core.framework.Platform; +import org.eclipse.birt.report.engine.api.EngineConfig; +import org.eclipse.birt.report.engine.api.EngineConstants; +import org.eclipse.birt.report.engine.api.EngineException; +import org.eclipse.birt.report.engine.api.IRenderOption; +import org.eclipse.birt.report.engine.api.IReportEngine; +import org.eclipse.birt.report.engine.api.IReportEngineFactory; +import org.eclipse.birt.report.engine.api.IReportRunnable; +import org.eclipse.birt.report.engine.api.IRunAndRenderTask; +import org.eclipse.birt.report.engine.api.RenderOption; import java.io.File; import java.io.FileFilter; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.logging.Level; /** * To generate some reports. @@ -59,14 +78,116 @@ public static final DateFormat df = new SimpleDateFormat("yyy-MM-dd_HH-mm"); + private static final int RENDER_DPI = 300; + + protected IReportEngineFactory factory; + + protected EngineConfig engineConfig; + + @Override + public void setServiceContext(TuttiServiceContext context) { + super.setServiceContext(context); + // Configure engine + + engineConfig = new EngineConfig(); + engineConfig.setBIRTHome(context.getConfig().getReportHomeDirectory().getAbsolutePath()); + engineConfig.setResourcePath(context.getConfig().getReportHomeDirectory().getAbsolutePath()); + engineConfig.setLogConfig(null, Level.FINE); + + // Get the instance of the engine + try { + Platform.startup(engineConfig); + } catch (BirtException e) { + throw new ApplicationTechnicalException("Could not init birt", e); + } + + factory = (IReportEngineFactory) Platform.createFactoryObject( + IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY); + + + } + + public ReportModel createModel() { + + File defaultOutputFile = getDefaultOutputFile(); + ReportModel model = new ReportModel(); + model.setOutputFile(defaultOutputFile); + return model; + } + public void generateReport(ReportModel model) { + Preconditions.checkNotNull(model); + Preconditions.checkNotNull(model.getFishingOperation()); + Preconditions.checkNotNull(model.getReport()); + Preconditions.checkNotNull(model.getInputFile()); + Preconditions.checkNotNull(model.getOutputFile()); + Preconditions.checkState(model.getReport().exists()); + Preconditions.checkState(model.getInputFile().exists()); + + // explode input zip file + File dataDirectory = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + model.getInputFile(), + "Could not explode data zip file"); if (log.isInfoEnabled()) { - log.info("Will generate report using report " + model.getReport()); + log.info("Will generate report using report " + model.getReport().getName()); } - // TODO + + IReportEngine engine = factory.createReportEngine(engineConfig); + + try { + + // Get the report document + IReportRunnable rptDoc = + engine.openReportDesign(model.getReport().getAbsolutePath()); + + // Report context + Map<String, Object> context = Maps.newHashMap(); + context.put(EngineConstants.APPCONTEXT_CHART_RESOLUTION, RENDER_DPI); + context.put("rpt-param_dirfile", dataDirectory.getAbsolutePath()); + context.put("rpt-param_codestation", model.getFishingOperation().getStationNumber()); + context.put("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); + + /** + * rpt-param_dirfile : répertoire contant les fichiers + + rpt-param_codestation : code de la station (ex: G101) + + rpt-param_numerotrait : code du trait (ex: 53) + */ + + // Configure the render options + IRenderOption renderOption = new RenderOption(); + renderOption.setOutputFileName(model.getOutputFile().getAbsolutePath()); + renderOption.setOutputFormat(IRenderOption.OUTPUT_FORMAT_PDF); + + // Create the render task + IRunAndRenderTask task = engine.createRunAndRenderTask(rptDoc); + task.setRenderOption(renderOption); + task.setAppContext(context); + + // render + task.run(); + + // close task + task.close(); + + if (log.isInfoEnabled()) { + log.info("Report generated at " + model.getOutputFile()); + } + + } catch (Exception e) { + throw new ApplicationTechnicalException("Could not generate report", e); + } finally { + engine.destroy(); + } } + @Override + public void close() throws IOException { + Platform.shutdown(); + super.close(); + } + public List<File> getAvailableReports() { List<File> result = Lists.newArrayList(); File reportDirectory = context.getConfig().getReportDirectory(); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -24,10 +24,8 @@ * #L% */ -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; @@ -56,8 +54,6 @@ protected CatchesPdfExportService exportService; - protected PersistenceService persistenceService; - protected File dataDirectory; @Before @@ -67,17 +63,11 @@ TuttiServiceContext serviceContext = dbResource.getServiceContext(); - persistenceService = serviceContext.getService(PersistenceService.class); + dbResource.openDataContext(); - serviceContext.getDataContext().open(serviceContext.getConfig(), persistenceService); exportService = serviceContext.getService(CatchesPdfExportService.class); } - @After - public void tearDown() throws Exception { - - } - @Test public void generateFishingOperationPDFFile() throws Exception { Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java (rev 0) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1,103 @@ +package fr.ifremer.tutti.service.report; + +import fr.ifremer.shared.application.ApplicationIOUtil; +import fr.ifremer.shared.application.ApplicationTechnicalException; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.service.ServiceDbResource; +import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.service.export.generic.TuttiExportService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.util.List; + +/** + * Created on 12/5/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0-rc-2 + */ +public class ReportServiceTest { + + @ClassRule + public static final ServiceDbResource dbResource = + ServiceDbResource.readDb("dbMedits"); + + /** Logger. */ + private static final Log log = LogFactory.getLog(ReportServiceTest.class); + + public static final String PROGRAM_ID = "CAM-MEDITS"; + + public static final String CRUISE_ID = "100001"; + + public static final String OPERATION_1_ID = "100106"; + + protected ReportService service; + + protected ServiceDbResource.DataContext dataContext; + + @Before + public void setUp() throws Exception { + + TuttiServiceContext serviceContext = dbResource.getServiceContext(); + + dbResource.setCountryInConfig("12"); + dbResource.openDataContext(); + + dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID); + + service = serviceContext.getService(ReportService.class); + + } + + // remove exception when it will work + @Test(expected = ApplicationTechnicalException.class) + public void testGenerateReport() throws Exception { + + // export campaign data + File exportFile = new File(dbResource.getConfig().getTmpDirectory(), "exportMEDITS-2013.zip"); + if (log.isInfoEnabled()) { + log.info("Export to " + exportFile); + } + ProgressionModel progressionModel = new ProgressionModel(); + progressionModel.setTotal(9); + dbResource.getServiceContext().getService(TuttiExportService.class).exportCruise(CRUISE_ID, exportFile, progressionModel); + + // copy report resources from class-path + File sourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "2013.12.05"); + File targetDirectory = dbResource.getConfig().getReportHomeDirectory(); + if (log.isInfoEnabled()) { + log.info("Prepare report birt home at " + targetDirectory); + } + ApplicationIOUtil.copyDirectory(sourceDirectory, targetDirectory, "Could not copy report directory"); + + ReportModel model = service.createModel(); + List<File> availableReports = service.getAvailableReports(); + Assert.assertNotNull(availableReports); + Assert.assertFalse(availableReports.isEmpty()); + Assert.assertEquals(1, availableReports.size()); + + // get unique report file + File reportFileName = availableReports.get(0); + model.setReport(reportFileName); + model.setInputFile(exportFile); + + // set fishing operation + FishingOperation fishingOperation = dataContext.operations.get(0); + model.setFishingOperation(fishingOperation); + + // generate report + Assert.assertFalse(model.getOutputFile().exists()); + service.generateReport(model); + + // report must exist + Assert.assertTrue(model.getOutputFile().exists()); + } +} Property changes on: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-service/src/test/resources/log4j.properties =================================================================== --- trunk/tutti-service/src/test/resources/log4j.properties 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-service/src/test/resources/log4j.properties 2013-12-05 17:37:15 UTC (rev 1432) @@ -29,7 +29,7 @@ log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n log4j.logger.fr.ifremer.tutti=INFO -#log4j.logger.org.nuiton=INFO +log4j.logger.org.nuiton.i18n=ERROR #See https://forum.hibernate.org/viewtopic.php?p=2404391 log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR \ No newline at end of file Added: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css (rev 0) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1,380 @@ +/** + * ================================================= + * GENERAL + * ================================================= + */ + +.report { + font-family: "Verdana"; + font-size: 7pt; +} + +.page { + font-family: "Verdana"; + font-size: 7pt; +} + +.cell { + padding:1px; + vertical-align: middle; +} + +.cell-left { + padding-left:1px; + text-align: left; +} + +.cell-right { + padding-right:1px; + text-align: right; +} + +.inline { + display: inline; +} + + +/** + * ================================================= + * TEXTE + * ================================================= + */ + +.text, .label, .data { + font-size: 7pt; + font-family: "Verdana"; + padding: 0px; +} + +.label-general { + font-size: 7pt; + font-family: "Verdana"; + padding: 0px; + margin-right: 5px; + /*font-weight: bold;*/ + /*color : silver;*/ +} + +.label-sous-title { + font-size: 9pt; + font-family: "Verdana"; + padding: 0px; + margin-right: 5px; + font-weight: bold; + font-style: italic; + text-decoration: underline; +} + +.text-of-content-esp { + font-size: 6pt; + font-family: "Verdana"; + font-style:italic; + } + +.data { + text-align: center; +} + +.data-calcule { + style: italic; + color : blue; + font-style:italic; +} + +.text-important { + font-weight: bold; +} + +.text-important-couleur { + font-weight: bold; + color : #0080C0; +} + +.report-title { + font-size: 17pt; + font-family: "Verdana"; + font-weight: bold; + color: #000000; +} + +.paragraphe { + font-size:10pt; + font-family: "Verdana"; + color: #000000; + text-align: justify; + /*line-height: 90%;*/ +} + +.paragraphe2 { + font-size:8pt; + font-family: "Verdana"; + color: #000000; + text-align: justify; + margin-bottom: 10px +} + +.mtp-header-text { + font-size: 7pt; + font-family: "Verdana"; + font-weight:bold; + font-style:italic; + color: #888888; +} + +.mtp-footer-text { + font-size: 7pt; + font-family: "Verdana"; + font-style:italic; +} + + +/** + * ================================================= + * GRILLE (= GRID) + * ================================================= + */ + +.grid { + padding:0px; + vertical-align: middle; + text-align:left; +} + +.grid-cell { + font-size: 7pt; + padding:0px; + vertical-align: middle; +} + +/** + * ------------------------------------------------- + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * ------------------------------------------------- + */ +.grid-contacts { + padding:15px; + border: 1px solid black /*white*/; + background-color: white /*#49bc7c*/; +} +.grid-header-cell { + text-align:center; + color: black /*white*/; + font-weight: bold; + background-color: white /*#49bc7c*/; + border: 1px solid black /*white*/; +} +.grid-detail-cell { + font-size: 7pt; + font-family: "Verdana"; + text-align:left; + border: 1px solid black /*white*/; +} +.grid-header-cell, .grid-detail-cell { + padding-left:2px; + padding-right:2px; + padding-bottom:1px; + padding-top:1px; + vertical-align: middle; +} + + +/** + * ================================================= + * TABLEAU (= TABLE) + * ================================================= + */ + + +.table { + font-family: "Verdana"; + text-align:left; + /*padding: 0px;*/ + margin-bottom: 10px; + border: 0px; + border-bottom: 1px solid black /*white*/; +} + +.table-header { + font-size: 7pt; + /*padding: 0px;*/ + margin: 0px; + border: 0px; + text-align:center; + color: black /*white*/; + font-weight: bold; +} + +.table-header-cell { + background-color: white /*#49bc7c*/; + border: 1px solid black /*white*/; +} + +.table-detail-cell { + font-size: 7pt; + border-left: 1px solid black /*white*/; + border-right: 1px solid black /*white*/; + line-height: 4px; +} + +.table-footer { + background-color: white /*#49bc7c*/; + font-weight: bold; + color: black /*white*/ +} + +.table-footer-cell { + border: 1px solid black /*white*/; +} + +.table-header-cell, .table-footer-cell , .table-detail-cell { + padding-left:2px; + padding-right:2px; + padding-bottom:1px; + padding-top:1px; + vertical-align: middle; +} + +/** + * ------------------------------------------------- + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * ------------------------------------------------- + */ + +.table-detail-highlight, .table-detail-border-highlight { + background-color: #d1f0e1; +} +.table-detail-border, .table-detail-border-highlight { + border-bottom: 1px solid black /*white*/; +} + +/** + * ================================================= + * TABLEAU CROISE (= CROSS TAB) + * ================================================= + */ + +.crosstab { + text-align:left; +} + +.crosstab-header-col-up { + border-left: 1px solid black /*white*/; + border-right: 1px solid black /*white*/; + border-top: 1px solid black /*white*/; + background-color: white /*#49bc7c*/; + text-align:center; + color: black /*white*/; + font-weight: bold; +} + +.crosstab-header-col-down { + border-left: 1px solid black /*white*/; + border-right: 1px solid black /*white*/; + border-bottom: 1px solid black /*white*/; + background-color: white /*#49bc7c*/; +} + +.crosstab-header-line { + border-left: 1px solid black /*white*/; + border-right: 1px solid black /*white*/; + /*border-top: 1px solid #0080C0; + border-bottom: 1px solid #FFFFFF;*/ + padding-left:5px; + text-align:left; + font-weight:bold; + color: black; +} + +.crosstab-header-line-first { + border-left: 1px solid black /*white*/; + border-right: 1px solid black /*white*/; + border-top: 1px solid black /*white*/; + padding-left:5px; + text-align:left; + font-weight:bold; + color: black; + /*background-color: #FF0000;*/ +} + +.crosstab-header-line-left { + border-left: 1px solid black /*white*/; + /*border-bottom: 1px solid #0080C0;*/ + border-top: 1px solid black /*white*/; + padding-left:5px; + text-align:left; + font-weight:bold; + color: black; +} + +.crosstab-header-line-right { + border-right: 1px solid black /*white*/; + /*border-bottom: 1px solid #0080C0;*/ + border-top: 1px solid black /*white*/; + font-weight:bold; + color: black; +} + +.crosstab-total-line-header { + background-color: white /*#49bc7c*/; + border: 1px solid black /*white*/; + padding-left:5px; + text-align:left; + font-weight:bold; + color: black; +} + +.crosstab-total-line-cell { + background-color: white /*#49bc7c*/; + border: 1px solid black /*white*/; + text-align:center; + font-weight:bold; + color: black; +} + +.crosstab-total-col-header { + border: 1px solid black /*white*/; + background-color: white /*#49bc7c*/; + color: black /*white*/; + text-align:center; + font-weight:bold; +} + +.crosstab-total-col-cell { + text-align:center; + font-weight:bold; + color: #000000; +} + +.crosstab-detail { + border-left: 1px solid black /*white*/; + border-right: 1px solid black /*white*/; + text-align:center; +} + +.crosstab-cell { + vertical-align: middle; +} + + + + + + + + + /** + * ================================================= + * GRAPHIQUE (= CHART) + * ================================================= + */ + +.chart { + font-family: "Arial"; + font-size: 6pt; +} + + +.chart-resize { + font-family: "Arial"; + font-size: 6pt; +} \ No newline at end of file Property changes on: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/images/logo-ifremer.PNG =================================================================== (Binary files differ) Property changes on: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/images/logo-ifremer.PNG ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js (rev 0) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1,20 @@ +/* =================================================================== + * common.js + * ------------------------------------------------------------------- + * + * ------------------------------------------------------------------- + * @Author : + * @Version : + * =================================================================== */ + +/** parametres de connexion **/ +//var cnxHOME="C:\\DevSih\\Allegro_campagnes\\exportCruise-100001"; +//var cnxHOME="C:\\DevSih\\Allegro_campagnes\\exportCruise-CGFS2010\\exportCruise-100000"; +var cnxDELIMTYPE="SEMICOLON"; +var cnxCHARSET="UTF-8"; +var cnxINCLCOLUMNNAME="YES"; +var cnxINCLTYPELINE="NO"; + +/** parametres existance capture accident et macro dechets **/ +var existsCapAcc=0; +var existsMacDech=0; Property changes on: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js (rev 0) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1,213 @@ +/* =================================================================== + * message.js + * ------------------------------------------------------------------- + * Management messages (internationalization) + * ------------------------------------------------------------------- + * @Author : BODERE Erwan + * @Version : 1.0 - 19/03/2008 + * =================================================================== */ + + +/** + * Get a message with parameters + * @param messageKey key of the message + * @param params Array of values + */ +getMessageWithParameters = function(messageKey, params) { + return reportContext.getMessage(messageKey, reportContext.getLocale(), params); +} + +/** + * Get a "simple" message + * @param messageKey key of the message + */ +getMessage = function(messageKey) { + return reportContext.getMessage(messageKey, reportContext.getLocale()); +} + +/** + * Get a message with 1 parameter + * @param messageKey key of the message + * @param param1 value of the parameter + */ +getMessage = function(messageKey, param1) { + var params = new Array(1); + params[0] = "" + param1; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 2 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + */ +getMessage = function(messageKey, param1, param2) { + var params = new Array(2); + params[0] = "" + param1; + params[1] = "" + param2; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 3 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3) { + var params = new Array(3); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 4 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + * @param param4 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3, param4) { + var params = new Array(4); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + params[3] = "" + param4; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 5 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + * @param param4 value of the parameter + * @param param5 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3, param4, param5) { + var params = new Array(5); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + params[3] = "" + param4; + params[4] = "" + param5; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 6 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + * @param param4 value of the parameter + * @param param5 value of the parameter + * @param param6 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3, param4, param5, param6) { + var params = new Array(6); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + params[3] = "" + param4; + params[4] = "" + param5; + params[5] = "" + param6; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 7 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + * @param param4 value of the parameter + * @param param5 value of the parameter + * @param param6 value of the parameter + * @param param7 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3, param4, param5, param6, param7) { + var params = new Array(7); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + params[3] = "" + param4; + params[4] = "" + param5; + params[5] = "" + param6; + params[6] = "" + param7; + return getMessageWithParameters(messageKey, params); +} + + +/** + * Get a message with 8 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + * @param param4 value of the parameter + * @param param5 value of the parameter + * @param param6 value of the parameter + * @param param7 value of the parameter + * @param param8 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3, param4, param5, param6, param7, param8) { + var params = new Array(8); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + params[3] = "" + param4; + params[4] = "" + param5; + params[5] = "" + param6; + params[6] = "" + param7; + params[7] = "" + param8; + return getMessageWithParameters(messageKey, params); +} + +/** + * Get a message with 9 parameters + * @param messageKey key of the message + * @param param1 value of the parameter + * @param param2 value of the parameter + * @param param3 value of the parameter + * @param param4 value of the parameter + * @param param5 value of the parameter + * @param param6 value of the parameter + * @param param7 value of the parameter + * @param param8 value of the parameter + * @param param9 value of the parameter + */ +getMessage = function(messageKey, param1, param2, param3, param4, param5, param6, param7, param8, param9) { + var params = new Array(9); + params[0] = "" + param1; + params[1] = "" + param2; + params[2] = "" + param3; + params[3] = "" + param4; + params[4] = "" + param5; + params[5] = "" + param6; + params[6] = "" + param7; + params[7] = "" + param8; + params[8] = "" + param9; + return getMessageWithParameters(messageKey, params); +} + + +/** + * Convert a Boolean to a a local message + * @param booleanObject the boolean object to convert + * @param trueMessageKey message key for true value + * @param falseMessageKey message key for false value + */ +translateBoolean = function(booleanObject, trueMessageKey, falseMessageKey) { + var result = eval(booleanObject); + if (result){ + return getMessage(trueMessageKey); + } + return getMessage(falseMessageKey); +} \ No newline at end of file Property changes on: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties (rev 0) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1,135 @@ + +annee = Ann\u00E9e : + +campagne = Campagne : + +caracteristique = Caract\u00E9ristique + +carroussel-observ = Carroussel observ\u00E9 (kg) : + +categ-lot = Cat\u00E9gorisation du lot : + +categorie = Cat\u00E9gorie + +categorie-taille = Cat\u00E9gorie de taille + +classe-taille = Classe de taille + +code-station = Code station : + +commentaire = Commentaire : + +commentaire_bis = Commentaire + +controle = Contr\u00F4le + +date = Date + +date-debut-trait = Date d\u00E9but trait : + +date-generation = Date de g\u00E9n\u00E9ration + +date-heure = Date heure + +debut-traine = D\u00E9but de tra\u00EEne + +distance-chalute = Distance chalut\u00E9e : + +engin = Engin : + +espece = Esp\u00E8ce : + +espece_bis = Esp\u00E8ce + +fin-traine = Fin de tra\u00EEne + +footer-copyright = \u00A9 2008 Ifremer - Syst\u00E8me d'Informations Halieutiques + +header-title = SIH{0} + +instruction-ctrl = Contr\u00F4le\u00A0: pour chaque page, apr\u00E8s contr\u00F4le, cocher la case en bas \u00E0 droite des pages. En cas d'erreur de saisie, barrer les valeurs en erreur et noter \u00E0 c\u00F4t\u00E9 la valeur corrig\u00E9e. Apr\u00E8s correction des valeurs dans le logiciel, entourer les valeurs saisies. + +latitude = Latitude + +localite = Locatit\u00E9 : + +longitude = Longitude + +longueur-moy = Longueur moyenne : + +mode-mensuration = Mode de mensuration : + +navire = Navire : + +nbre = Nombre + +nbre-indiv = Nombre d'individus + +nbre-indiv-capt = Nombre d'individus captur\u00E9s : + +nbre-indiv-kg = Nombre d'individus / kg : + +num-poche = N\u00B0 poche : + +num-trait = N\u00B0 trait : + +ouverture-horiz-ailes = Ouverture horizontale aux ailes : + +ouverture-horiz-panneaux = Ouverture horizontale aux panneaux : + +ouverture-verticale = Ouverture verticale : + +page = page + +pas-mesure = Pas de mesure : + +poids = Poids (kg) + +poids.moyen = Poids moyen (g) : +poids.sans-unite = Poids +poids.total = Poids TOTAL (kg) : +poids.total-dans-la-capture = Poids total dans la capture (kg) : +poids.total-hors-vrac = Poids total HORS VRAC (kg) : +poids.total-inerte-trie = Poids total inerte tri\u00E9 (kg) : +poids.total-non-trie = Poids total NON TRIE (kg) : +poids.total-vivant-non-detail-trie = Poids total vivant non d\u00E9taill\u00E9 tri\u00E9 (kg) : +poids.total-vrac = Poids Total VRAC (kg) : +poids.vrac-trie = Poids VRAC tri\u00E9 (kg) : + +qui = Qui ? + +saisisseur = Saisisseur(s) : + +serie = S\u00E9rie : + +serie-partielle = S\u00E9rie partielle : + +sous-strate = Sous strate : + +sous-title.benthos = Benthos : +sous-title.capture = Capture : +sous-title.caracteristique-general-trait = Caract\u00E9ristiques g\u00E9n\u00E9rales du trait : +sous-title.caracteristique-mo = Caract\u00E9ristiques de mise en oeuvre de l'engin : +sous-title.caracteristiques = Caract\u00E9ristiques : +sous-title.especes = Esp\u00E8ces : +sous-title.macro-dechets = Macro d\u00E9chets : + +strate = Strate : + +title.bilan-capture = BILAN CAPTURE +title.caracteristique-trait = CARACTERISTIQUE DU TRAIT +title.rapport = RAPPORT DE SAISIE ALLEGRO CAMPAGNE +title.rapport-capture-accidentelles = RAPPORT CAPTURE ACCIDENTELLES +title.rapport-espece-benthos = RAPPORT sur les esp\u00E8ces du BENTHOS +title.rapport-macro-dechets = RAPPORT MACRO DECHETS +title.rapport-par-espece = RAPPORT PAR ESPECE + +total = Total + +trait-rectiligne = Trait rectiligne : + +trait-valide = Trait valide : + +tremis = Tr\u00E9mis (kg) : + +valeur = Valeur Property changes on: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign (rev 0) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1,10847 @@ +<?xml version="1.0" encoding="UTF-8"?> +<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.23" id="1"> + <property name="createdBy">Eclipse BIRT Designer Version 4.2.1.v201209101448 Build <4.2.1.v20120918-1113></property> + <simple-property-list name="includeResource"> + <value>allegro-tutti/common/nls/common</value> + </simple-property-list> + <list-property name="includeScripts"> + <property>allegro-tutti/common/js/common.js</property> + <property>allegro-tutti/common/js/messages.js</property> + </list-property> + <list-property name="propertyBindings"> + <structure> + <property name="name">HOME</property> + <property name="id">2421</property> + <expression name="value" type="javascript">params["rpt-param_dirfile"].value;</expression> + </structure> + <structure> + <property name="name">DELIMTYPE</property> + <property name="id">2421</property> + <expression name="value" type="javascript">cnxDELIMTYPE;</expression> + </structure> + <structure> + <property name="name">CHARSET</property> + <property name="id">2421</property> + <expression name="value" type="javascript">cnxCHARSET;</expression> + </structure> + <structure> + <property name="name">INCLCOLUMNNAME</property> + <property name="id">2421</property> + <expression name="value" type="javascript">cnxINCLCOLUMNNAME;</expression> + </structure> + <structure> + <property name="name">INCLTYPELINE</property> + <property name="id">2421</property> + <expression name="value" type="javascript">cnxINCLTYPELINE;</expression> + </structure> + </list-property> + <property name="units">in</property> + <method name="initialize"><![CDATA[reportContext.getAppContext().put("CHART_RESOLUTION", 300 );]]></method> + <property name="iconFile">/templates/blank_report.gif</property> + <property name="layoutPreference">auto layout</property> + <list-property name="cssStyleSheets"> + <structure> + <property name="fileName">allegro-tutti/common/css/common.css</property> + </structure> + </list-property> + <parameters> + <scalar-parameter name="rpt-param_codestation" id="3608"> + <property name="valueType">static</property> + <property name="isRequired">true</property> + <property name="dataType">string</property> + <property name="distinct">true</property> + <simple-property-list name="defaultValue"> + <value type="constant">0</value> + </simple-property-list> + <list-property name="selectionList"/> + <property name="paramType">simple</property> + <property name="controlType">text-box</property> + <structure name="format"> + <property name="category">Unformatted</property> + </structure> + </scalar-parameter> + <scalar-parameter name="rpt-param_numerotrait" id="3609"> + <property name="valueType">static</property> + <property name="isRequired">true</property> + <property name="dataType">integer</property> + <property name="distinct">true</property> + <simple-property-list name="defaultValue"> + <value type="constant">0</value> + </simple-property-list> + <list-property name="selectionList"/> + <property name="paramType">simple</property> + <property name="controlType">text-box</property> + <structure name="format"> + <property name="category">Unformatted</property> + </structure> + </scalar-parameter> + <scalar-parameter name="rpt-param_dirfile" id="3610"> + <property name="valueType">static</property> + <property name="dataType">string</property> + <property name="distinct">true</property> + <simple-property-list name="defaultValue"> + <value type="constant">C:\\DevSih\\Allegro_campagnes\\basetest</value> + </simple-property-list> + <list-property name="selectionList"/> + <property name="paramType">simple</property> + <property name="controlType">text-box</property> + <structure name="format"> + <property name="category">Unformatted</property> + </structure> + </scalar-parameter> + </parameters> + <data-sources> + <oda-data-source extensionID="org.eclipse.datatools.connectivity.oda.flatfile" name="FlatFileDataSource" id="2421"> + <method name="beforeOpen"><![CDATA[ + +]]></method> + <property name="HOME">C:\DevSih\Allegro_campagnes\basetest</property> + <property name="DELIMTYPE">SEMICOLON</property> + <property name="CHARSET">UTF-8</property> + <property name="INCLCOLUMNNAME">YES</property> + <property name="INCLTYPELINE">NO</property> + <property name="TRAILNULLCOLS">NO</property> + </oda-data-source> + </data-sources> + <data-sets> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="operation" id="2422"> + <list-property name="columnHints"> + <structure> + <property name="columnName">Annee</property> + <property name="analysis">measure</property> + <text-property name="heading">Annee</text-property> + </structure> + <structure> + <property name="columnName">Serie</property> + <property name="analysis">dimension</property> + <text-property name="heading">Serie</text-property> + </structure> + <structure> + <property name="columnName">Serie_Partielle</property> + <property name="analysis">dimension</property> + <text-property name="heading">Serie_Partielle</text-property> + </structure> + <structure> + <property name="columnName">Code_Station</property> + <property name="analysis">dimension</property> + <text-property name="heading">Code_Station</text-property> + </structure> + <structure> + <property name="columnName">Numero_Trait</property> + <property name="analysis">measure</property> + <text-property name="heading">Numero_Trait</text-property> + </structure> + <structure> + <property name="columnName">Poche</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poche</text-property> + </structure> + <structure> + <property name="columnName">Engin</property> + <property name="analysis">dimension</property> + <text-property name="heading">Engin</text-property> + </structure> + <structure> + <property name="columnName">Navire</property> + <property name="analysis">dimension</property> + <text-property name="heading">Navire</text-property> + </structure> + <structure> + <property name="columnName">DateDeb_Op</property> + <property name="analysis">dimension</property> + <text-property name="heading">DateDeb_Op</text-property> + </structure> + <structure> + <property name="columnName">LatDeb</property> + <property name="analysis">dimension</property> + <text-property name="heading">LatDeb</text-property> + </structure> + <structure> + <property name="columnName">LongDeb</property> + <property name="analysis">dimension</property> + <text-property name="heading">LongDeb</text-property> + </structure> + <structure> + <property name="columnName">DateFin_Op</property> + <property name="analysis">dimension</property> + <text-property name="heading">DateFin_Op</text-property> + </structure> + <structure> + <property name="columnName">LatFin</property> + <property name="analysis">dimension</property> + <text-property name="heading">LatFin</text-property> + </structure> + <structure> + <property name="columnName">LongFin</property> + <property name="analysis">dimension</property> + <text-property name="heading">LongFin</text-property> + </structure> + <structure> + <property name="columnName">Duree</property> + <property name="analysis">dimension</property> + <text-property name="heading">Duree</text-property> + </structure> + <structure> + <property name="columnName">Strate</property> + <property name="analysis">dimension</property> + <text-property name="heading">Strate</text-property> + </structure> + <structure> + <property name="columnName">Sous-Strate</property> + <property name="analysis">dimension</property> + <text-property name="heading">Sous-Strate</text-property> + </structure> + <structure> + <property name="columnName">Localite</property> + <property name="analysis">dimension</property> + <text-property name="heading">Localite</text-property> + </structure> + <structure> + <property name="columnName">Validite_OP</property> + <property name="analysis">dimension</property> + <text-property name="heading">Validite_OP</text-property> + </structure> + <structure> + <property name="columnName">Rectiligne</property> + <property name="analysis">dimension</property> + <text-property name="heading">Rectiligne</text-property> + </structure> + <structure> + <property name="columnName">Distance</property> + <property name="analysis">measure</property> + <text-property name="heading">Distance</text-property> + </structure> + <structure> + <property name="columnName">Ouv_Verticale</property> + <property name="analysis">dimension</property> + <text-property name="heading">Ouv_Verticale</text-property> + </structure> + <structure> + <property name="columnName">Ouv_Horizontale_Ailes</property> + <property name="analysis">dimension</property> + <text-property name="heading">Ouv_Horizontale_Ailes</text-property> + </structure> + <structure> + <property name="columnName">Ouv_Horizontale_Panneaux</property> + <property name="analysis">dimension</property> + <text-property name="heading">Ouv_Horizontale_Panneaux</text-property> + </structure> + <structure> + <property name="columnName">Saisisseur</property> + <property name="analysis">dimension</property> + <text-property name="heading">Saisisseur</text-property> + </structure> + <structure> + <property name="columnName">NavireAssocie</property> + <property name="analysis">dimension</property> + <text-property name="heading">NavireAssocie</text-property> + </structure> + <structure> + <property name="columnName">Commentaire</property> + <property name="analysis">dimension</property> + <text-property name="heading">Commentaire</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Vrac</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Vrac</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Vrac_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Vrac_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_HorsVrac</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_HorsVrac</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_HorsVrac_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_HorsVrac_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Non_Trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Non_Trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Non_Trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Non_Trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Tremis</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Tremis</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Tremis_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Tremis_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Carroussel</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Carroussel</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Carroussel_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Carroussel_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Espece</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Espece_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Vrac</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Espece_Vrac</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Vrac_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Espece_Vrac_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Vrac_Trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Espece_Vrac_Trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Vrac_Trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Espece_Vrac_Trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_HorsVrac</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Espece_HorsVrac</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_HorsVrac_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Espece_HorsVrac_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Inerte_Trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Espece_Inerte_Trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Inerte_Trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Espece_Inerte_Trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Vivant_non_detaille_trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Espece_Vivant_non_detaille_trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Benthos</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Benthos_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Vrac</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Benthos_Vrac</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Vrac_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Benthos_Vrac_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Vrac_Trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Benthos_Vrac_Trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Vrac_Trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Benthos_Vrac_Trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_HorsVrac</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Benthos_HorsVrac</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_HorsVrac_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Benthos_HorsVrac_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Inerte_Trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Benthos_Inerte_Trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Inerte_Trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Benthos_Inerte_Trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Vivant_non_detaille_trie</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Benthos_Vivant_non_detaille_trie</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Macro_Dechet</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Total_Macro_Dechet</text-property> + </structure> + <structure> + <property name="columnName">Poids_Total_Macro_Dechet_Calcule</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poids_Total_Macro_Dechet_Calcule</text-property> + </structure> + </list-property> + <list-property name="filter"> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">if (params["rpt-param_codestation"].value=="0") { + "0"; +} else { +row["Code_Station"] +}</expression> + <simple-property-list name="value1"> + <value>params["rpt-param_codestation"].value</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">if (params["rpt-param_numerotrait"].value==0) { + 0; +} else { +row["Numero_Trait"] +}</expression> + <simple-property-list name="value1"> + <value>params["rpt-param_numerotrait"].value</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + </list-property> + <list-property name="parameters"/> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Code_Station</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Numero_Trait</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Poche</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Engin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">DateDeb_Op</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">LatDeb</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">LongDeb</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">DateFin_Op</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">LatFin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">LongFin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Duree</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">16</property> + <property name="name">Strate</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">17</property> + <property name="name">Sous-Strate</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">18</property> + <property name="name">Localite</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">19</property> + <property name="name">Validite_OP</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">20</property> + <property name="name">Rectiligne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">21</property> + <property name="name">Distance</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">22</property> + <property name="name">Ouv_Verticale</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">23</property> + <property name="name">Ouv_Horizontale_Ailes</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">24</property> + <property name="name">Ouv_Horizontale_Panneaux</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">25</property> + <property name="name">Saisisseur</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">26</property> + <property name="name">NavireAssocie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">27</property> + <property name="name">Commentaire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">28</property> + <property name="name">Poids_Total</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">29</property> + <property name="name">Poids_Total_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">30</property> + <property name="name">Poids_Total_Vrac</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">31</property> + <property name="name">Poids_Total_Vrac_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">32</property> + <property name="name">Poids_Total_HorsVrac</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">33</property> + <property name="name">Poids_Total_HorsVrac_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">34</property> + <property name="name">Poids_Total_Non_Trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">35</property> + <property name="name">Poids_Total_Non_Trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">36</property> + <property name="name">Poids_Total_Tremis</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">37</property> + <property name="name">Poids_Total_Tremis_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">38</property> + <property name="name">Poids_Total_Carroussel</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">39</property> + <property name="name">Poids_Total_Carroussel_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">40</property> + <property name="name">Poids_Total_Espece</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">41</property> + <property name="name">Poids_Total_Espece_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">42</property> + <property name="name">Poids_Total_Espece_Vrac</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">43</property> + <property name="name">Poids_Total_Espece_Vrac_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">44</property> + <property name="name">Poids_Total_Espece_Vrac_Trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">45</property> + <property name="name">Poids_Total_Espece_Vrac_Trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">46</property> + <property name="name">Poids_Total_Espece_HorsVrac</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">47</property> + <property name="name">Poids_Total_Espece_HorsVrac_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">48</property> + <property name="name">Poids_Total_Espece_Inerte_Trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">49</property> + <property name="name">Poids_Total_Espece_Inerte_Trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">50</property> + <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">51</property> + <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">52</property> + <property name="name">Poids_Total_Benthos</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">53</property> + <property name="name">Poids_Total_Benthos_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">54</property> + <property name="name">Poids_Total_Benthos_Vrac</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">55</property> + <property name="name">Poids_Total_Benthos_Vrac_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">56</property> + <property name="name">Poids_Total_Benthos_Vrac_Trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">57</property> + <property name="name">Poids_Total_Benthos_Vrac_Trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">58</property> + <property name="name">Poids_Total_Benthos_HorsVrac</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">59</property> + <property name="name">Poids_Total_Benthos_HorsVrac_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">60</property> + <property name="name">Poids_Total_Benthos_Inerte_Trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">61</property> + <property name="name">Poids_Total_Benthos_Inerte_Trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">62</property> + <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">63</property> + <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">64</property> + <property name="name">Poids_Total_Macro_Dechet</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">65</property> + <property name="name">Poids_Total_Macro_Dechet_Calcule</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="nativeName">Annee</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="nativeName">Serie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="nativeName">Serie_Partielle</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Code_Station</property> + <property name="nativeName">Code_Station</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Numero_Trait</property> + <property name="nativeName">Numero_Trait</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Poche</property> + <property name="nativeName">Poche</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Engin</property> + <property name="nativeName">Engin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="nativeName">Navire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">DateDeb_Op</property> + <property name="nativeName">DateDeb_Op</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">LatDeb</property> + <property name="nativeName">LatDeb</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">LongDeb</property> + <property name="nativeName">LongDeb</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">DateFin_Op</property> + <property name="nativeName">DateFin_Op</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">LatFin</property> + <property name="nativeName">LatFin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">LongFin</property> + <property name="nativeName">LongFin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Duree</property> + <property name="nativeName">Duree</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">16</property> + <property name="name">Strate</property> + <property name="nativeName">Strate</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">17</property> + <property name="name">Sous-Strate</property> + <property name="nativeName">Sous-Strate</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">18</property> + <property name="name">Localite</property> + <property name="nativeName">Localite</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">19</property> + <property name="name">Validite_OP</property> + <property name="nativeName">Validite_OP</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">20</property> + <property name="name">Rectiligne</property> + <property name="nativeName">Rectiligne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">21</property> + <property name="name">Distance</property> + <property name="nativeName">Distance</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">22</property> + <property name="name">Ouv_Verticale</property> + <property name="nativeName">Ouv_Verticale</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">23</property> + <property name="name">Ouv_Horizontale_Ailes</property> + <property name="nativeName">Ouv_Horizontale_Ailes</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">24</property> + <property name="name">Ouv_Horizontale_Panneaux</property> + <property name="nativeName">Ouv_Horizontale_Panneaux</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">25</property> + <property name="name">Saisisseur</property> + <property name="nativeName">Saisisseur</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">26</property> + <property name="name">NavireAssocie</property> + <property name="nativeName">NavireAssocie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">27</property> + <property name="name">Commentaire</property> + <property name="nativeName">Commentaire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">28</property> + <property name="name">Poids_Total</property> + <property name="nativeName">Poids_Total</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">29</property> + <property name="name">Poids_Total_Calcule</property> + <property name="nativeName">Poids_Total_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">30</property> + <property name="name">Poids_Total_Vrac</property> + <property name="nativeName">Poids_Total_Vrac</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">31</property> + <property name="name">Poids_Total_Vrac_Calcule</property> + <property name="nativeName">Poids_Total_Vrac_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">32</property> + <property name="name">Poids_Total_HorsVrac</property> + <property name="nativeName">Poids_Total_HorsVrac</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">33</property> + <property name="name">Poids_Total_HorsVrac_Calcule</property> + <property name="nativeName">Poids_Total_HorsVrac_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">34</property> + <property name="name">Poids_Total_Non_Trie</property> + <property name="nativeName">Poids_Total_Non_Trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">35</property> + <property name="name">Poids_Total_Non_Trie_Calcule</property> + <property name="nativeName">Poids_Total_Non_Trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">36</property> + <property name="name">Poids_Total_Tremis</property> + <property name="nativeName">Poids_Total_Tremis</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">37</property> + <property name="name">Poids_Total_Tremis_Calcule</property> + <property name="nativeName">Poids_Total_Tremis_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">38</property> + <property name="name">Poids_Total_Carroussel</property> + <property name="nativeName">Poids_Total_Carroussel</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">39</property> + <property name="name">Poids_Total_Carroussel_Calcule</property> + <property name="nativeName">Poids_Total_Carroussel_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">40</property> + <property name="name">Poids_Total_Espece</property> + <property name="nativeName">Poids_Total_Espece</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">41</property> + <property name="name">Poids_Total_Espece_Calcule</property> + <property name="nativeName">Poids_Total_Espece_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">42</property> + <property name="name">Poids_Total_Espece_Vrac</property> + <property name="nativeName">Poids_Total_Espece_Vrac</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">43</property> + <property name="name">Poids_Total_Espece_Vrac_Calcule</property> + <property name="nativeName">Poids_Total_Espece_Vrac_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">44</property> + <property name="name">Poids_Total_Espece_Vrac_Trie</property> + <property name="nativeName">Poids_Total_Espece_Vrac_Trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">45</property> + <property name="name">Poids_Total_Espece_Vrac_Trie_Calcule</property> + <property name="nativeName">Poids_Total_Espece_Vrac_Trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">46</property> + <property name="name">Poids_Total_Espece_HorsVrac</property> + <property name="nativeName">Poids_Total_Espece_HorsVrac</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">47</property> + <property name="name">Poids_Total_Espece_HorsVrac_Calcule</property> + <property name="nativeName">Poids_Total_Espece_HorsVrac_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">48</property> + <property name="name">Poids_Total_Espece_Inerte_Trie</property> + <property name="nativeName">Poids_Total_Espece_Inerte_Trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">49</property> + <property name="name">Poids_Total_Espece_Inerte_Trie_Calcule</property> + <property name="nativeName">Poids_Total_Espece_Inerte_Trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">50</property> + <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie</property> + <property name="nativeName">Poids_Total_Espece_Vivant_non_detaille_trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">51</property> + <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> + <property name="nativeName">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">52</property> + <property name="name">Poids_Total_Benthos</property> + <property name="nativeName">Poids_Total_Benthos</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">53</property> + <property name="name">Poids_Total_Benthos_Calcule</property> + <property name="nativeName">Poids_Total_Benthos_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">54</property> + <property name="name">Poids_Total_Benthos_Vrac</property> + <property name="nativeName">Poids_Total_Benthos_Vrac</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">55</property> + <property name="name">Poids_Total_Benthos_Vrac_Calcule</property> + <property name="nativeName">Poids_Total_Benthos_Vrac_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">56</property> + <property name="name">Poids_Total_Benthos_Vrac_Trie</property> + <property name="nativeName">Poids_Total_Benthos_Vrac_Trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">57</property> + <property name="name">Poids_Total_Benthos_Vrac_Trie_Calcule</property> + <property name="nativeName">Poids_Total_Benthos_Vrac_Trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">58</property> + <property name="name">Poids_Total_Benthos_HorsVrac</property> + <property name="nativeName">Poids_Total_Benthos_HorsVrac</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">59</property> + <property name="name">Poids_Total_Benthos_HorsVrac_Calcule</property> + <property name="nativeName">Poids_Total_Benthos_HorsVrac_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">60</property> + <property name="name">Poids_Total_Benthos_Inerte_Trie</property> + <property name="nativeName">Poids_Total_Benthos_Inerte_Trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">61</property> + <property name="name">Poids_Total_Benthos_Inerte_Trie_Calcule</property> + <property name="nativeName">Poids_Total_Benthos_Inerte_Trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">62</property> + <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie</property> + <property name="nativeName">Poids_Total_Benthos_Vivant_non_detaille_trie</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">63</property> + <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> + <property name="nativeName">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">64</property> + <property name="name">Poids_Total_Macro_Dechet</property> + <property name="nativeName">Poids_Total_Macro_Dechet</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">65</property> + <property name="name">Poids_Total_Macro_Dechet_Calcule</property> + <property name="nativeName">Poids_Total_Macro_Dechet_Calcule</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Numero_Trait", "Poche", "Engin", "Navire", "DateDeb_Op", "LatDeb", "LongDeb", "DateFin_Op", "LatFin", "LongFin", "Duree", "Strate", "Sous-Strate", "Localite", "Validite_OP", "Rectiligne", "Distance", "Ouv_Verticale", "Ouv_Horizontale_Ailes", "Ouv_Horizontale_Panneaux", "Saisisseur", "NavireAssocie", "Commentaire", "Poids_Total", "Poids_Total_Calcule", "Poids_Total_Vrac", "Poids_Total_Vrac_Calcule", "Poids_Total_HorsVrac", "Poids_Total_HorsVrac_Calcule", "Poids_Total_Non_Trie", "Poids_Total_Non_Trie_Calcule", "Poids_Total_Tremis", "Poids_Total_Tremis_Calcule", "Poids_Total_Carroussel", "Poids_Total_Carroussel_Calcule", "Poids_Total_Espece", "Poids_Total_Espece_Calcule", "Poids_Total_Espece_Vrac", "Poids_Total_Espece_Vrac_Calcule", "Poids_Total_Espece_Vrac_Trie", "Poids_Total_Espece_Vrac_Trie_Calcule", "Poids_Total_Espece_HorsVrac", "Poids_Total_Espece_HorsVrac_Calcule", "Poids_Total_Espece_Inerte_Trie", "Poids_Total_Espece_Inerte_Trie_Calcule", "Poids_Total_Espece_Vivant_non_detaille_trie", "Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", "Poids_Total_Benthos", "Poids_Total_Benthos_Calcule", "Poids_Total_Benthos_Vrac", "Poids_Total_Benthos_Vrac_Calcule", "Poids_Total_Benthos_Vrac_Trie", "Poids_Total_Benthos_Vrac_Trie_Calcule", "Poids_Total_Benthos_HorsVrac", "Poids_Total_Benthos_HorsVrac_Calcule", "Poids_Total_Benthos_Inerte_Trie", "Poids_Total_Benthos_Inerte_Trie_Calcule", "Poids_Total_Benthos_Vivant_non_detaille_trie", "Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", "Poids_Total_Macro_Dechet", "Poids_Total_Macro_Dechet_Calcule" from "operation.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Engin","Engin",STRING;"Navire","Navire",STRING;"DateDeb_Op","DateDeb_Op",STRING;"LatDeb","LatDeb",STRING;"LongDeb","LongDeb",STRING;"DateFin_Op","DateFin_Op",STRING;"LatFin","LatFin",STRING;"LongFin","LongFin",STRING;"Duree","Duree",STRING;"Strate","Strate",STRING;"Sous-Strate","Sous-Strate",STRING;"Localite","Localite",STRING;"Validite_OP","Validite_OP",STRING;"Rectiligne","Rectiligne",STRING;"Distance","Distance",BIGDECIMAL;"Ouv_Verticale","Ouv_Verticale",STRING;"Ouv_Horizontale_Ailes","Ouv_Horizontale_Ailes",STRING;"Ouv_Horizontale_Panneaux","Ouv_Horizontale_Panneaux",STRING;"Saisisseur","Saisisseur",STRING;"NavireAssocie","NavireAssocie",STRING;"Commentaire","Commentaire",STRING;"Poids_Total","Poids_Total",BIGDECIMAL;"Poids_Total_Calcule","Poids_Total_Calcule",STRING;"Poids_Total_Vrac","Poids_Total_Vrac",BIGDECIMAL;"Poids_Total_Vrac_Calcule","Poids_Total_Vrac_Calcule",STRING;"Poids_Total_HorsVrac","Poids_Total_HorsVrac",BIGDECIMAL;"Poids_Total_HorsVrac_Calcule","Poids_Total_HorsVrac_Calcule",STRING;"Poids_Total_Non_Trie","Poids_Total_Non_Trie",BIGDECIMAL;"Poids_Total_Non_Trie_Calcule","Poids_Total_Non_Trie_Calcule",STRING;"Poids_Total_Tremis","Poids_Total_Tremis",BIGDECIMAL;"Poids_Total_Tremis_Calcule","Poids_Total_Tremis_Calcule",STRING;"Poids_Total_Carroussel","Poids_Total_Carroussel",BIGDECIMAL;"Poids_Total_Carroussel_Calcule","Poids_Total_Carroussel_Calcule",STRING;"Poids_Total_Espece","Poids_Total_Espece",BIGDECIMAL;"Poids_Total_Espece_Calcule","Poids_Total_Espece_Calcule",STRING;"Poids_Total_Espece_Vrac","Poids_Total_Espece_Vrac",BIGDECIMAL;"Poids_Total_Espece_Vrac_Calcule","Poids_Total_Espece_Vrac_Calcule",STRING;"Poids_Total_Espece_Vrac_Trie","Poids_Total_Espece_Vrac_Trie",BIGDECIMAL;"Poids_Total_Espece_Vrac_Trie_Calcule","Poids_Total_Espece_Vrac_Trie_Calcule",STRING;"Poids_Total_Espece_HorsVrac","Poids_Total_Espece_HorsVrac",BIGDECIMAL;"Poids_Total_Espece_HorsVrac_Calcule","Poids_Total_Espece_HorsVrac_Calcule",STRING;"Poids_Total_Espece_Inerte_Trie","Poids_Total_Espece_Inerte_Trie",BIGDECIMAL;"Poids_Total_Espece_Inerte_Trie_Calcule","Poids_Total_Espece_Inerte_Trie_Calcule",STRING;"Poids_Total_Espece_Vivant_non_detaille_trie","Poids_Total_Espece_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Espece_Vivant_non_detaille_trie_Calcule","Poids_Total_Espece_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Benthos","Poids_Total_Benthos",BIGDECIMAL;"Poids_Total_Benthos_Calcule","Poids_Total_Benthos_Calcule",STRING;"Poids_Total_Benthos_Vrac","Poids_Total_Benthos_Vrac",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Calcule","Poids_Total_Benthos_Vrac_Calcule",STRING;"Poids_Total_Benthos_Vrac_Trie","Poids_Total_Benthos_Vrac_Trie",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Trie_Calcule","Poids_Total_Benthos_Vrac_Trie_Calcule",STRING;"Poids_Total_Benthos_HorsVrac","Poids_Total_Benthos_HorsVrac",BIGDECIMAL;"Poids_Total_Benthos_HorsVrac_Calcule","Poids_Total_Benthos_HorsVrac_Calcule",STRING;"Poids_Total_Benthos_Inerte_Trie","Poids_Total_Benthos_Inerte_Trie",BIGDECIMAL;"Poids_Total_Benthos_Inerte_Trie_Calcule","Poids_Total_Benthos_Inerte_Trie_Calcule",STRING;"Poids_Total_Benthos_Vivant_non_detaille_trie","Poids_Total_Benthos_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule","Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Macro_Dechet","Poids_Total_Macro_Dechet",BIGDECIMAL;"Poids_Total_Macro_Dechet_Calcule","Poids_Total_Macro_Dechet_Calcule",STRING}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>2.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Annee</design:name> + <design:position>1</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Annee</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Serie</design:name> + <design:position>2</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Serie_Partielle</design:name> + <design:position>3</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie_Partielle</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Code_Station</design:name> + <design:position>4</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Station</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Numero_Trait</design:name> + <design:position>5</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Numero_Trait</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poche</design:name> + <design:position>6</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poche</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Engin</design:name> + <design:position>7</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Engin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Navire</design:name> + <design:position>8</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Navire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>DateDeb_Op</design:name> + <design:position>9</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>DateDeb_Op</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>LatDeb</design:name> + <design:position>10</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>LatDeb</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>LongDeb</design:name> + <design:position>11</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>LongDeb</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>DateFin_Op</design:name> + <design:position>12</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>DateFin_Op</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>LatFin</design:name> + <design:position>13</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>LatFin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>LongFin</design:name> + <design:position>14</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>LongFin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Duree</design:name> + <design:position>15</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Duree</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Strate</design:name> + <design:position>16</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Strate</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Sous-Strate</design:name> + <design:position>17</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Sous-Strate</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Localite</design:name> + <design:position>18</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Localite</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Validite_OP</design:name> + <design:position>19</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Validite_OP</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Rectiligne</design:name> + <design:position>20</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Rectiligne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Distance</design:name> + <design:position>21</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Distance</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ouv_Verticale</design:name> + <design:position>22</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ouv_Verticale</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ouv_Horizontale_Ailes</design:name> + <design:position>23</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ouv_Horizontale_Ailes</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ouv_Horizontale_Panneaux</design:name> + <design:position>24</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ouv_Horizontale_Panneaux</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Saisisseur</design:name> + <design:position>25</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Saisisseur</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>NavireAssocie</design:name> + <design:position>26</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>NavireAssocie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Commentaire</design:name> + <design:position>27</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Commentaire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total</design:name> + <design:position>28</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Calcule</design:name> + <design:position>29</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Vrac</design:name> + <design:position>30</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Vrac</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Vrac_Calcule</design:name> + <design:position>31</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Vrac_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_HorsVrac</design:name> + <design:position>32</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_HorsVrac</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_HorsVrac_Calcule</design:name> + <design:position>33</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_HorsVrac_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Non_Trie</design:name> + <design:position>34</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Non_Trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Non_Trie_Calcule</design:name> + <design:position>35</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Non_Trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Tremis</design:name> + <design:position>36</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Tremis</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Tremis_Calcule</design:name> + <design:position>37</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Tremis_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Carroussel</design:name> + <design:position>38</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Carroussel</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Carroussel_Calcule</design:name> + <design:position>39</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Carroussel_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece</design:name> + <design:position>40</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Calcule</design:name> + <design:position>41</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Vrac</design:name> + <design:position>42</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Vrac</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Vrac_Calcule</design:name> + <design:position>43</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Vrac_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Vrac_Trie</design:name> + <design:position>44</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Vrac_Trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Vrac_Trie_Calcule</design:name> + <design:position>45</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Vrac_Trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_HorsVrac</design:name> + <design:position>46</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_HorsVrac</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_HorsVrac_Calcule</design:name> + <design:position>47</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_HorsVrac_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Inerte_Trie</design:name> + <design:position>48</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Inerte_Trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Inerte_Trie_Calcule</design:name> + <design:position>49</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Inerte_Trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Vivant_non_detaille_trie</design:name> + <design:position>50</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Vivant_non_detaille_trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</design:name> + <design:position>51</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos</design:name> + <design:position>52</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Calcule</design:name> + <design:position>53</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Vrac</design:name> + <design:position>54</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Vrac</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Vrac_Calcule</design:name> + <design:position>55</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Vrac_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Vrac_Trie</design:name> + <design:position>56</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Vrac_Trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Vrac_Trie_Calcule</design:name> + <design:position>57</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Vrac_Trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_HorsVrac</design:name> + <design:position>58</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_HorsVrac</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_HorsVrac_Calcule</design:name> + <design:position>59</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_HorsVrac_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Inerte_Trie</design:name> + <design:position>60</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Inerte_Trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Inerte_Trie_Calcule</design:name> + <design:position>61</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Inerte_Trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Vivant_non_detaille_trie</design:name> + <design:position>62</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Vivant_non_detaille_trie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</design:name> + <design:position>63</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Macro_Dechet</design:name> + <design:position>64</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Macro_Dechet</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Total_Macro_Dechet_Calcule</design:name> + <design:position>65</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Total_Macro_Dechet_Calcule</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="survey" id="2452"> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Navire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Pays</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Zone_Etude</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Id_Sismer</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Date_Deb_Campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">Port_Deb_Campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Date_Fin_Campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">Port_Fin_Campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Chef_Mission</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">Resp_Salle_Tri</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Commentaire</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="nativeName">Annee</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="nativeName">Serie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="nativeName">Serie_Partielle</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Navire</property> + <property name="nativeName">Navire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Pays</property> + <property name="nativeName">Pays</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Zone_Etude</property> + <property name="nativeName">Zone_Etude</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Campagne</property> + <property name="nativeName">Campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Id_Sismer</property> + <property name="nativeName">Id_Sismer</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Date_Deb_Campagne</property> + <property name="nativeName">Date_Deb_Campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">Port_Deb_Campagne</property> + <property name="nativeName">Port_Deb_Campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Date_Fin_Campagne</property> + <property name="nativeName">Date_Fin_Campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">Port_Fin_Campagne</property> + <property name="nativeName">Port_Fin_Campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Chef_Mission</property> + <property name="nativeName">Chef_Mission</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">Resp_Salle_Tri</property> + <property name="nativeName">Resp_Salle_Tri</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Commentaire</property> + <property name="nativeName">Commentaire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Navire", "Pays", "Zone_Etude", "Campagne", "Id_Sismer", "Date_Deb_Campagne", "Port_Deb_Campagne", "Date_Fin_Campagne", "Port_Fin_Campagne", "Chef_Mission", "Resp_Salle_Tri", "Commentaire" from survey.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Navire","Navire",STRING;"Pays","Pays",STRING;"Zone_Etude","Zone_Etude",STRING;"Campagne","Campagne",STRING;"Id_Sismer","Id_Sismer",STRING;"Date_Deb_Campagne","Date_Deb_Campagne",STRING;"Port_Deb_Campagne","Port_Deb_Campagne",STRING;"Date_Fin_Campagne","Date_Fin_Campagne",STRING;"Port_Fin_Campagne","Port_Fin_Campagne",STRING;"Chef_Mission","Chef_Mission",STRING;"Resp_Salle_Tri","Resp_Salle_Tri",STRING;"Commentaire","Commentaire",STRING}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>1.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Annee</design:name> + <design:position>1</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Annee</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie</design:name> + <design:position>2</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie_Partielle</design:name> + <design:position>3</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie_Partielle</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Navire</design:name> + <design:position>4</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Navire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Pays</design:name> + <design:position>5</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Pays</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Zone_Etude</design:name> + <design:position>6</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Zone_Etude</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Campagne</design:name> + <design:position>7</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Campagne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Id_Sismer</design:name> + <design:position>8</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Id_Sismer</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Date_Deb_Campagne</design:name> + <design:position>9</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Date_Deb_Campagne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Port_Deb_Campagne</design:name> + <design:position>10</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Port_Deb_Campagne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Date_Fin_Campagne</design:name> + <design:position>11</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Date_Fin_Campagne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Port_Fin_Campagne</design:name> + <design:position>12</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Port_Fin_Campagne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Chef_Mission</design:name> + <design:position>13</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Chef_Mission</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Resp_Salle_Tri</design:name> + <design:position>14</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Resp_Salle_Tri</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Commentaire</design:name> + <design:position>15</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Commentaire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="parameter" id="2788"> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Code_Station</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Numero_Trait</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Poche</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Code_PMFM</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Libelle_PMFm</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Valeur</property> + <property name="dataType">decimal</property> + </structure> + </list-property> + </structure> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="nativeName">Annee</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="nativeName">Serie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="nativeName">Serie_Partielle</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Code_Station</property> + <property name="nativeName">Code_Station</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Numero_Trait</property> + <property name="nativeName">Numero_Trait</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Poche</property> + <property name="nativeName">Poche</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Code_PMFM</property> + <property name="nativeName">Code_PMFM</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Libelle_PMFm</property> + <property name="nativeName">Libelle_PMFm</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Valeur</property> + <property name="nativeName">Valeur</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Numero_Trait", "Poche", "Code_PMFM", "Libelle_PMFm", "Valeur" from parameter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Code_PMFM","Code_PMFM",STRING;"Libelle_PMFm","Libelle_PMFm",STRING;"Valeur","Valeur",BIGDECIMAL}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>1.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Annee</design:name> + <design:position>1</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Annee</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie</design:name> + <design:position>2</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie_Partielle</design:name> + <design:position>3</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie_Partielle</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Code_Station</design:name> + <design:position>4</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Station</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Numero_Trait</design:name> + <design:position>5</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Numero_Trait</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Poche</design:name> + <design:position>6</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poche</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Code_PMFM</design:name> + <design:position>7</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_PMFM</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Libelle_PMFm</design:name> + <design:position>8</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Libelle_PMFm</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Valeur</design:name> + <design:position>9</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Valeur</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="marineLitter" id="3166"> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">MarineLitterCategory</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">MarineLitterSizeCategory</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Number</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">Weight</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Commentaire</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="nativeName">Annee</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="nativeName">Serie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="nativeName">Serie_Partielle</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="nativeName">Engin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="nativeName">Code_Station</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="nativeName">Numero_Trait</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="nativeName">Poche</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="nativeName">Navire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">MarineLitterCategory</property> + <property name="nativeName">MarineLitterCategory</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">MarineLitterSizeCategory</property> + <property name="nativeName">MarineLitterSizeCategory</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Number</property> + <property name="nativeName">Number</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">Weight</property> + <property name="nativeName">Weight</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Commentaire</property> + <property name="nativeName">Commentaire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Numero_Trait", "Poche", "Navire", "MarineLitterCategory", "MarineLitterSizeCategory", "Number", "Weight", "Commentaire" from marineLitter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"MarineLitterCategory","MarineLitterCategory",STRING;"MarineLitterSizeCategory","MarineLitterSizeCategory",STRING;"Number","Number",INT;"Weight","Weight",BIGDECIMAL;"Commentaire","Commentaire",STRING}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>1.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Annee</design:name> + <design:position>1</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Annee</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie</design:name> + <design:position>2</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie_Partielle</design:name> + <design:position>3</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie_Partielle</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Engin</design:name> + <design:position>4</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Engin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Code_Station</design:name> + <design:position>5</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Station</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Numero_Trait</design:name> + <design:position>6</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Numero_Trait</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Poche</design:name> + <design:position>7</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poche</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Navire</design:name> + <design:position>8</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Navire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>MarineLitterCategory</design:name> + <design:position>9</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>MarineLitterCategory</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>MarineLitterSizeCategory</design:name> + <design:position>10</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>MarineLitterSizeCategory</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Number</design:name> + <design:position>11</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Number</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Weight</design:name> + <design:position>12</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Weight</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Commentaire</design:name> + <design:position>13</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Commentaire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="catch" id="3180"> + <list-property name="computedColumns"> + <structure> + <property name="name">categorisation-du-lot</property> + <expression name="expression">var cat=""; +if (row["Num_Ordre_V_HV_H2"] != null){ +cat+=row["V_HV"]; +} + +if (row["Num_Ordre_Class_Tri__H2"] != null){ + if (cat != "") { + cat+=" - "; + } + cat+=row["V_HV"]; +} + +if (row["Num_Ordre_Sexe_H2"] != null){ + if (cat != "") { + cat+=" - "; + } + cat+=row["Sexe"]; +} + +if (row["Num_Ordre_Maturité_H2"] != null){ + if (cat != "") { + cat+=" - "; + } + cat+=row["Maturité"]; +} + +if (row["Num_Ordre_Age_H2"] != null){ + if (cat != "") { + cat+=" - "; + } + cat+=row["Age"]; +} + +cat+=" / "+row["Poids_Reference"] + " kg";</expression> + <property name="dataType">string</property> + </structure> + </list-property> + <list-property name="columnHints"> + <structure> + <property name="columnName">Annee</property> + <property name="analysis">measure</property> + <text-property name="heading">Annee</text-property> + </structure> + <structure> + <property name="columnName">Serie</property> + <property name="analysis">dimension</property> + <text-property name="heading">Serie</text-property> + </structure> + <structure> + <property name="columnName">Serie_Partielle</property> + <property name="analysis">dimension</property> + <text-property name="heading">Serie_Partielle</text-property> + </structure> + <structure> + <property name="columnName">Engin</property> + <property name="analysis">dimension</property> + <text-property name="heading">Engin</text-property> + </structure> + <structure> + <property name="columnName">Code_Station</property> + <property name="analysis">dimension</property> + <text-property name="heading">Code_Station</text-property> + </structure> + <structure> + <property name="columnName">Numero_Trait</property> + <property name="analysis">measure</property> + <text-property name="heading">Numero_Trait</text-property> + </structure> + <structure> + <property name="columnName">Poche</property> + <property name="analysis">dimension</property> + <text-property name="heading">Poche</text-property> + </structure> + <structure> + <property name="columnName">Navire</property> + <property name="analysis">dimension</property> + <text-property name="heading">Navire</text-property> + </structure> + <structure> + <property name="columnName">Taxon</property> + <property name="analysis">measure</property> + <text-property name="heading">Taxon</text-property> + </structure> + <structure> + <property name="columnName">Nom_scientifique</property> + <property name="analysis">dimension</property> + <text-property name="heading">Nom_scientifique</text-property> + </structure> + <structure> + <property name="columnName">Commentaire</property> + <property name="analysis">dimension</property> + <text-property name="heading">Commentaire</text-property> + </structure> + <structure> + <property name="columnName">V_HV</property> + <property name="analysis">dimension</property> + <text-property name="heading">V_HV</text-property> + </structure> + <structure> + <property name="columnName">Num_Ordre_V_HV_H2</property> + <property name="analysis">measure</property> + <text-property name="heading">Num_Ordre_V_HV_H2</text-property> + </structure> + <structure> + <property name="columnName">Tot_V_HV</property> + <property name="analysis">measure</property> + <text-property name="heading">Tot_V_HV</text-property> + </structure> + <structure> + <property name="columnName">Ech_V_HV</property> + <property name="analysis">measure</property> + <text-property name="heading">Ech_V_HV</text-property> + </structure> + <structure> + <property name="columnName">Type_Volume_Poids_V_HV</property> + <property name="analysis">dimension</property> + <text-property name="heading">Type_Volume_Poids_V_HV</text-property> + </structure> + <structure> + <property name="columnName">Unite_Volume_Poids_V_HV</property> + <property name="analysis">dimension</property> + <text-property name="heading">Unite_Volume_Poids_V_HV</text-property> + </structure> + <structure> + <property name="columnName">Class_Tri_</property> + <property name="analysis">dimension</property> + <text-property name="heading">Class_Tri_</text-property> + </structure> + <structure> + <property name="columnName">Num_Ordre_Class_Tri__H2</property> + <property name="analysis">measure</property> + <text-property name="heading">Num_Ordre_Class_Tri__H2</text-property> + </structure> + <structure> + <property name="columnName">Tot_Class_Tri_</property> + <property name="analysis">measure</property> + <text-property name="heading">Tot_Class_Tri_</text-property> + </structure> + <structure> + <property name="columnName">Ech_Class_Tri_</property> + <property name="analysis">measure</property> + <text-property name="heading">Ech_Class_Tri_</text-property> + </structure> + <structure> + <property name="columnName">Type_Volume_Poids_Class_Tri_</property> + <property name="analysis">dimension</property> + <text-property name="heading">Type_Volume_Poids_Class_Tri_</text-property> + </structure> + <structure> + <property name="columnName">Unite_Volume_Poids_Class_Tri_</property> + <property name="analysis">dimension</property> + <text-property name="heading">Unite_Volume_Poids_Class_Tri_</text-property> + </structure> + <structure> + <property name="columnName">Sexe</property> + <property name="analysis">dimension</property> + <text-property name="heading">Sexe</text-property> + </structure> + <structure> + <property name="columnName">Num_Ordre_Sexe_H2</property> + <property name="analysis">measure</property> + <text-property name="heading">Num_Ordre_Sexe_H2</text-property> + </structure> + <structure> + <property name="columnName">Tot_Sexe</property> + <property name="analysis">measure</property> + <text-property name="heading">Tot_Sexe</text-property> + </structure> + <structure> + <property name="columnName">Ech_Sexe</property> + <property name="analysis">measure</property> + <text-property name="heading">Ech_Sexe</text-property> + </structure> + <structure> + <property name="columnName">Type_Volume_Poids_Sexe</property> + <property name="analysis">dimension</property> + <text-property name="heading">Type_Volume_Poids_Sexe</text-property> + </structure> + <structure> + <property name="columnName">Unite_Volume_Poids_Sexe</property> + <property name="analysis">dimension</property> + <text-property name="heading">Unite_Volume_Poids_Sexe</text-property> + </structure> + <structure> + <property name="columnName">Maturité</property> + <property name="analysis">dimension</property> + <text-property name="heading">Maturité</text-property> + </structure> + <structure> + <property name="columnName">Num_Ordre_Maturité_H2</property> + <property name="analysis">measure</property> + <text-property name="heading">Num_Ordre_Maturité_H2</text-property> + </structure> + <structure> + <property name="columnName">Tot_Maturité</property> + <property name="analysis">measure</property> + <text-property name="heading">Tot_Maturité</text-property> + </structure> + <structure> + <property name="columnName">Ech_Maturité</property> + <property name="analysis">measure</property> + <text-property name="heading">Ech_Maturité</text-property> + </structure> + <structure> + <property name="columnName">Type_Volume_Poids_Maturité</property> + <property name="analysis">dimension</property> + <text-property name="heading">Type_Volume_Poids_Maturité</text-property> + </structure> + <structure> + <property name="columnName">Unite_Volume_Poids_Maturité</property> + <property name="analysis">dimension</property> + <text-property name="heading">Unite_Volume_Poids_Maturité</text-property> + </structure> + <structure> + <property name="columnName">Age</property> + <property name="analysis">dimension</property> + <text-property name="heading">Age</text-property> + </structure> + <structure> + <property name="columnName">Num_Ordre_Age_H2</property> + <property name="analysis">measure</property> + <text-property name="heading">Num_Ordre_Age_H2</text-property> + </structure> + <structure> + <property name="columnName">Tot_Age</property> + <property name="analysis">measure</property> + <text-property name="heading">Tot_Age</text-property> + </structure> + <structure> + <property name="columnName">Ech_Age</property> + <property name="analysis">measure</property> + <text-property name="heading">Ech_Age</text-property> + </structure> + <structure> + <property name="columnName">Type_Volume_Poids_Age</property> + <property name="analysis">dimension</property> + <text-property name="heading">Type_Volume_Poids_Age</text-property> + </structure> + <structure> + <property name="columnName">Unite_Volume_Poids_Age</property> + <property name="analysis">dimension</property> + <text-property name="heading">Unite_Volume_Poids_Age</text-property> + </structure> + <structure> + <property name="columnName">Code_Longueur</property> + <property name="analysis">measure</property> + <text-property name="heading">Code_Longueur</text-property> + </structure> + <structure> + <property name="columnName">Libelle_Longueur</property> + <property name="analysis">dimension</property> + <text-property name="heading">Libelle_Longueur</text-property> + </structure> + <structure> + <property name="columnName">Taille</property> + <property name="analysis">measure</property> + <text-property name="heading">Taille</text-property> + </structure> + <structure> + <property name="columnName">NumOrdre_Taille_H2</property> + <property name="analysis">measure</property> + <text-property name="heading">NumOrdre_Taille_H2</text-property> + </structure> + <structure> + <property name="columnName">Poids_Classe_Taille</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Classe_Taille</text-property> + </structure> + <structure> + <property name="columnName">Unite_Taille</property> + <property name="analysis">dimension</property> + <text-property name="heading">Unite_Taille</text-property> + </structure> + <structure> + <property name="columnName">Precision_Mesure</property> + <property name="analysis">measure</property> + <text-property name="heading">Precision_Mesure</text-property> + </structure> + <structure> + <property name="columnName">Nbr</property> + <property name="analysis">measure</property> + <text-property name="heading">Nbr</text-property> + </structure> + <structure> + <property name="columnName">Poids_Reference</property> + <property name="analysis">measure</property> + <text-property name="heading">Poids_Reference</text-property> + </structure> + <structure> + <property name="columnName">Coef_Elev_Espece_Capture</property> + <property name="analysis">measure</property> + <text-property name="heading">Coef_Elev_Espece_Capture</text-property> + </structure> + </list-property> + <list-property name="parameters"/> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Taxon</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">Nom_scientifique</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Commentaire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">V_HV</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Num_Ordre_V_HV_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">Tot_V_HV</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Ech_V_HV</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">16</property> + <property name="name">Type_Volume_Poids_V_HV</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">17</property> + <property name="name">Unite_Volume_Poids_V_HV</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">18</property> + <property name="name">Class_Tri_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">19</property> + <property name="name">Num_Ordre_Class_Tri__H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">20</property> + <property name="name">Tot_Class_Tri_</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">21</property> + <property name="name">Ech_Class_Tri_</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">22</property> + <property name="name">Type_Volume_Poids_Class_Tri_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">23</property> + <property name="name">Unite_Volume_Poids_Class_Tri_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">24</property> + <property name="name">Sexe</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">25</property> + <property name="name">Num_Ordre_Sexe_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">26</property> + <property name="name">Tot_Sexe</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">27</property> + <property name="name">Ech_Sexe</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">28</property> + <property name="name">Type_Volume_Poids_Sexe</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">29</property> + <property name="name">Unite_Volume_Poids_Sexe</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">30</property> + <property name="name">Maturité</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">31</property> + <property name="name">Num_Ordre_Maturité_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">32</property> + <property name="name">Tot_Maturité</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">33</property> + <property name="name">Ech_Maturité</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">34</property> + <property name="name">Type_Volume_Poids_Maturité</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">35</property> + <property name="name">Unite_Volume_Poids_Maturité</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">36</property> + <property name="name">Age</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">37</property> + <property name="name">Num_Ordre_Age_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">38</property> + <property name="name">Tot_Age</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">39</property> + <property name="name">Ech_Age</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">40</property> + <property name="name">Type_Volume_Poids_Age</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">41</property> + <property name="name">Unite_Volume_Poids_Age</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">42</property> + <property name="name">Code_Longueur</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">43</property> + <property name="name">Libelle_Longueur</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">44</property> + <property name="name">Taille</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">45</property> + <property name="name">NumOrdre_Taille_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">46</property> + <property name="name">Poids_Classe_Taille</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">47</property> + <property name="name">Unite_Taille</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">48</property> + <property name="name">Precision_Mesure</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">49</property> + <property name="name">Nbr</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">50</property> + <property name="name">Poids_Reference</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">51</property> + <property name="name">Coef_Elev_Espece_Capture</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">52</property> + <property name="name">categorisation-du-lot</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="nativeName">Annee</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="nativeName">Serie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="nativeName">Serie_Partielle</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="nativeName">Engin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="nativeName">Code_Station</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="nativeName">Numero_Trait</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="nativeName">Poche</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="nativeName">Navire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Taxon</property> + <property name="nativeName">Taxon</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">Nom_scientifique</property> + <property name="nativeName">Nom_scientifique</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Commentaire</property> + <property name="nativeName">Commentaire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">V_HV</property> + <property name="nativeName">V_HV</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Num_Ordre_V_HV_H2</property> + <property name="nativeName">Num_Ordre_V_HV_H2</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">Tot_V_HV</property> + <property name="nativeName">Tot_V_HV</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Ech_V_HV</property> + <property name="nativeName">Ech_V_HV</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">16</property> + <property name="name">Type_Volume_Poids_V_HV</property> + <property name="nativeName">Type_Volume_Poids_V_HV</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">17</property> + <property name="name">Unite_Volume_Poids_V_HV</property> + <property name="nativeName">Unite_Volume_Poids_V_HV</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">18</property> + <property name="name">Class_Tri_</property> + <property name="nativeName">Class_Tri_</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">19</property> + <property name="name">Num_Ordre_Class_Tri__H2</property> + <property name="nativeName">Num_Ordre_Class_Tri__H2</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">20</property> + <property name="name">Tot_Class_Tri_</property> + <property name="nativeName">Tot_Class_Tri_</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">21</property> + <property name="name">Ech_Class_Tri_</property> + <property name="nativeName">Ech_Class_Tri_</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">22</property> + <property name="name">Type_Volume_Poids_Class_Tri_</property> + <property name="nativeName">Type_Volume_Poids_Class_Tri_</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">23</property> + <property name="name">Unite_Volume_Poids_Class_Tri_</property> + <property name="nativeName">Unite_Volume_Poids_Class_Tri_</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">24</property> + <property name="name">Sexe</property> + <property name="nativeName">Sexe</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">25</property> + <property name="name">Num_Ordre_Sexe_H2</property> + <property name="nativeName">Num_Ordre_Sexe_H2</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">26</property> + <property name="name">Tot_Sexe</property> + <property name="nativeName">Tot_Sexe</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">27</property> + <property name="name">Ech_Sexe</property> + <property name="nativeName">Ech_Sexe</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">28</property> + <property name="name">Type_Volume_Poids_Sexe</property> + <property name="nativeName">Type_Volume_Poids_Sexe</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">29</property> + <property name="name">Unite_Volume_Poids_Sexe</property> + <property name="nativeName">Unite_Volume_Poids_Sexe</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">30</property> + <property name="name">Maturité</property> + <property name="nativeName">Maturité</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">31</property> + <property name="name">Num_Ordre_Maturité_H2</property> + <property name="nativeName">Num_Ordre_Maturité_H2</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">32</property> + <property name="name">Tot_Maturité</property> + <property name="nativeName">Tot_Maturité</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">33</property> + <property name="name">Ech_Maturité</property> + <property name="nativeName">Ech_Maturité</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">34</property> + <property name="name">Type_Volume_Poids_Maturité</property> + <property name="nativeName">Type_Volume_Poids_Maturité</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">35</property> + <property name="name">Unite_Volume_Poids_Maturité</property> + <property name="nativeName">Unite_Volume_Poids_Maturité</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">36</property> + <property name="name">Age</property> + <property name="nativeName">Age</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">37</property> + <property name="name">Num_Ordre_Age_H2</property> + <property name="nativeName">Num_Ordre_Age_H2</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">38</property> + <property name="name">Tot_Age</property> + <property name="nativeName">Tot_Age</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">39</property> + <property name="name">Ech_Age</property> + <property name="nativeName">Ech_Age</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">40</property> + <property name="name">Type_Volume_Poids_Age</property> + <property name="nativeName">Type_Volume_Poids_Age</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">41</property> + <property name="name">Unite_Volume_Poids_Age</property> + <property name="nativeName">Unite_Volume_Poids_Age</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">42</property> + <property name="name">Code_Longueur</property> + <property name="nativeName">Code_Longueur</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">43</property> + <property name="name">Libelle_Longueur</property> + <property name="nativeName">Libelle_Longueur</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">44</property> + <property name="name">Taille</property> + <property name="nativeName">Taille</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">45</property> + <property name="name">NumOrdre_Taille_H2</property> + <property name="nativeName">NumOrdre_Taille_H2</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">46</property> + <property name="name">Poids_Classe_Taille</property> + <property name="nativeName">Poids_Classe_Taille</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">47</property> + <property name="name">Unite_Taille</property> + <property name="nativeName">Unite_Taille</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">48</property> + <property name="name">Precision_Mesure</property> + <property name="nativeName">Precision_Mesure</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">49</property> + <property name="name">Nbr</property> + <property name="nativeName">Nbr</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">50</property> + <property name="name">Poids_Reference</property> + <property name="nativeName">Poids_Reference</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + <structure> + <property name="position">51</property> + <property name="name">Coef_Elev_Espece_Capture</property> + <property name="nativeName">Coef_Elev_Espece_Capture</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Numero_Trait", "Poche", "Navire", "Taxon", "Nom_scientifique", "Commentaire", "V_HV", "Num_Ordre_V_HV_H2", "Tot_V_HV", "Ech_V_HV", "Type_Volume_Poids_V_HV", "Unite_Volume_Poids_V_HV", "Class_Tri_", "Num_Ordre_Class_Tri__H2", "Tot_Class_Tri_", "Ech_Class_Tri_", "Type_Volume_Poids_Class_Tri_", "Unite_Volume_Poids_Class_Tri_", "Sexe", "Num_Ordre_Sexe_H2", "Tot_Sexe", "Ech_Sexe", "Type_Volume_Poids_Sexe", "Unite_Volume_Poids_Sexe", "Maturité", "Num_Ordre_Maturité_H2", "Tot_Maturité", "Ech_Maturité", "Type_Volume_Poids_Maturité", "Unite_Volume_Poids_Maturité", "Age", "Num_Ordre_Age_H2", "Tot_Age", "Ech_Age", "Type_Volume_Poids_Age", "Unite_Volume_Poids_Age", "Code_Longueur", "Libelle_Longueur", "Taille", "NumOrdre_Taille_H2", "Poids_Classe_Taille", "Unite_Taille", "Precision_Mesure", "Nbr", "Poids_Reference", "Coef_Elev_Espece_Capture" from "catch.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"Taxon","Taxon",INT;"Nom_scientifique","Nom_scientifique",STRING;"Commentaire","Commentaire",STRING;"V_HV","V_HV",STRING;"Num_Ordre_V_HV_H2","Num_Ordre_V_HV_H2",INT;"Tot_V_HV","Tot_V_HV",BIGDECIMAL;"Ech_V_HV","Ech_V_HV",BIGDECIMAL;"Type_Volume_Poids_V_HV","Type_Volume_Poids_V_HV",STRING;"Unite_Volume_Poids_V_HV","Unite_Volume_Poids_V_HV",STRING;"Class_Tri_","Class_Tri_",STRING;"Num_Ordre_Class_Tri__H2","Num_Ordre_Class_Tri__H2",INT;"Tot_Class_Tri_","Tot_Class_Tri_",BIGDECIMAL;"Ech_Class_Tri_","Ech_Class_Tri_",BIGDECIMAL;"Type_Volume_Poids_Class_Tri_","Type_Volume_Poids_Class_Tri_",STRING;"Unite_Volume_Poids_Class_Tri_","Unite_Volume_Poids_Class_Tri_",STRING;"Sexe","Sexe",STRING;"Num_Ordre_Sexe_H2","Num_Ordre_Sexe_H2",INT;"Tot_Sexe","Tot_Sexe",BIGDECIMAL;"Ech_Sexe","Ech_Sexe",BIGDECIMAL;"Type_Volume_Poids_Sexe","Type_Volume_Poids_Sexe",STRING;"Unite_Volume_Poids_Sexe","Unite_Volume_Poids_Sexe",STRING;"Maturité","Maturité",STRING;"Num_Ordre_Maturité_H2","Num_Ordre_Maturité_H2",INT;"Tot_Maturité","Tot_Maturité",BIGDECIMAL;"Ech_Maturité","Ech_Maturité",BIGDECIMAL;"Type_Volume_Poids_Maturité","Type_Volume_Poids_Maturité",STRING;"Unite_Volume_Poids_Maturité","Unite_Volume_Poids_Maturité",STRING;"Age","Age",STRING;"Num_Ordre_Age_H2","Num_Ordre_Age_H2",INT;"Tot_Age","Tot_Age",BIGDECIMAL;"Ech_Age","Ech_Age",BIGDECIMAL;"Type_Volume_Poids_Age","Type_Volume_Poids_Age",STRING;"Unite_Volume_Poids_Age","Unite_Volume_Poids_Age",STRING;"Code_Longueur","Code_Longueur",INT;"Libelle_Longueur","Libelle_Longueur",STRING;"Taille","Taille",BIGDECIMAL;"NumOrdre_Taille_H2","NumOrdre_Taille_H2",INT;"Poids_Classe_Taille","Poids_Classe_Taille",BIGDECIMAL;"Unite_Taille","Unite_Taille",STRING;"Precision_Mesure","Precision_Mesure",BIGDECIMAL;"Nbr","Nbr",INT;"Poids_Reference","Poids_Reference",BIGDECIMAL;"Coef_Elev_Espece_Capture","Coef_Elev_Espece_Capture",BIGDECIMAL}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>2.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Annee</design:name> + <design:position>1</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Annee</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Serie</design:name> + <design:position>2</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Serie_Partielle</design:name> + <design:position>3</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie_Partielle</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Engin</design:name> + <design:position>4</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Engin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Code_Station</design:name> + <design:position>5</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Station</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Numero_Trait</design:name> + <design:position>6</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Numero_Trait</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poche</design:name> + <design:position>7</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poche</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Navire</design:name> + <design:position>8</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Navire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Taxon</design:name> + <design:position>9</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Taxon</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Nom_scientifique</design:name> + <design:position>10</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Nom_scientifique</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Commentaire</design:name> + <design:position>11</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Commentaire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>V_HV</design:name> + <design:position>12</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>V_HV</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Num_Ordre_V_HV_H2</design:name> + <design:position>13</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Num_Ordre_V_HV_H2</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Tot_V_HV</design:name> + <design:position>14</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Tot_V_HV</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ech_V_HV</design:name> + <design:position>15</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ech_V_HV</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Type_Volume_Poids_V_HV</design:name> + <design:position>16</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Type_Volume_Poids_V_HV</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Unite_Volume_Poids_V_HV</design:name> + <design:position>17</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Unite_Volume_Poids_V_HV</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Class_Tri_</design:name> + <design:position>18</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Class_Tri_</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Num_Ordre_Class_Tri__H2</design:name> + <design:position>19</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Num_Ordre_Class_Tri__H2</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Tot_Class_Tri_</design:name> + <design:position>20</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Tot_Class_Tri_</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ech_Class_Tri_</design:name> + <design:position>21</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ech_Class_Tri_</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Type_Volume_Poids_Class_Tri_</design:name> + <design:position>22</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Type_Volume_Poids_Class_Tri_</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Unite_Volume_Poids_Class_Tri_</design:name> + <design:position>23</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Unite_Volume_Poids_Class_Tri_</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Sexe</design:name> + <design:position>24</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Sexe</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Num_Ordre_Sexe_H2</design:name> + <design:position>25</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Num_Ordre_Sexe_H2</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Tot_Sexe</design:name> + <design:position>26</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Tot_Sexe</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ech_Sexe</design:name> + <design:position>27</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ech_Sexe</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Type_Volume_Poids_Sexe</design:name> + <design:position>28</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Type_Volume_Poids_Sexe</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Unite_Volume_Poids_Sexe</design:name> + <design:position>29</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Unite_Volume_Poids_Sexe</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Maturité</design:name> + <design:position>30</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Maturité</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Num_Ordre_Maturité_H2</design:name> + <design:position>31</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Num_Ordre_Maturité_H2</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Tot_Maturité</design:name> + <design:position>32</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Tot_Maturité</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ech_Maturité</design:name> + <design:position>33</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ech_Maturité</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Type_Volume_Poids_Maturité</design:name> + <design:position>34</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Type_Volume_Poids_Maturité</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Unite_Volume_Poids_Maturité</design:name> + <design:position>35</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Unite_Volume_Poids_Maturité</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Age</design:name> + <design:position>36</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Age</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Num_Ordre_Age_H2</design:name> + <design:position>37</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Num_Ordre_Age_H2</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Tot_Age</design:name> + <design:position>38</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Tot_Age</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Ech_Age</design:name> + <design:position>39</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Ech_Age</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Type_Volume_Poids_Age</design:name> + <design:position>40</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Type_Volume_Poids_Age</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Unite_Volume_Poids_Age</design:name> + <design:position>41</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Unite_Volume_Poids_Age</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Code_Longueur</design:name> + <design:position>42</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Longueur</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Libelle_Longueur</design:name> + <design:position>43</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Libelle_Longueur</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Taille</design:name> + <design:position>44</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Taille</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>NumOrdre_Taille_H2</design:name> + <design:position>45</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>NumOrdre_Taille_H2</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Classe_Taille</design:name> + <design:position>46</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Classe_Taille</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Unite_Taille</design:name> + <design:position>47</design:position> + </design:identifier> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Unite_Taille</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Precision_Mesure</design:name> + <design:position>48</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Precision_Mesure</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Nbr</design:name> + <design:position>49</design:position> + </design:identifier> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Nbr</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Poids_Reference</design:name> + <design:position>50</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poids_Reference</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Coef_Elev_Espece_Capture</design:name> + <design:position>51</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Coef_Elev_Espece_Capture</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="species" id="3256"> + <list-property name="computedColumns"> + <structure> + <property name="name">lib</property> + <expression name="expression">row["Code_Rubin"]+"-"+row["Nom Scientifique"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Id</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Code_Rubin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Nom Scientifique</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Code campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">lib</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Id</property> + <property name="nativeName">Id</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Code_Rubin</property> + <property name="nativeName">Code_Rubin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Nom Scientifique</property> + <property name="nativeName">Nom Scientifique</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Code campagne</property> + <property name="nativeName">Code campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Id", "Code_Rubin", "Nom Scientifique", "Code campagne" from species.csv : {"Id","Id",INT;"Code_Rubin","Code_Rubin",STRING;"Nom Scientifique","Nom Scientifique",STRING;"Code campagne","Code campagne",STRING}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>1.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Id</design:name> + <design:position>1</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Id</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Code_Rubin</design:name> + <design:position>2</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Rubin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Nom Scientifique</design:name> + <design:position>3</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Nom Scientifique</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Code campagne</design:name> + <design:position>4</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code campagne</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <oda-data-set extensionID="org.eclipse.datatools.connectivity.oda.flatfile.dataSet" name="accidentalCatch" id="3459"> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">BatchId</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">ReferenceTaxonId</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">ReferenceTaxonName</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">Commentaire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">CaracteristicId</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">CaracteristicValue</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <method name="onFetch"><![CDATA[existsCapAcc=existsCapAcc+1;]]></method> + <property name="dataSource">FlatFileDataSource</property> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="nativeName">Annee</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="nativeName">Serie</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="nativeName">Serie_Partielle</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="nativeName">Engin</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="nativeName">Code_Station</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="nativeName">Numero_Trait</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="nativeName">Poche</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="nativeName">Navire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">BatchId</property> + <property name="nativeName">BatchId</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">ReferenceTaxonId</property> + <property name="nativeName">ReferenceTaxonId</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">ReferenceTaxonName</property> + <property name="nativeName">ReferenceTaxonName</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">Commentaire</property> + <property name="nativeName">Commentaire</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">CaracteristicId</property> + <property name="nativeName">CaracteristicId</property> + <property name="dataType">integer</property> + <property name="nativeDataType">4</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">CaracteristicValue</property> + <property name="nativeName">CaracteristicValue</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + </list-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Numero_Trait", "Poche", "Navire", "BatchId", "ReferenceTaxonId", "ReferenceTaxonName", "Commentaire", "CaracteristicId", "CaracteristicValue" from accidentalCatch.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Numero_Trait","Numero_Trait",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"BatchId","BatchId",INT;"ReferenceTaxonId","ReferenceTaxonId",INT;"ReferenceTaxonName","ReferenceTaxonName",STRING;"Commentaire","Commentaire",STRING;"CaracteristicId","CaracteristicId",INT;"CaracteristicValue","CaracteristicValue",STRING}]]></xml-property> + <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> +<model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> + <Version>1.0</Version> + <design:ResultSets derivedMetaData="true"> + <design:resultSetDefinitions> + <design:resultSetColumns> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Annee</design:name> + <design:position>1</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Annee</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie</design:name> + <design:position>2</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Serie_Partielle</design:name> + <design:position>3</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Serie_Partielle</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Engin</design:name> + <design:position>4</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Engin</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Code_Station</design:name> + <design:position>5</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Code_Station</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Numero_Trait</design:name> + <design:position>6</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Numero_Trait</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Poche</design:name> + <design:position>7</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Poche</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Navire</design:name> + <design:position>8</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Navire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>BatchId</design:name> + <design:position>9</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>BatchId</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>ReferenceTaxonId</design:name> + <design:position>10</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>ReferenceTaxonId</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>ReferenceTaxonName</design:name> + <design:position>11</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>ReferenceTaxonName</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>Commentaire</design:name> + <design:position>12</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Commentaire</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>CaracteristicId</design:name> + <design:position>13</design:position> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>CaracteristicId</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:name>CaracteristicValue</design:name> + <design:position>14</design:position> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>CaracteristicValue</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> + </design:resultSetColumns> + </design:resultSetDefinitions> + </design:ResultSets> +</model:DesignValues>]]></xml-property> + </oda-data-set> + <joint-data-set name="catchWithSpecies" id="3488"> + <list-property name="columnHints"> + <structure> + <property name="columnName">catch::Annee</property> + <property name="alias">Annee</property> + </structure> + <structure> + <property name="columnName">catch::Serie</property> + <property name="alias">Serie</property> + </structure> + <structure> + <property name="columnName">catch::Serie_Partielle</property> + <property name="alias">Serie_Partielle</property> + </structure> + <structure> + <property name="columnName">catch::Engin</property> + <property name="alias">Engin</property> + </structure> + <structure> + <property name="columnName">catch::Code_Station</property> + <property name="alias">Code_Station</property> + </structure> + <structure> + <property name="columnName">catch::Numero_Trait</property> + <property name="alias">Numero_Trait</property> + </structure> + <structure> + <property name="columnName">catch::Poche</property> + <property name="alias">Poche</property> + </structure> + <structure> + <property name="columnName">catch::Navire</property> + <property name="alias">Navire</property> + </structure> + <structure> + <property name="columnName">catch::Taxon</property> + <property name="alias">Taxon</property> + </structure> + <structure> + <property name="columnName">catch::Nom_scientifique</property> + <property name="alias">Nom_scientifique</property> + </structure> + <structure> + <property name="columnName">catch::Commentaire</property> + <property name="alias">Commentaire</property> + </structure> + <structure> + <property name="columnName">catch::V_HV</property> + <property name="alias">V_HV</property> + </structure> + <structure> + <property name="columnName">catch::Num_Ordre_V_HV_H2</property> + <property name="alias">Num_Ordre_V_HV_H2</property> + </structure> + <structure> + <property name="columnName">catch::Tot_V_HV</property> + <property name="alias">Tot_V_HV</property> + </structure> + <structure> + <property name="columnName">catch::Ech_V_HV</property> + <property name="alias">Ech_V_HV</property> + </structure> + <structure> + <property name="columnName">catch::Type_Volume_Poids_V_HV</property> + <property name="alias">Type_Volume_Poids_V_HV</property> + </structure> + <structure> + <property name="columnName">catch::Unite_Volume_Poids_V_HV</property> + <property name="alias">Unite_Volume_Poids_V_HV</property> + </structure> + <structure> + <property name="columnName">catch::Class_Tri_</property> + <property name="alias">Class_Tri_</property> + </structure> + <structure> + <property name="columnName">catch::Num_Ordre_Class_Tri__H2</property> + <property name="alias">Num_Ordre_Class_Tri__H2</property> + </structure> + <structure> + <property name="columnName">catch::Tot_Class_Tri_</property> + <property name="alias">Tot_Class_Tri_</property> + </structure> + <structure> + <property name="columnName">catch::Ech_Class_Tri_</property> + <property name="alias">Ech_Class_Tri_</property> + </structure> + <structure> + <property name="columnName">catch::Type_Volume_Poids_Class_Tri_</property> + <property name="alias">Type_Volume_Poids_Class_Tri_</property> + </structure> + <structure> + <property name="columnName">catch::Unite_Volume_Poids_Class_Tri_</property> + <property name="alias">Unite_Volume_Poids_Class_Tri_</property> + </structure> + <structure> + <property name="columnName">catch::Sexe</property> + <property name="alias">Sexe</property> + </structure> + <structure> + <property name="columnName">catch::Num_Ordre_Sexe_H2</property> + <property name="alias">Num_Ordre_Sexe_H2</property> + </structure> + <structure> + <property name="columnName">catch::Tot_Sexe</property> + <property name="alias">Tot_Sexe</property> + </structure> + <structure> + <property name="columnName">catch::Ech_Sexe</property> + <property name="alias">Ech_Sexe</property> + </structure> + <structure> + <property name="columnName">catch::Type_Volume_Poids_Sexe</property> + <property name="alias">Type_Volume_Poids_Sexe</property> + </structure> + <structure> + <property name="columnName">catch::Unite_Volume_Poids_Sexe</property> + <property name="alias">Unite_Volume_Poids_Sexe</property> + </structure> + <structure> + <property name="columnName">catch::Maturité</property> + <property name="alias">Maturité</property> + </structure> + <structure> + <property name="columnName">catch::Num_Ordre_Maturité_H2</property> + <property name="alias">Num_Ordre_Maturité_H2</property> + </structure> + <structure> + <property name="columnName">catch::Tot_Maturité</property> + <property name="alias">Tot_Maturité</property> + </structure> + <structure> + <property name="columnName">catch::Ech_Maturité</property> + <property name="alias">Ech_Maturité</property> + </structure> + <structure> + <property name="columnName">catch::Type_Volume_Poids_Maturité</property> + <property name="alias">Type_Volume_Poids_Maturité</property> + </structure> + <structure> + <property name="columnName">catch::Unite_Volume_Poids_Maturité</property> + <property name="alias">Unite_Volume_Poids_Maturité</property> + </structure> + <structure> + <property name="columnName">catch::Age</property> + <property name="alias">Age</property> + </structure> + <structure> + <property name="columnName">catch::Num_Ordre_Age_H2</property> + <property name="alias">Num_Ordre_Age_H2</property> + </structure> + <structure> + <property name="columnName">catch::Tot_Age</property> + <property name="alias">Tot_Age</property> + </structure> + <structure> + <property name="columnName">catch::Ech_Age</property> + <property name="alias">Ech_Age</property> + </structure> + <structure> + <property name="columnName">catch::Type_Volume_Poids_Age</property> + <property name="alias">Type_Volume_Poids_Age</property> + </structure> + <structure> + <property name="columnName">catch::Unite_Volume_Poids_Age</property> + <property name="alias">Unite_Volume_Poids_Age</property> + </structure> + <structure> + <property name="columnName">catch::Code_Longueur</property> + <property name="alias">Code_Longueur</property> + </structure> + <structure> + <property name="columnName">catch::Libelle_Longueur</property> + <property name="alias">Libelle_Longueur</property> + </structure> + <structure> + <property name="columnName">catch::Taille</property> + <property name="alias">Taille</property> + </structure> + <structure> + <property name="columnName">catch::NumOrdre_Taille_H2</property> + <property name="alias">NumOrdre_Taille_H2</property> + </structure> + <structure> + <property name="columnName">catch::Poids_Classe_Taille</property> + <property name="alias">Poids_Classe_Taille</property> + </structure> + <structure> + <property name="columnName">catch::Unite_Taille</property> + <property name="alias">Unite_Taille</property> + </structure> + <structure> + <property name="columnName">catch::Precision_Mesure</property> + <property name="alias">Precision_Mesure</property> + </structure> + <structure> + <property name="columnName">catch::Nbr</property> + <property name="alias">Nbr</property> + </structure> + <structure> + <property name="columnName">catch::Poids_Reference</property> + <property name="alias">Poids_Reference</property> + </structure> + <structure> + <property name="columnName">catch::Coef_Elev_Espece_Capture</property> + <property name="alias">Coef_Elev_Espece_Capture</property> + </structure> + <structure> + <property name="columnName">catch::categorisation-du-lot</property> + <property name="alias">categorisation-du-lot</property> + </structure> + <structure> + <property name="columnName">species::Id</property> + <property name="alias">species-Id</property> + </structure> + <structure> + <property name="columnName">species::Code_Rubin</property> + <property name="alias">species-Code_Rubin</property> + </structure> + <structure> + <property name="columnName">species::Nom Scientifique</property> + <property name="alias">species-Nom Scientifique</property> + </structure> + <structure> + <property name="columnName">species::Code campagne</property> + <property name="alias">species-Code campagne</property> + </structure> + <structure> + <property name="columnName">species::lib</property> + <property name="alias">species-lib</property> + </structure> + </list-property> + <structure name="cachedMetaData"> + <list-property name="resultSet"> + <structure> + <property name="position">1</property> + <property name="name">Annee</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">2</property> + <property name="name">Serie</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">3</property> + <property name="name">Serie_Partielle</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">4</property> + <property name="name">Engin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">5</property> + <property name="name">Code_Station</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">6</property> + <property name="name">Numero_Trait</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">7</property> + <property name="name">Poche</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">8</property> + <property name="name">Navire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">9</property> + <property name="name">Taxon</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">10</property> + <property name="name">Nom_scientifique</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">11</property> + <property name="name">Commentaire</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">12</property> + <property name="name">V_HV</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">13</property> + <property name="name">Num_Ordre_V_HV_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">14</property> + <property name="name">Tot_V_HV</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">15</property> + <property name="name">Ech_V_HV</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">16</property> + <property name="name">Type_Volume_Poids_V_HV</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">17</property> + <property name="name">Unite_Volume_Poids_V_HV</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">18</property> + <property name="name">Class_Tri_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">19</property> + <property name="name">Num_Ordre_Class_Tri__H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">20</property> + <property name="name">Tot_Class_Tri_</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">21</property> + <property name="name">Ech_Class_Tri_</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">22</property> + <property name="name">Type_Volume_Poids_Class_Tri_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">23</property> + <property name="name">Unite_Volume_Poids_Class_Tri_</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">24</property> + <property name="name">Sexe</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">25</property> + <property name="name">Num_Ordre_Sexe_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">26</property> + <property name="name">Tot_Sexe</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">27</property> + <property name="name">Ech_Sexe</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">28</property> + <property name="name">Type_Volume_Poids_Sexe</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">29</property> + <property name="name">Unite_Volume_Poids_Sexe</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">30</property> + <property name="name">Maturité</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">31</property> + <property name="name">Num_Ordre_Maturité_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">32</property> + <property name="name">Tot_Maturité</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">33</property> + <property name="name">Ech_Maturité</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">34</property> + <property name="name">Type_Volume_Poids_Maturité</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">35</property> + <property name="name">Unite_Volume_Poids_Maturité</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">36</property> + <property name="name">Age</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">37</property> + <property name="name">Num_Ordre_Age_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">38</property> + <property name="name">Tot_Age</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">39</property> + <property name="name">Ech_Age</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">40</property> + <property name="name">Type_Volume_Poids_Age</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">41</property> + <property name="name">Unite_Volume_Poids_Age</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">42</property> + <property name="name">Code_Longueur</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">43</property> + <property name="name">Libelle_Longueur</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">44</property> + <property name="name">Taille</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">45</property> + <property name="name">NumOrdre_Taille_H2</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">46</property> + <property name="name">Poids_Classe_Taille</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">47</property> + <property name="name">Unite_Taille</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">48</property> + <property name="name">Precision_Mesure</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">49</property> + <property name="name">Nbr</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">50</property> + <property name="name">Poids_Reference</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">51</property> + <property name="name">Coef_Elev_Espece_Capture</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">52</property> + <property name="name">categorisation-du-lot</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">53</property> + <property name="name">species-Id</property> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="position">54</property> + <property name="name">species-Code_Rubin</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">55</property> + <property name="name">species-Nom Scientifique</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">56</property> + <property name="name">species-Code campagne</property> + <property name="dataType">string</property> + </structure> + <structure> + <property name="position">57</property> + <property name="name">species-lib</property> + <property name="dataType">string</property> + </structure> + </list-property> + </structure> + <simple-property-list name="dataSets"> + <value>catch</value> + <value>species</value> + </simple-property-list> + <list-property name="joinConditions"> + <structure> + <property name="joinType">inner</property> + <property name="joinOperator">eq</property> + <property name="leftDataSet">catch</property> + <property name="rightDataSet">species</property> + <expression name="leftExpression">dataSetRow["Taxon"]</expression> + <expression name="rightExpression">dataSetRow["Id"]</expression> + </structure> + </list-property> + </joint-data-set> + </data-sets> + <page-setup> + <simple-master-page name="Simple MasterPage Portrait" id="2"> + <property name="type">a4</property> + <property name="topMargin">5mm</property> + <property name="leftMargin">10mm</property> + <property name="bottomMargin">5mm</property> + <property name="rightMargin">10mm</property> + <property name="headerHeight">12mm</property> + <property name="footerHeight">12mm</property> + <page-header> + <grid name="HeaderGrid" id="7"> + <property name="width">100%</property> + <column id="8"> + <property name="width">120px</property> + </column> + <column id="12"> + <property name="width">80%</property> + </column> + <column id="14"/> + <row id="9"> + <cell id="10"> + <image id="15"> + <property name="height">30px</property> + <property name="width">114px</property> + <property name="source">embed</property> + <property name="imageName">logo-ifremer.PNG</property> + </image> + </cell> + <cell id="11"> + <property name="textAlign">center</property> + <property name="verticalAlign">middle</property> + </cell> + <cell id="13"/> + </row> + </grid> + </page-header> + <page-footer> + <grid name="footerGrid" id="17"> + <column id="18"/> + <column id="19"/> + <column id="20"/> + <row id="21"> + <cell id="22"> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + <text id="29"> + <property name="fontFamily">"Verdana"</property> + <property name="contentType">html</property> + <text-property name="content" key="date-generation"></text-property> + </text> + </cell> + <cell id="23"> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + </cell> + <cell id="24"> + <property name="fontSize">10pt</property> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + <property name="textAlign">right</property> + <label id="26"> + <property name="fontFamily">"Verdana"</property> + <property name="marginRight">0pt</property> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">5px</property> + <property name="display">inline</property> + <text-property name="text" key="page"></text-property> + </label> + <auto-text name="NewAutoText21" id="2407"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="display">inline</property> + <property name="type">page-number</property> + </auto-text> + <text name="NewText111" id="2420"> + <property name="fontFamily">serif</property> + <property name="fontSize">small</property> + <property name="marginLeft">0pt</property> + <property name="marginRight">0pt</property> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">1px</property> + <property name="display">inline</property> + <property name="contentType">plain</property> + <text-property name="content"><![CDATA[/]]></text-property> + </text> + <auto-text name="NewAutoText111" id="2409"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="type">total-page</property> + </auto-text> + </cell> + </row> + <row id="2414"> + <cell id="2415"> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + <text id="3575"> + <property name="fontFamily">"Verdana"</property> + <property name="contentType">html</property> + <text-property name="content"><![CDATA[<value-of format="dd/MM/yyyy hh:mm:ss">new Date()</value-of>]]></text-property> + </text> + </cell> + <cell id="2416"> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + </cell> + <cell id="2417"> + <property name="fontSize">10pt</property> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">18pt</property> + <property name="textAlign">right</property> + <label id="2418"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="marginRight">2pt</property> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">1px</property> + <property name="display">inline</property> + <text-property name="text" key="controle"></text-property> + </label> + <text id="2419"> + <property name="fontFamily">"Wingdings"</property> + <property name="fontSize">small</property> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">1px</property> + <property name="display">inline</property> + <property name="contentType">auto</property> + <text-property name="content"><![CDATA[r]]></text-property> + </text> + </cell> + </row> + </grid> + </page-footer> + </simple-master-page> + </page-setup> + <body> + <grid name="survey" id="2585"> + <property name="dataSet">survey</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">Annee</property> + <text-property name="displayName">Annee</text-property> + <expression name="expression" type="javascript">dataSetRow["Annee"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Serie</property> + <text-property name="displayName">Serie</text-property> + <expression name="expression" type="javascript">dataSetRow["Serie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Serie_Partielle</property> + <text-property name="displayName">Serie_Partielle</text-property> + <expression name="expression" type="javascript">dataSetRow["Serie_Partielle"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Navire</property> + <text-property name="displayName">Navire</text-property> + <expression name="expression" type="javascript">dataSetRow["Navire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Pays</property> + <text-property name="displayName">Pays</text-property> + <expression name="expression" type="javascript">dataSetRow["Pays"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Zone_Etude</property> + <text-property name="displayName">Zone_Etude</text-property> + <expression name="expression" type="javascript">dataSetRow["Zone_Etude"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Campagne</property> + <text-property name="displayName">Campagne</text-property> + <expression name="expression" type="javascript">dataSetRow["Campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Id_Sismer</property> + <text-property name="displayName">Id_Sismer</text-property> + <expression name="expression" type="javascript">dataSetRow["Id_Sismer"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Date_Deb_Campagne</property> + <text-property name="displayName">Date_Deb_Campagne</text-property> + <expression name="expression" type="javascript">dataSetRow["Date_Deb_Campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Port_Deb_Campagne</property> + <text-property name="displayName">Port_Deb_Campagne</text-property> + <expression name="expression" type="javascript">dataSetRow["Port_Deb_Campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Date_Fin_Campagne</property> + <text-property name="displayName">Date_Fin_Campagne</text-property> + <expression name="expression" type="javascript">dataSetRow["Date_Fin_Campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Port_Fin_Campagne</property> + <text-property name="displayName">Port_Fin_Campagne</text-property> + <expression name="expression" type="javascript">dataSetRow["Port_Fin_Campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Chef_Mission</property> + <text-property name="displayName">Chef_Mission</text-property> + <expression name="expression" type="javascript">dataSetRow["Chef_Mission"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Resp_Salle_Tri</property> + <text-property name="displayName">Resp_Salle_Tri</text-property> + <expression name="expression" type="javascript">dataSetRow["Resp_Salle_Tri"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Commentaire</property> + <text-property name="displayName">Commentaire</text-property> + <expression name="expression" type="javascript">dataSetRow["Commentaire"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + <structure name="toc"> + <expression name="expressionValue" type="javascript">row["Serie"]+" - "+row["Campagne"]+" - "+row["Annee"]</expression> + </structure> + <column id="2586"/> + <row id="2587"> + <cell id="2588"> + <list name="Trait" id="2413"> + <property name="dataSet">operation</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">Annee</property> + <text-property name="displayName">Annee</text-property> + <expression name="expression" type="javascript">dataSetRow["Annee"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Serie</property> + <text-property name="displayName">Serie</text-property> + <expression name="expression" type="javascript">dataSetRow["Serie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Serie_Partielle</property> + <text-property name="displayName">Serie_Partielle</text-property> + <expression name="expression" type="javascript">dataSetRow["Serie_Partielle"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_Station</property> + <text-property name="displayName">Code_Station</text-property> + <expression name="expression" type="javascript">dataSetRow["Code_Station"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Numero_Trait</property> + <text-property name="displayName">Numero_Trait</text-property> + <expression name="expression" type="javascript">dataSetRow["Numero_Trait"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poche</property> + <text-property name="displayName">Poche</text-property> + <expression name="expression" type="javascript">dataSetRow["Poche"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Engin</property> + <text-property name="displayName">Engin</text-property> + <expression name="expression" type="javascript">dataSetRow["Engin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Navire</property> + <text-property name="displayName">Navire</text-property> + <expression name="expression" type="javascript">dataSetRow["Navire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">DateDeb_Op</property> + <text-property name="displayName">DateDeb_Op</text-property> + <expression name="expression" type="javascript">dataSetRow["DateDeb_Op"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">LatDeb</property> + <text-property name="displayName">LatDeb</text-property> + <expression name="expression" type="javascript">dataSetRow["LatDeb"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">LongDeb</property> + <text-property name="displayName">LongDeb</text-property> + <expression name="expression" type="javascript">dataSetRow["LongDeb"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">DateFin_Op</property> + <text-property name="displayName">DateFin_Op</text-property> + <expression name="expression" type="javascript">dataSetRow["DateFin_Op"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">LatFin</property> + <text-property name="displayName">LatFin</text-property> + <expression name="expression" type="javascript">dataSetRow["LatFin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">LongFin</property> + <text-property name="displayName">LongFin</text-property> + <expression name="expression" type="javascript">dataSetRow["LongFin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Duree</property> + <text-property name="displayName">Duree</text-property> + <expression name="expression" type="javascript">dataSetRow["Duree"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Strate</property> + <text-property name="displayName">Strate</text-property> + <expression name="expression" type="javascript">dataSetRow["Strate"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Sous-Strate</property> + <text-property name="displayName">Sous-Strate</text-property> + <expression name="expression" type="javascript">dataSetRow["Sous-Strate"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Localite</property> + <text-property name="displayName">Localite</text-property> + <expression name="expression" type="javascript">dataSetRow["Localite"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Validite_OP</property> + <text-property name="displayName">Validite_OP</text-property> + <expression name="expression" type="javascript">dataSetRow["Validite_OP"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Rectiligne</property> + <text-property name="displayName">Rectiligne</text-property> + <expression name="expression" type="javascript">dataSetRow["Rectiligne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Distance</property> + <text-property name="displayName">Distance</text-property> + <expression name="expression" type="javascript">dataSetRow["Distance"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Ouv_Verticale</property> + <text-property name="displayName">Ouv_Verticale</text-property> + <expression name="expression" type="javascript">dataSetRow["Ouv_Verticale"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Ouv_Horizontale_Ailes</property> + <text-property name="displayName">Ouv_Horizontale_Ailes</text-property> + <expression name="expression" type="javascript">dataSetRow["Ouv_Horizontale_Ailes"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Ouv_Horizontale_Panneaux</property> + <text-property name="displayName">Ouv_Horizontale_Panneaux</text-property> + <expression name="expression" type="javascript">dataSetRow["Ouv_Horizontale_Panneaux"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Saisisseur</property> + <text-property name="displayName">Saisisseur</text-property> + <expression name="expression" type="javascript">dataSetRow["Saisisseur"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">NavireAssocie</property> + <text-property name="displayName">NavireAssocie</text-property> + <expression name="expression" type="javascript">dataSetRow["NavireAssocie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Commentaire</property> + <text-property name="displayName">Commentaire</text-property> + <expression name="expression" type="javascript">dataSetRow["Commentaire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total</property> + <text-property name="displayName">Poids_Total</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Calcule</property> + <text-property name="displayName">Poids_Total_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Vrac</property> + <text-property name="displayName">Poids_Total_Vrac</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Vrac"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Vrac_Calcule</property> + <text-property name="displayName">Poids_Total_Vrac_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Vrac_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_HorsVrac</property> + <text-property name="displayName">Poids_Total_HorsVrac</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_HorsVrac"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_HorsVrac_Calcule</property> + <text-property name="displayName">Poids_Total_HorsVrac_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_HorsVrac_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Non_Trie</property> + <text-property name="displayName">Poids_Total_Non_Trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Non_Trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Non_Trie_Calcule</property> + <text-property name="displayName">Poids_Total_Non_Trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Non_Trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Tremis</property> + <text-property name="displayName">Poids_Total_Tremis</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Tremis"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Tremis_Calcule</property> + <text-property name="displayName">Poids_Total_Tremis_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Tremis_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Carroussel</property> + <text-property name="displayName">Poids_Total_Carroussel</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Carroussel"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Carroussel_Calcule</property> + <text-property name="displayName">Poids_Total_Carroussel_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Carroussel_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece</property> + <text-property name="displayName">Poids_Total_Espece</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Calcule</property> + <text-property name="displayName">Poids_Total_Espece_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Vrac</property> + <text-property name="displayName">Poids_Total_Espece_Vrac</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Vrac"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Vrac_Calcule</property> + <text-property name="displayName">Poids_Total_Espece_Vrac_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Vrac_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Vrac_Trie</property> + <text-property name="displayName">Poids_Total_Espece_Vrac_Trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Vrac_Trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Vrac_Trie_Calcule</property> + <text-property name="displayName">Poids_Total_Espece_Vrac_Trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Vrac_Trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_HorsVrac</property> + <text-property name="displayName">Poids_Total_Espece_HorsVrac</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_HorsVrac"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_HorsVrac_Calcule</property> + <text-property name="displayName">Poids_Total_Espece_HorsVrac_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_HorsVrac_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Inerte_Trie</property> + <text-property name="displayName">Poids_Total_Espece_Inerte_Trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Inerte_Trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Inerte_Trie_Calcule</property> + <text-property name="displayName">Poids_Total_Espece_Inerte_Trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Inerte_Trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie</property> + <text-property name="displayName">Poids_Total_Espece_Vivant_non_detaille_trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Vivant_non_detaille_trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> + <text-property name="displayName">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Espece_Vivant_non_detaille_trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos</property> + <text-property name="displayName">Poids_Total_Benthos</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Calcule</property> + <text-property name="displayName">Poids_Total_Benthos_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Vrac</property> + <text-property name="displayName">Poids_Total_Benthos_Vrac</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Vrac"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Vrac_Calcule</property> + <text-property name="displayName">Poids_Total_Benthos_Vrac_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Vrac_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Vrac_Trie</property> + <text-property name="displayName">Poids_Total_Benthos_Vrac_Trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Vrac_Trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Vrac_Trie_Calcule</property> + <text-property name="displayName">Poids_Total_Benthos_Vrac_Trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Vrac_Trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_HorsVrac</property> + <text-property name="displayName">Poids_Total_Benthos_HorsVrac</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_HorsVrac"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_HorsVrac_Calcule</property> + <text-property name="displayName">Poids_Total_Benthos_HorsVrac_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_HorsVrac_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Inerte_Trie</property> + <text-property name="displayName">Poids_Total_Benthos_Inerte_Trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Inerte_Trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Inerte_Trie_Calcule</property> + <text-property name="displayName">Poids_Total_Benthos_Inerte_Trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Inerte_Trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie</property> + <text-property name="displayName">Poids_Total_Benthos_Vivant_non_detaille_trie</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Vivant_non_detaille_trie"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> + <text-property name="displayName">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Poids_Total_Macro_Dechet</property> + <text-property name="displayName">Poids_Total_Macro_Dechet</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Macro_Dechet"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Poids_Total_Macro_Dechet_Calcule</property> + <text-property name="displayName">Poids_Total_Macro_Dechet_Calcule</text-property> + <expression name="expression" type="javascript">dataSetRow["Poids_Total_Macro_Dechet_Calcule"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + <detail> + <grid name="general" id="2804"> + <structure name="toc"> + <expression name="expressionValue">"Code Station : "+row["Code_Station"]+" - N° trait : "+row["Numero_Trait"]</expression> + </structure> + <column id="2805"/> + <row id="2806"> + <cell id="2807"> + <grid name="presentation" id="2808"> + <property name="masterPage">Simple MasterPage Portrait</property> + <property name="pageBreakBefore">always</property> + <structure name="toc"> + <expression name="expressionValue">reportContext.getMessage("title.rapport", reportContext.getLocale());</expression> + </structure> + <column id="2809"/> + <row id="2810"> + <cell id="2811"> + <label id="2812"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.rapport"></text-property> + </label> + </cell> + </row> + <row id="2813"> + <cell id="2814"> + <grid id="2815"> + <column id="2816"/> + <row id="2817"> + <cell id="2818"> + <label id="2819"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="serie"></text-property> + </label> + <text-data id="2820"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="fontWeight">bold</property> + <property name="display">inline</property> + <expression name="valueExpr">row._outer["Serie"]</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2821"> + <cell id="2822"> + <label id="2823"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="campagne"></text-property> + </label> + <text-data id="2824"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="fontWeight">bold</property> + <property name="display">inline</property> + <expression name="valueExpr">row._outer["Campagne"]</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2825"> + <cell id="2826"> + <label id="2827"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="annee"></text-property> + </label> + <text-data id="2828"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="fontWeight">bold</property> + <property name="display">inline</property> + <expression name="valueExpr">row._outer["Annee"]</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2829"> + <cell id="2830"> + <label id="2831"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="serie-partielle"></text-property> + </label> + <text-data id="2832"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="fontWeight">bold</property> + <property name="display">inline</property> + <expression name="valueExpr">row._outer["Serie_Partielle"]</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2833"> + <cell id="2834"> + <label id="2835"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="code-station"></text-property> + </label> + <data id="2836"> + <property name="fontWeight">bold</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Code_Station</property> + </data> + </cell> + </row> + <row id="2837"> + <cell id="2838"> + <label id="2839"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="num-trait"></text-property> + </label> + <data id="2840"> + <property name="fontWeight">bold</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Numero_Trait</property> + </data> + </cell> + </row> + <row id="2841"> + <cell id="2842"> + <label id="2843"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="num-poche"></text-property> + </label> + <data id="2844"> + <property name="fontWeight">bold</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Poche</property> + </data> + </cell> + </row> + <row id="2845"> + <cell id="2846"> + <label id="2847"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="date-debut-trait"></text-property> + </label> + <data id="2848"> + <property name="fontWeight">bold</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">DateDeb_Op</property> + </data> + </cell> + </row> + </grid> + <text-data id="3601"> + <list-property name="visibility"> + <structure> + <property name="format">all</property> + <expression name="valueExpr" type="javascript">true</expression> + </structure> + </list-property> + <expression name="valueExpr">var cartouche=(getMessage("serie")+" <b>"+row._outer["Serie"]+"</b>"+" / "+getMessage("campagne")+" <b>"+row._outer["Campagne"]+"</b>"+" / "+getMessage("annee")+" <b>"+row._outer["Annee"]+"</b>"+" / "+getMessage("serie-partielle")+" <b>"+row._outer["Serie_Partielle"]+"</b>"+ +"<P>"+ +getMessage("code-station")+" <b>"+row["Code_Station"]+"</b>"+" / "+getMessage("num-trait")+" <b>"+row["Numero_Trait"]+"</b>"+" / "+getMessage("num-poche")+" <b>"+row["Poche"]+"</b>"+" / "+getMessage("date-debut-trait")+" <b>"+row["DateDeb_Op"]+"</b>").replace("<b>null</b>","");</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2849"> + <cell id="2850"> + <property name="paddingTop">10mm</property> + <grid id="2851"> + <column id="2852"/> + <column id="2853"/> + <column id="2854"/> + <row id="2855"> + <cell id="2856"> + <property name="style">crosstab-header-line-first</property> + </cell> + <cell id="2857"> + <property name="style">crosstab-header-line-first</property> + <label id="2858"> + <property name="textAlign">center</property> + <text-property name="text" key="qui"></text-property> + </label> + </cell> + <cell id="2859"> + <property name="style">crosstab-header-line-first</property> + <label id="2860"> + <property name="textAlign">center</property> + <text-property name="text" key="date"></text-property> + </label> + </cell> + </row> + <row id="2861"> + <property name="height">35mm</property> + <cell id="2862"> + <property name="style">grid-detail-cell</property> + <property name="verticalAlign">top</property> + <label id="2863"> + <text-property name="text" key="instruction-ctrl"></text-property> + </label> + </cell> + <cell id="2864"> + <property name="style">grid-detail-cell</property> + </cell> + <cell id="2865"> + <property name="style">grid-detail-cell</property> + </cell> + </row> + </grid> + </cell> + </row> + <row id="2866"> + <property name="pageBreakAfter">auto</property> + <cell id="2867"> + <property name="paddingTop">10mm</property> + <label id="2868"> + <property name="style">label-general</property> + <text-property name="text" key="commentaire"></text-property> + </label> + <grid id="2869"> + <column id="2870"/> + <row id="2871"> + <property name="height">140mm</property> + <cell id="2872"> + <property name="style">grid-header-cell</property> + <property name="display">block</property> + <property name="pageBreakBefore">auto</property> + <property name="showIfBlank">false</property> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + <grid name="carac-trait" id="2873"> + <property name="masterPage">Simple MasterPage Portrait</property> + <property name="pageBreakBefore">always</property> + <structure name="toc"> + <expression name="expressionValue">getMessage("title.caracteristique-trait");</expression> + </structure> + <column id="2874"/> + <row id="2875"> + <cell id="2876"> + <label id="2877"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.caracteristique-trait"></text-property> + </label> + </cell> + </row> + <row id="2878"> + <cell id="2879"> + <grid id="2880"> + <column id="2881"/> + <row id="2882"> + <cell id="2883"> + <label id="2884"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="serie"></text-property> + </label> + <text-data id="2885"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="display">inline</property> + <expression name="valueExpr">row._outer["Serie"]</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2886"> + <cell id="2887"> + <label id="2888"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="campagne"></text-property> + </label> + <text-data id="2889"> + <property name="fontFamily">"Verdana"</property> + <property name="fontSize">7pt</property> + <property name="display">inline</property> + <expression name="valueExpr">row._outer["Campagne"]</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="2890"> + <cell id="2891"> + <label id="2892"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.caracteristique-general-trait"></text-property> + </label> + <grid name="carac-generales1" id="2893"> + <column id="2894"/> + <row id="2895"> + <cell id="2896"> + <label id="2897"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="code-station"></text-property> + </label> + <data id="2898"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Code_Station</property> + </data> + </cell> + </row> + <row id="2899"> + <cell id="2900"> + <label id="2901"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="num-trait"></text-property> + </label> + <data id="2902"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Numero_Trait</property> + </data> + </cell> + </row> + <row id="2903"> + <cell id="2904"> + <label id="2905"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="num-poche"></text-property> + </label> + <data id="2906"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Poche</property> + </data> + </cell> + </row> + <row id="2907"> + <cell id="2908"> + <label id="2909"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="strate"></text-property> + </label> + <data id="2910"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Strate</property> + </data> + </cell> + </row> + <row id="2911"> + <cell id="2912"> + <label id="2913"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="sous-strate"></text-property> + </label> + <data id="2914"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Sous-Strate</property> + </data> + </cell> + </row> + <row id="2915"> + <cell id="2916"> + <label id="2917"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="localite"></text-property> + </label> + <data id="2918"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Localite</property> + </data> + </cell> + </row> + <row id="2919"> + <cell id="2920"> + <property name="colSpan">1</property> + <property name="rowSpan">1</property> + <grid id="2921"> + <column id="2922"/> + <column id="2923"/> + <column id="2924"/> + <column id="2925"/> + <row id="2926"> + <cell id="2927"> + <property name="style">grid-header-cell</property> + </cell> + <cell id="2928"> + <property name="style">grid-header-cell</property> + <property name="textAlign">center</property> + <label id="2929"> + <text-property name="text" key="latitude"></text-property> + </label> + </cell> + <cell id="2930"> + <property name="style">grid-header-cell</property> + <property name="textAlign">center</property> + <label id="2931"> + <text-property name="text" key="longitude"></text-property> + </label> + </cell> + <cell id="2932"> + <property name="style">grid-header-cell</property> + <property name="textAlign">center</property> + <label id="2933"> + <text-property name="text" key="date-heure"></text-property> + </label> + </cell> + </row> + <row id="2934"> + <cell id="2935"> + <property name="style">grid-header-cell</property> + <property name="textAlign">left</property> + <label id="2936"> + <text-property name="text" key="debut-traine"></text-property> + </label> + </cell> + <cell id="2937"> + <property name="style">grid-detail-cell</property> + <data id="2938"> + <property name="textAlign">center</property> + <property name="resultSetColumn">LatDeb</property> + </data> + </cell> + <cell id="2939"> + <property name="style">grid-detail-cell</property> + <data id="2940"> + <property name="textAlign">center</property> + <property name="resultSetColumn">LongDeb</property> + </data> + </cell> + <cell id="2941"> + <property name="style">grid-detail-cell</property> + <data id="2942"> + <property name="textAlign">center</property> + <property name="resultSetColumn">DateDeb_Op</property> + </data> + </cell> + </row> + <row id="2943"> + <cell id="2944"> + <property name="style">grid-header-cell</property> + <property name="textAlign">left</property> + <label id="2945"> + <text-property name="text" key="fin-traine"></text-property> + </label> + </cell> + <cell id="2946"> + <property name="style">grid-detail-cell</property> + <data id="2947"> + <property name="textAlign">center</property> + <property name="resultSetColumn">LatFin</property> + </data> + </cell> + <cell id="2948"> + <property name="style">grid-detail-cell</property> + <data id="2949"> + <property name="textAlign">center</property> + <property name="resultSetColumn">LongFin</property> + </data> + </cell> + <cell id="2950"> + <property name="style">grid-detail-cell</property> + <data id="2951"> + <property name="textAlign">center</property> + <property name="resultSetColumn">DateFin_Op</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="2952"> + <cell id="2953"> + <label id="2954"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="trait-rectiligne"></text-property> + </label> + <data id="2955"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Rectiligne</property> + </data> + </cell> + </row> + <row id="2956"> + <cell id="2957"> + <label id="2958"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="distance-chalute"></text-property> + </label> + <data id="2959"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Distance</property> + </data> + </cell> + </row> + <row id="2960"> + <cell id="2961"> + <label id="2962"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="trait-valide"></text-property> + </label> + <text-data id="3536"> + <property name="display">inline</property> + <expression name="valueExpr">if (row["Validite_OP"]=="Y"){ +"trait valide"; +} +if (row["Validite_OP"]=="N"){ +"trait non valide"; +} +if (row["Validite_OP"]=="?"){ +"non défini"; +}</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="2963"> + <cell id="2964"> + <label id="2965"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="navire"></text-property> + </label> + <data id="2966"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Navire</property> + </data> + </cell> + </row> + <row id="2967"> + <cell id="2968"> + <label id="2969"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="engin"></text-property> + </label> + <data id="2970"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Engin</property> + </data> + </cell> + </row> + <row id="2971"> + <cell id="2972"> + <label id="2973"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="saisisseur"></text-property> + </label> + <data id="2974"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Saisisseur</property> + </data> + </cell> + </row> + <row id="2975"> + <cell id="2976"> + <label id="2977"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="commentaire"></text-property> + </label> + <data id="2978"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Commentaire</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="2979"> + <cell id="2980"> + <label id="2981"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.caracteristique-mo"></text-property> + </label> + <grid name="carac-mo1" id="2982"> + <column id="2983"/> + <row id="2984"> + <cell id="2985"> + <label id="2986"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="ouverture-verticale"></text-property> + </label> + <data id="2987"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Ouv_Verticale</property> + </data> + </cell> + </row> + <row id="2988"> + <cell id="2989"> + <label id="2990"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="ouverture-horiz-ailes"></text-property> + </label> + <data id="2991"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Ouv_Horizontale_Ailes</property> + </data> + </cell> + </row> + <row id="2992"> + <cell id="2993"> + <label id="2994"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="ouverture-horiz-panneaux"></text-property> + </label> + <data id="2995"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Ouv_Horizontale_Panneaux</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="2996"> + <cell id="2997"> + <label id="2998"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.caracteristiques"></text-property> + </label> + <table id="2999"> + <property name="dataSet">parameter</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">Annee</property> + <expression name="expression">dataSetRow["Annee"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Serie</property> + <expression name="expression">dataSetRow["Serie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Serie_Partielle</property> + <expression name="expression">dataSetRow["Serie_Partielle"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_Station</property> + <expression name="expression">dataSetRow["Code_Station"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Numero_Trait</property> + <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poche</property> + <expression name="expression">dataSetRow["Poche"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_PMFM</property> + <expression name="expression">dataSetRow["Code_PMFM"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Libelle_PMFm</property> + <expression name="expression">dataSetRow["Libelle_PMFm"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Valeur</property> + <expression name="expression">dataSetRow["Valeur"]</expression> + <property name="dataType">decimal</property> + </structure> + </list-property> + <list-property name="filter"> + <structure> + <property name="operator">eq</property> + <expression name="expr">row["Numero_Trait"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Numero_Trait"]</value> + </simple-property-list> + </structure> + <structure> + <property name="operator">eq</property> + <expression name="expr">row["Code_Station"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Code_Station"]</value> + </simple-property-list> + </structure> + </list-property> + <column id="3004"/> + <detail> + <row id="3000"> + <cell id="3001"> + <property name="style">cell</property> + <property name="borderBottomColor">#FFFFFF</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#FFFFFF</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#FFFFFF</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="borderTopColor">#FFFFFF</property> + <property name="borderTopStyle">solid</property> + <property name="borderTopWidth">1px</property> + <data id="3002"> + <property name="marginRight">0pt</property> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">1px</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Libelle_PMFm</property> + </data> + <label id="3484"> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">1px</property> + <property name="display">inline</property> + <text-property name="text">:</text-property> + </label> + <data id="3003"> + <property name="paddingTop">1px</property> + <property name="paddingLeft">1px</property> + <property name="paddingBottom">1px</property> + <property name="paddingRight">1px</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Valeur</property> + </data> + </cell> + </row> + </detail> + </table> + </cell> + </row> + </grid> + <grid name="bilan-capture" id="3005"> + <property name="masterPage">Simple MasterPage Portrait</property> + <property name="pageBreakAfter">always</property> + <property name="pageBreakBefore">always</property> + <structure name="toc"> + <expression name="expressionValue" type="javascript">getMessage("title.bilan-capture");</expression> + </structure> + <column id="3006"/> + <row id="3007"> + <cell id="3008"> + <label id="3009"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.bilan-capture"></text-property> + </label> + </cell> + </row> + <row id="3010"> + <cell id="3011"> + <text-data id="3599"> + <property name="paddingTop">10pt</property> + <expression name="valueExpr">cartouche;</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="3046"> + <cell id="3047"> + <label id="3063"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.capture"></text-property> + </label> + <grid name="capture" id="3048"> + <column id="3049"/> + <row id="3050"> + <cell id="3051"> + <label id="3064"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total"></text-property> + </label> + <data id="3148"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total</property> + </data> + </cell> + </row> + <row id="3052"> + <cell id="3053"> + <label id="3065"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-vrac"></text-property> + </label> + <data id="3149"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Vrac_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Vrac</property> + </data> + </cell> + </row> + <row id="3054"> + <cell id="3055"> + <label id="3066"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="carroussel-observ"></text-property> + </label> + <data id="3150"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Carroussel_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Carroussel</property> + </data> + </cell> + </row> + <row id="3056"> + <cell id="3057"> + <label id="3067"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="tremis"></text-property> + </label> + <data id="3151"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#.#####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Tremis_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Tremis</property> + </data> + </cell> + </row> + <row id="3058"> + <cell id="3059"> + <label id="3068"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-hors-vrac"></text-property> + </label> + <data id="3152"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_HorsVrac_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_HorsVrac</property> + </data> + </cell> + </row> + <row id="3060"> + <cell id="3061"> + <label id="3069"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-non-trie"></text-property> + </label> + <data id="3153"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Non_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Non_Trie</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="3070"> + <cell id="3071"> + <label id="3072"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.especes"></text-property> + </label> + <grid name="especes" id="3073"> + <column id="3074"/> + <row id="3075"> + <cell id="3076"> + <label id="3077"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total"></text-property> + </label> + <data id="3154"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Espece_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Espece</property> + </data> + </cell> + </row> + <row id="3078"> + <cell id="3079"> + <label id="3080"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-vrac"></text-property> + </label> + <data id="3155"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Espece_Vrac_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Espece_Vrac</property> + </data> + </cell> + </row> + <row id="3090"> + <cell id="3091"> + <label id="3092"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.vrac-trie"></text-property> + </label> + <data id="3156"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Espece_Vrac_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Espece_Vrac_Trie</property> + </data> + </cell> + </row> + <row id="3093"> + <cell id="3094"> + <label id="3099"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-hors-vrac"></text-property> + </label> + <data id="3157"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Espece_HorsVrac_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Espece_HorsVrac</property> + </data> + </cell> + </row> + <row id="3097"> + <cell id="3098"> + <label id="3100"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-inerte-trie"></text-property> + </label> + <data id="3158"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Espece_Inerte_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Espece_Inerte_Trie</property> + </data> + </cell> + </row> + <row id="3095"> + <cell id="3096"> + <label id="3101"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-vivant-non-detail-trie"></text-property> + </label> + <data id="3159"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Espece_Inerte_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Espece_Vivant_non_detaille_trie</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="3102"> + <cell id="3103"> + <label id="3104"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.benthos"></text-property> + </label> + <grid name="benthos" id="3105"> + <column id="3106"/> + <row id="3107"> + <cell id="3108"> + <label id="3109"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total"></text-property> + </label> + <data id="3160"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Benthos_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Benthos</property> + </data> + </cell> + </row> + <row id="3110"> + <cell id="3111"> + <label id="3112"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-vrac"></text-property> + </label> + <data id="3161"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Benthos_Vrac_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Benthos_Vrac</property> + </data> + </cell> + </row> + <row id="3113"> + <cell id="3114"> + <label id="3115"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.vrac-trie"></text-property> + </label> + <data id="3162"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Benthos_Vrac_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Benthos_Vrac_Trie</property> + </data> + </cell> + </row> + <row id="3116"> + <cell id="3117"> + <label id="3118"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-hors-vrac"></text-property> + </label> + <data id="3163"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Benthos_HorsVrac_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Benthos_HorsVrac</property> + </data> + </cell> + </row> + <row id="3119"> + <cell id="3120"> + <label id="3121"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-inerte-trie"></text-property> + </label> + <data id="3164"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Benthos_Inerte_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Benthos_Inerte_Trie</property> + </data> + </cell> + </row> + <row id="3122"> + <cell id="3123"> + <label id="3124"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-vivant-non-detail-trie"></text-property> + </label> + <data id="3165"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr">row["Poids_Total_Benthos_Inerte_Trie_Calcule"]</expression> + <simple-property-list name="value1"> + <value>"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Benthos_Vivant_non_detaille_trie</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="3125"> + <cell id="3126"> + <label id="3127"> + <property name="style">label-sous-title</property> + <property name="textUnderline">none</property> + <property name="paddingTop">5px</property> + <text-property name="text" key="sous-title.macro-dechets"></text-property> + </label> + <grid name="macro-dechets" id="3128"> + <column id="3129"/> + <row id="3130"> + <cell id="3131"> + <label id="3537"> + <property name="style">label-general</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total"></text-property> + </label> + <data id="3538"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr" type="javascript">row["Poids_Total_Macro_Dechet_Calcule"]</expression> + <simple-property-list name="value1"> + <value type="javascript">"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Macro_Dechet</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + <grid name="rapport-espece" id="3181"> + <property name="pageBreakBefore">auto</property> + <structure name="toc"> + <expression name="expressionValue">getMessage("title.rapport-par-espece");</expression> + </structure> + <column id="3182"/> + <row id="3222"> + <cell id="3223"> + <list name="listCatch" id="3224"> + <property name="pageBreakInside">avoid</property> + <property name="dataSet">catchWithSpecies</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">Annee</property> + <expression name="expression">dataSetRow["Annee"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Serie</property> + <expression name="expression">dataSetRow["Serie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Serie_Partielle</property> + <expression name="expression">dataSetRow["Serie_Partielle"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Engin</property> + <expression name="expression">dataSetRow["Engin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_Station</property> + <expression name="expression">dataSetRow["Code_Station"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Numero_Trait</property> + <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poche</property> + <expression name="expression">dataSetRow["Poche"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Navire</property> + <expression name="expression">dataSetRow["Navire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Taxon</property> + <expression name="expression">dataSetRow["Taxon"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Nom_scientifique</property> + <expression name="expression">dataSetRow["Nom_scientifique"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Commentaire</property> + <expression name="expression">dataSetRow["Commentaire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">V_HV</property> + <expression name="expression">dataSetRow["V_HV"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Num_Ordre_V_HV_H2</property> + <expression name="expression">dataSetRow["Num_Ordre_V_HV_H2"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Tot_V_HV</property> + <expression name="expression">dataSetRow["Tot_V_HV"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Ech_V_HV</property> + <expression name="expression">dataSetRow["Ech_V_HV"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Type_Volume_Poids_V_HV</property> + <expression name="expression">dataSetRow["Type_Volume_Poids_V_HV"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Unite_Volume_Poids_V_HV</property> + <expression name="expression">dataSetRow["Unite_Volume_Poids_V_HV"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Class_Tri_</property> + <expression name="expression">dataSetRow["Class_Tri_"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Num_Ordre_Class_Tri__H2</property> + <expression name="expression">dataSetRow["Num_Ordre_Class_Tri__H2"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Tot_Class_Tri_</property> + <expression name="expression">dataSetRow["Tot_Class_Tri_"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Ech_Class_Tri_</property> + <expression name="expression">dataSetRow["Ech_Class_Tri_"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Type_Volume_Poids_Class_Tri_</property> + <expression name="expression">dataSetRow["Type_Volume_Poids_Class_Tri_"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Unite_Volume_Poids_Class_Tri_</property> + <expression name="expression">dataSetRow["Unite_Volume_Poids_Class_Tri_"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Sexe</property> + <expression name="expression">dataSetRow["Sexe"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Num_Ordre_Sexe_H2</property> + <expression name="expression">dataSetRow["Num_Ordre_Sexe_H2"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Tot_Sexe</property> + <expression name="expression">dataSetRow["Tot_Sexe"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Ech_Sexe</property> + <expression name="expression">dataSetRow["Ech_Sexe"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Type_Volume_Poids_Sexe</property> + <expression name="expression">dataSetRow["Type_Volume_Poids_Sexe"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Unite_Volume_Poids_Sexe</property> + <expression name="expression">dataSetRow["Unite_Volume_Poids_Sexe"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Maturité</property> + <expression name="expression">dataSetRow["Maturité"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Num_Ordre_Maturité_H2</property> + <expression name="expression">dataSetRow["Num_Ordre_Maturité_H2"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Tot_Maturité</property> + <expression name="expression">dataSetRow["Tot_Maturité"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Ech_Maturité</property> + <expression name="expression">dataSetRow["Ech_Maturité"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Type_Volume_Poids_Maturité</property> + <expression name="expression">dataSetRow["Type_Volume_Poids_Maturité"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Unite_Volume_Poids_Maturité</property> + <expression name="expression">dataSetRow["Unite_Volume_Poids_Maturité"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Age</property> + <expression name="expression">dataSetRow["Age"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Num_Ordre_Age_H2</property> + <expression name="expression">dataSetRow["Num_Ordre_Age_H2"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Tot_Age</property> + <expression name="expression">dataSetRow["Tot_Age"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Ech_Age</property> + <expression name="expression">dataSetRow["Ech_Age"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Type_Volume_Poids_Age</property> + <expression name="expression">dataSetRow["Type_Volume_Poids_Age"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Unite_Volume_Poids_Age</property> + <expression name="expression">dataSetRow["Unite_Volume_Poids_Age"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_Longueur</property> + <expression name="expression">dataSetRow["Code_Longueur"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Libelle_Longueur</property> + <expression name="expression">dataSetRow["Libelle_Longueur"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Taille</property> + <expression name="expression">dataSetRow["Taille"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">NumOrdre_Taille_H2</property> + <expression name="expression">dataSetRow["NumOrdre_Taille_H2"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poids_Classe_Taille</property> + <expression name="expression">dataSetRow["Poids_Classe_Taille"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Unite_Taille</property> + <expression name="expression">dataSetRow["Unite_Taille"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Precision_Mesure</property> + <expression name="expression">dataSetRow["Precision_Mesure"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Nbr</property> + <expression name="expression">dataSetRow["Nbr"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poids_Reference</property> + <expression name="expression">dataSetRow["Poids_Reference"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Coef_Elev_Espece_Capture</property> + <expression name="expression">dataSetRow["Coef_Elev_Espece_Capture"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">sumNbr</property> + <property name="dataType">float</property> + <simple-property-list name="aggregateOn"> + <value>groupTaxon</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + <list-property name="arguments"> + <structure> + <property name="name">Expression</property> + <expression name="value">row["Nbr"]</expression> + </structure> + </list-property> + </structure> + <structure> + <property name="name">poids-total-dans-la-capture</property> + <expression name="expression" type="javascript">dataSetRow["Poids_Reference"]*dataSetRow["Coef_Elev_Espece_Capture"]</expression> + <property name="dataType">decimal</property> + <property name="allowExport">true</property> + </structure> + <structure> + <property name="name">nbre-indiv-capt</property> + <expression name="expression" type="javascript">dataSetRow["Nbr"]*dataSetRow["Coef_Elev_Espece_Capture"]</expression> + <property name="dataType">decimal</property> + <property name="allowExport">true</property> + </structure> + <structure> + <property name="name">sumNbre-indiv-capt</property> + <property name="dataType">float</property> + <simple-property-list name="aggregateOn"> + <value>groupTaxon</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + <list-property name="arguments"> + <structure> + <property name="name">Expression</property> + <expression name="value">row["nbre-indiv-capt"]</expression> + </structure> + </list-property> + </structure> + <structure> + <property name="name">nbre-indiv-par-kg</property> + <expression name="expression" type="javascript">dataSetRow["Nbr"]/dataSetRow["Poids_Reference"]</expression> + <property name="dataType">decimal</property> + <property name="allowExport">true</property> + </structure> + <structure> + <property name="name">sumNbre-indiv-par-kg</property> + <property name="dataType">float</property> + <simple-property-list name="aggregateOn"> + <value>groupTaxon</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + <list-property name="arguments"> + <structure> + <property name="name">Expression</property> + <expression name="value">row["nbre-indiv-par-kg"]</expression> + </structure> + </list-property> + </structure> + <structure> + <property name="name">nbI-classeTaille</property> + <expression name="expression">dataSetRow["Nbr"]*dataSetRow["Taille"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">sumNbIclasseTaille</property> + <property name="dataType">float</property> + <simple-property-list name="aggregateOn"> + <value>groupTaxon</value> + </simple-property-list> + <property name="aggregateFunction">SUM</property> + <list-property name="arguments"> + <structure> + <property name="name">Expression</property> + <expression name="value">row["nbI-classeTaille"]</expression> + </structure> + </list-property> + </structure> + <structure> + <property name="name">categorisation-du-lot</property> + <expression name="expression">dataSetRow["categorisation-du-lot"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">species-Id</property> + <expression name="expression">dataSetRow["species-Id"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">species-Code_Rubin</property> + <expression name="expression">dataSetRow["species-Code_Rubin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">species-Nom Scientifique</property> + <expression name="expression">dataSetRow["species-Nom Scientifique"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">species-Code campagne</property> + <expression name="expression">dataSetRow["species-Code campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">species-lib</property> + <expression name="expression">dataSetRow["species-lib"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">minTaille</property> + <property name="dataType">float</property> + <simple-property-list name="aggregateOn"> + <value>groupTaxon</value> + </simple-property-list> + <property name="aggregateFunction">MIN</property> + <list-property name="arguments"> + <structure> + <property name="name">Expression</property> + <expression name="value" type="javascript">row["Taille"]</expression> + </structure> + </list-property> + <property name="allowExport">true</property> + </structure> + <structure> + <property name="name">maxTaille</property> + <property name="dataType">float</property> + <simple-property-list name="aggregateOn"> + <value>groupTaxon</value> + </simple-property-list> + <property name="aggregateFunction">MAX</property> + <list-property name="arguments"> + <structure> + <property name="name">Expression</property> + <expression name="value" type="javascript">row["Taille"]</expression> + </structure> + </list-property> + <property name="allowExport">true</property> + </structure> + </list-property> + <property name="repeatHeader">false</property> + <property name="pageBreakInterval">9000</property> + <list-property name="filter"> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">row["Numero_Trait"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Numero_Trait"]</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">row["Code_Station"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Code_Station"]</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + </list-property> + <header> + <label id="3724"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.rapport-par-espece"></text-property> + </label> + </header> + <group id="3605"> + <property name="groupName">groupVracHorsVrac</property> + <expression name="keyExpr" type="javascript">row["V_HV"]</expression> + <structure name="toc"> + <expression name="expressionValue" type="javascript">row["V_HV"]</expression> + </structure> + <property name="hideDetail">false</property> + <property name="pageBreakAfter">avoid</property> + <property name="pageBreakBefore">avoid</property> + <list-property name="sort"> + <structure> + <expression name="key" type="javascript">row["V_HV"]</expression> + <property name="direction">desc</property> + <property name="strength">-1</property> + </structure> + </list-property> + </group> + <group id="3225"> + <property name="groupName">groupTaxon</property> + <property name="interval">none</property> + <property name="sortDirection">asc</property> + <expression name="keyExpr" type="javascript">(row["Num_Ordre_V_HV_H2"]+1000)+" - "+row["categorisation-du-lot"]</expression> + <structure name="toc"> + <expression name="expressionValue" type="javascript">row["species-lib"]+" - "+row["categorisation-du-lot"]</expression> + </structure> + <property name="repeatHeader">false</property> + <property name="hideDetail">false</property> + <property name="pageBreakAfter">avoid</property> + <property name="pageBreakBefore">avoid</property> + <property name="pageBreakInside">avoid</property> + <list-property name="sort"> + <structure> + <expression name="key" type="javascript">row["V_HV"]</expression> + <property name="direction">desc</property> + <property name="strength">-1</property> + </structure> + <structure> + <expression name="key" type="javascript">row["species-lib"]</expression> + <property name="direction">asc</property> + <property name="strength">-1</property> + </structure> + </list-property> + <header> + <grid id="3674"> + <property name="pageBreakInside">avoid</property> + <column id="3675"/> + <row id="3676"> + <cell id="3677"> + <property name="borderTopColor">#000000</property> + <property name="borderTopStyle">solid</property> + <property name="borderTopWidth">1px</property> + <property name="paddingTop">5mm</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0mm</property> + <property name="paddingRight">0pt</property> + <grid id="3678"> + <column id="3679"/> + <row id="3680"> + <cell id="3681"> + <property name="textAlign">center</property> + <data id="3682"> + <property name="style">report-title</property> + <property name="fontSize">small</property> + <property name="display">inline</property> + <structure name="toc"/> + <property name="resultSetColumn">species-lib</property> + </data> + </cell> + </row> + </grid> + <text-data id="3683"> + <property name="paddingTop">10pt</property> + <expression name="valueExpr">cartouche;</expression> + <property name="contentType">html</property> + </text-data> + <grid name="espece1" id="3684"> + <column id="3685"/> + <row id="3686"> + <cell id="3687"> + <label id="3688"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="espece"></text-property> + </label> + <data id="3689"> + <property name="fontSize">7pt</property> + <property name="fontWeight">bold</property> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">species-lib</property> + </data> + </cell> + </row> + <row id="3690"> + <cell id="3691"> + <label id="3692"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="categ-lot"></text-property> + </label> + <data id="3693"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">categorisation-du-lot</property> + </data> + </cell> + </row> + <row id="3694"> + <cell id="3695"> + <label id="3696"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total-dans-la-capture"></text-property> + </label> + <data id="3697"> + <property name="style">data-calcule</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">poids-total-dans-la-capture</property> + </data> + </cell> + </row> + <row id="3698"> + <cell id="3699"> + <label id="3700"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="nbre-indiv-capt"></text-property> + </label> + <data id="3701"> + <property name="style">data-calcule</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.#</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">sumNbre-indiv-capt</property> + </data> + </cell> + </row> + <row id="3702"> + <cell id="3703"> + <label id="3704"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="nbre-indiv-kg"></text-property> + </label> + <data id="3705"> + <property name="style">data-calcule</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.#</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">sumNbre-indiv-par-kg</property> + </data> + </cell> + </row> + <row id="3706"> + <cell id="3707"> + <label id="3708"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="poids.moyen"></text-property> + </label> + <text-data id="3709"> + <property name="style">data-calcule</property> + <property name="display">inline</property> + <expression name="valueExpr">if (row["Poids_Reference"]>0 && row["sumNbr"]>0){ +BirtMath.round(((row["Poids_Reference"]/row["sumNbr"])*1000),1); +}</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="3710"> + <cell id="3711"> + <label id="3712"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="longueur-moy"></text-property> + </label> + <text-data id="3713"> + <property name="style">data-calcule</property> + <property name="display">inline</property> + <expression name="valueExpr">if (row["sumNbIclasseTaille"]>0){ + + if (row["Unite_Taille"]=="mm"){ + BirtMath.round(row["sumNbIclasseTaille"]/row["sumNbr"],0); + } else { + BirtMath.round(row["sumNbIclasseTaille"]/row["sumNbr"],1); + } +}</expression> + <property name="contentType">html</property> + </text-data> + <data id="3714"> + <property name="style">data-calcule</property> + <property name="display">inline</property> + <property name="resultSetColumn">Unite_Taille</property> + </data> + </cell> + </row> + <row id="3715"> + <cell id="3716"> + <property name="paddingTop">10pt</property> + <label id="3717"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="mode-mensuration"></text-property> + </label> + <data id="3718"> + <property name="textAlign">left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Libelle_Longueur</property> + </data> + </cell> + </row> + <row id="3719"> + <cell id="3720"> + <property name="paddingBottom">10pt</property> + <label id="3721"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="pas-mesure"></text-property> + </label> + <data id="3722"> + <property name="style">cell-left</property> + <property name="display">inline</property> + <property name="resultSetColumn">Precision_Mesure</property> + </data> + <text-data id="3723"> + <expression name="valueExpr">reportContext.setPersistentGlobalVariable("VariablePasMesure",row["Precision_Mesure"]+"");</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + </header> + <footer> + <grid id="3514"> + <property name="marginBottom">5mm</property> + <column id="3515"/> + <row id="3516"> + <property name="textAlign">center</property> + <cell id="3517"> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + <grid name="classeTailleTotal" id="3520"> + <property name="width">90mm</property> + <column id="3521"> + <property name="width">30mm</property> + </column> + <column id="3522"> + <property name="width">30mm</property> + </column> + <column id="3523"> + <property name="width">30mm</property> + </column> + <row id="3524"> + <cell id="3525"> + <property name="borderBottomColor">#000000</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#000000</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#000000</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <label id="3526"> + <property name="style">cell-right</property> + <property name="fontWeight">bold</property> + <property name="marginRight">5pt</property> + <text-property name="text" key="total"></text-property> + </label> + </cell> + <cell id="3527"> + <property name="borderBottomColor">#000000</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#000000</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#000000</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <data id="3528"> + <property name="fontWeight">bold</property> + <property name="resultSetColumn">sumNbr</property> + </data> + </cell> + <cell id="3529"> + <property name="borderBottomColor">#000000</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#000000</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#000000</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <data id="3530"> + <property name="fontWeight">bold</property> + <property name="resultSetColumn">Poids_Reference</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + <row id="3518"> + <property name="pageBreakAfter">auto</property> + <cell id="3519"> + <grid name="chart" id="3531"> + <property name="pageBreakAfter">auto</property> + <list-property name="visibility"> + <structure> + <property name="format">all</property> + <expression name="valueExpr" type="javascript">row["Precision_Mesure"]==null</expression> + </structure> + </list-property> + <column id="3532"/> + <row id="3533"> + <cell id="3534"> + <property name="paddingTop">10pt</property> + <property name="paddingBottom">1mm</property> + <property name="textAlign">center</property> + <extended-item extensionName="Chart" name="chartClasseTaille" id="3576"> + <xml-property name="xmlRepresentation"><![CDATA[<model:ChartWithAxes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:attribute="http://www.birt.eclipse.org/ChartModelAttribute" xmlns:data="http://www.birt.eclipse.org/ChartModelData" xmlns:layout="http://www.birt.eclipse.org/ChartModelLayout" xmlns:model="http://www.birt.eclipse.org/ChartModel" xmlns:type="http://www.birt.eclipse.org/ChartModelType"> + <Version>2.5.3</Version> + <Type>Bar Chart</Type> + <SubType>Side-by-side</SubType> + <Description> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Description> + <Block> + <Children xsi:type="layout:TitleBlock"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>false</Visible> + <Label> + <Caption> + <Value>Bar Chart Title</Value> + <Font> + <Size>16.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + </Children> + <Children xsi:type="layout:Plot"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Anchor>North</Anchor> + <Stretch>Horizontal</Stretch> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>true</Visible> + <HorizontalSpacing>0</HorizontalSpacing> + <VerticalSpacing>0</VerticalSpacing> + <ClientArea> + <Outline> + <Style>Solid</Style> + <Thickness>0</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <ShadowColor> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </ShadowColor> + <Insets> + <Top>0.0</Top> + <Left>0.0</Left> + <Bottom>0.0</Bottom> + <Right>0.0</Right> + </Insets> + </ClientArea> + </Children> + <Children xsi:type="layout:Legend"> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>0.0</Width> + <Height>0.0</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Visible>false</Visible> + <ClientArea> + <Outline> + <Style>Solid</Style> + <Thickness>0</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>2.0</Top> + <Left>2.0</Left> + <Bottom>2.0</Bottom> + <Right>2.0</Right> + </Insets> + </ClientArea> + <Text> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Text> + <Orientation>Vertical</Orientation> + <Direction>Top_Bottom</Direction> + <Separator> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </Separator> + <Position>Right</Position> + <ItemType>Series</ItemType> + <Title> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Title> + <TitlePosition>Above</TitlePosition> + </Children> + <Bounds> + <Left>0.0</Left> + <Top>0.0</Top> + <Width>283.46456692913387</Width> + <Height>141.73228346456693</Height> + </Bounds> + <Insets> + <Top>3.0</Top> + <Left>3.0</Left> + <Bottom>3.0</Bottom> + <Right>3.0</Right> + </Insets> + <Row>-1</Row> + <Column>-1</Column> + <Rowspan>-1</Rowspan> + <Columnspan>-1</Columnspan> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Visible>true</Visible> + </Block> + <Dimension>Two_Dimensional</Dimension> + <Units>Points</Units> + <SeriesThickness>10.0</SeriesThickness> + <ExtendedProperties> + <Name>enable.area.alt</Name> + <Value>false</Value> + </ExtendedProperties> + <SampleData> + <BaseSampleData> + <DataSetRepresentation>6,4,12,8,10</DataSetRepresentation> + </BaseSampleData> + <OrthogonalSampleData> + <DataSetRepresentation>5,4,12</DataSetRepresentation> + <SeriesDefinitionIndex>0</SeriesDefinitionIndex> + </OrthogonalSampleData> + </SampleData> + <Interactivity/> + <EmptyMessage> + <Caption> + <Value>This chart contains no data.</Value> + <Font> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>64</Transparency> + <Red>127</Red> + <Green>127</Green> + <Blue>127</Blue> + </Background> + <Outline> + <Color> + <Transparency>128</Transparency> + <Red>127</Red> + <Green>127</Green> + <Blue>127</Blue> + </Color> + <Visible>true</Visible> + </Outline> + <Insets> + <Top>10.0</Top> + <Left>10.0</Left> + <Bottom>10.0</Bottom> + <Right>10.0</Right> + </Insets> + <Visible>false</Visible> + </EmptyMessage> + <Axes> + <Type>Linear</Type> + <Title> + <Caption> + <Value>classe-taille=X-Axis Title</Value> + <Font> + <Size>8.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>5.0</Top> + <Left>0.0</Left> + <Bottom>0.0</Bottom> + <Right>0.0</Right> + </Insets> + <Visible>true</Visible> + </Title> + <TitlePosition>Below</TitlePosition> + <AssociatedAxes> + <Type>Linear</Type> + <Title> + <Caption> + <Value>nbre-indiv=Y-Axis Title</Value> + <Font> + <Size>8.0</Size> + <Bold>true</Bold> + <Alignment> + <horizontalAlignment>Center</horizontalAlignment> + <verticalAlignment>Center</verticalAlignment> + </Alignment> + <Rotation>90.0</Rotation> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>0.0</Left> + <Bottom>5.0</Bottom> + <Right>0.0</Right> + </Insets> + <Visible>true</Visible> + </Title> + <TitlePosition>Left</TitlePosition> + <SeriesDefinitions> + <Query> + <Definition></Definition> + </Query> + <SeriesPalette> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>166</Green> + <Blue>218</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>242</Red> + <Green>88</Green> + <Blue>106</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>232</Red> + <Green>172</Green> + <Blue>57</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>64</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>170</Red> + <Green>85</Green> + <Blue>85</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>192</Red> + <Green>192</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>192</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>7</Red> + <Green>146</Green> + <Blue>94</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>64</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>240</Green> + <Blue>120</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>0</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + </SeriesPalette> + <Series xsi:type="type:BarSeries"> + <Visible>true</Visible> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <DataDefinition> + <Definition>row["Nbr"]</Definition> + <Grouping> + <Enabled>false</Enabled> + <GroupType>Text</GroupType> + <AggregateExpression xsi:nil="true"/> + </Grouping> + </DataDefinition> + <SeriesIdentifier>Series 1</SeriesIdentifier> + <DataPoint> + <Components> + <Type>Orthogonal_Value</Type> + </Components> + <Separator>, </Separator> + </DataPoint> + <LabelPosition>Inside</LabelPosition> + <Stacked>false</Stacked> + <Riser>Rectangle</Riser> + </Series> + <Grouping> + <GroupType>Text</GroupType> + <AggregateExpression>Sum</AggregateExpression> + </Grouping> + </SeriesDefinitions> + <Orientation>Vertical</Orientation> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Visible>true</Visible> + </LineAttributes> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + <LabelPosition>Left</LabelPosition> + <MajorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Left</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </TickAttributes> + </MajorGrid> + <MinorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </TickAttributes> + </MinorGrid> + <Scale> + <Min xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Min> + <MinorGridsPerUnit>5</MinorGridsPerUnit> + <AutoExpand>true</AutoExpand> + </Scale> + <Origin> + <Type>Value</Type> + <Value xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Value> + </Origin> + <PrimaryAxis>true</PrimaryAxis> + <Percent>false</Percent> + <Aligned>false</Aligned> + <SideBySide>false</SideBySide> + </AssociatedAxes> + <SeriesDefinitions> + <Query> + <Definition></Definition> + </Query> + <SeriesPalette> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>166</Green> + <Blue>218</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>242</Red> + <Green>88</Green> + <Blue>106</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>232</Red> + <Green>172</Green> + <Blue>57</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>64</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>170</Red> + <Green>85</Green> + <Blue>85</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>192</Red> + <Green>192</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>192</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>7</Red> + <Green>146</Green> + <Blue>94</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>192</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>64</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>80</Red> + <Green>240</Green> + <Blue>120</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>0</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>0</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>64</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>128</Red> + <Green>128</Green> + <Blue>128</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>64</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Entries> + <Entries xsi:type="attribute:ColorDefinition"> + <Transparency>255</Transparency> + <Red>255</Red> + <Green>128</Green> + <Blue>0</Blue> + </Entries> + </SeriesPalette> + <Series> + <Visible>true</Visible> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>false</Visible> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>false</Visible> + </Label> + <DataDefinition> + <Definition>row["Taille"]</Definition> + </DataDefinition> + <SeriesIdentifier></SeriesIdentifier> + <DataPoint> + <Components> + <Type>Orthogonal_Value</Type> + </Components> + <Separator>, </Separator> + </DataPoint> + <LabelPosition>Outside</LabelPosition> + <Stacked>false</Stacked> + </Series> + <Grouping> + <Enabled>false</Enabled> + <GroupType>Numeric</GroupType> + <AggregateExpression>Sum</AggregateExpression> + </Grouping> + </SeriesDefinitions> + <Orientation>Horizontal</Orientation> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Visible>true</Visible> + </LineAttributes> + <Label> + <Caption> + <Value></Value> + <Font> + <Alignment/> + </Font> + </Caption> + <Background xsi:type="attribute:ColorDefinition"> + <Transparency>0</Transparency> + <Red>255</Red> + <Green>255</Green> + <Blue>255</Blue> + </Background> + <Outline> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + </Outline> + <Insets> + <Top>0.0</Top> + <Left>2.0</Left> + <Bottom>0.0</Bottom> + <Right>3.0</Right> + </Insets> + <Visible>true</Visible> + </Label> + <FormatSpecifier xsi:type="attribute:JavaNumberFormatSpecifier"> + <Pattern>##.###</Pattern> + </FormatSpecifier> + <LabelPosition>Below</LabelPosition> + <Staggered>false</Staggered> + <Interval>1</Interval> + <MajorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>196</Red> + <Green>196</Green> + <Blue>196</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Below</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>0</Red> + <Green>0</Green> + <Blue>0</Blue> + </Color> + <Visible>true</Visible> + </TickAttributes> + </MajorGrid> + <MinorGrid> + <LineAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </LineAttributes> + <TickStyle>Across</TickStyle> + <TickAttributes> + <Style>Solid</Style> + <Thickness>1</Thickness> + <Color> + <Transparency>255</Transparency> + <Red>225</Red> + <Green>225</Green> + <Blue>225</Blue> + </Color> + <Visible>false</Visible> + </TickAttributes> + </MinorGrid> + <Scale> + <Min xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Min> + <MinorGridsPerUnit>5</MinorGridsPerUnit> + <ShowOutside>false</ShowOutside> + <AutoExpand>false</AutoExpand> + </Scale> + <Origin> + <Type>Value</Type> + <Value xsi:type="data:NumberDataElement"> + <Value>0.0</Value> + </Value> + </Origin> + <PrimaryAxis>true</PrimaryAxis> + <CategoryAxis>false</CategoryAxis> + <Percent>false</Percent> + </Axes> + <Orientation>Vertical</Orientation> + <UnitSpacing>50.0</UnitSpacing> + <Rotation/> + <ReverseCategory>false</ReverseCategory> +</model:ChartWithAxes> +]]></xml-property> + <property name="outputFormat">SVG</property> + <list-property name="filter"> + <structure> + <property name="operator">is-not-null</property> + <expression name="expr">row["Taille"]</expression> + </structure> + </list-property> + <property name="inheritColumns">false</property> + <property name="height">50mm</property> + <property name="width">185mm</property> + </extended-item> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + </footer> + </group> + <detail> + <grid id="3492"> + <property name="textAlign">center</property> + <column id="3493"/> + <row id="3494"> + <cell id="3495"> + <property name="paddingTop">0pt</property> + <property name="paddingLeft">0pt</property> + <property name="paddingBottom">0pt</property> + <property name="paddingRight">0pt</property> + <grid name="classeTaille" id="3496"> + <property name="textAlign">left</property> + <property name="width">90mm</property> + <column id="3497"> + <property name="width">30mm</property> + </column> + <column id="3498"> + <property name="width">30mm</property> + </column> + <column id="3499"> + <property name="width">30mm</property> + </column> + <row id="3500"> + <list-property name="visibility"> + <structure> + <property name="format">all</property> + <expression name="valueExpr">row["NumOrdre_Taille_H2"] != null && row["NumOrdre_Taille_H2"] !=1</expression> + </structure> + </list-property> + <cell id="3501"> + <property name="style">grid-header-cell</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <label id="3502"> + <text-property name="text" key="classe-taille"></text-property> + </label> + </cell> + <cell id="3503"> + <property name="style">grid-header-cell</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <label id="3504"> + <text-property name="text" key="nbre"></text-property> + </label> + </cell> + <cell id="3505"> + <property name="style">grid-header-cell</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <label id="3506"> + <text-property name="text" key="poids"></text-property> + </label> + </cell> + </row> + <row id="3507"> + <list-property name="visibility"> + <structure> + <property name="format">all</property> + <expression name="valueExpr">row["NumOrdre_Taille_H2"]==null</expression> + </structure> + </list-property> + <cell id="3508"> + <property name="borderBottomColor">#000000</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#000000</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#000000</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <data id="3509"> + <property name="style">cell-right</property> + <property name="marginRight">5pt</property> + <property name="textAlign">center</property> + <property name="resultSetColumn">Taille</property> + </data> + </cell> + <cell id="3510"> + <property name="borderBottomColor">#000000</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#000000</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#000000</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <data id="3511"> + <property name="resultSetColumn">Nbr</property> + </data> + </cell> + <cell id="3512"> + <property name="borderBottomColor">#000000</property> + <property name="borderBottomStyle">solid</property> + <property name="borderBottomWidth">1px</property> + <property name="borderLeftColor">#000000</property> + <property name="borderLeftStyle">solid</property> + <property name="borderLeftWidth">1px</property> + <property name="borderRightColor">#000000</property> + <property name="borderRightStyle">solid</property> + <property name="borderRightWidth">1px</property> + <property name="paddingTop">0px</property> + <property name="paddingLeft">0px</property> + <property name="paddingBottom">0px</property> + <property name="paddingRight">0px</property> + <data id="3513"> + <property name="resultSetColumn">Poids_Classe_Taille</property> + </data> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + </detail> + </list> + </cell> + </row> + </grid> + <grid name="rapport-espece-benthos" id="3327"> + <list-property name="visibility"> + <structure> + <property name="format">all</property> + <expression name="valueExpr" type="javascript">true</expression> + </structure> + </list-property> + <structure name="toc"> + <expression name="expressionValue">getMessage("title.rapport-espece-benthos");</expression> + </structure> + <column id="3328"/> + <row id="3329"> + <cell id="3330"> + <label id="3331"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.rapport-espece-benthos"></text-property> + </label> + </cell> + </row> + </grid> + <grid name="rapport-macro-dechets" id="3332"> + <property name="masterPage">Simple MasterPage Portrait</property> + <property name="pageBreakBefore">always</property> + <structure name="toc"> + <expression name="expressionValue">getMessage("title.rapport-macro-dechets");</expression> + </structure> + <column id="3333"/> + <row id="3334"> + <cell id="3335"> + <label id="3336"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.rapport-macro-dechets"></text-property> + </label> + </cell> + </row> + <row id="3337"> + <cell id="3338"> + <text-data id="3603"> + <property name="paddingTop">10pt</property> + <expression name="valueExpr">cartouche;</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="3373"> + <cell id="3374"> + <grid name="detail-macro-dechets" id="3375"> + <column id="3376"/> + <row id="3377"> + <cell id="3378"> + <label id="3381"> + <property name="style">label-general</property> + <property name="paddingRight">0px</property> + <property name="display">inline</property> + <text-property name="text" key="poids.total"></text-property> + </label> + <data id="3574"> + <property name="fontWeight">normal</property> + <property name="fontStyle">normal</property> + <property name="fontVariant">normal</property> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="textAlign">left</property> + <property name="display">inline</property> + <list-property name="highlightRules"> + <structure> + <property name="operator">eq</property> + <expression name="testExpr" type="javascript">row["Poids_Total_Macro_Dechet_Calcule"]</expression> + <simple-property-list name="value1"> + <value type="javascript">"Y"</value> + </simple-property-list> + <property name="style">data-calcule</property> + </structure> + </list-property> + <property name="resultSetColumn">Poids_Total_Macro_Dechet</property> + </data> + </cell> + </row> + <row id="3379"> + <cell id="3380"> + <property name="paddingTop">10pt</property> + <table id="3382"> + <property name="dataSet">marineLitter</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">Annee</property> + <expression name="expression">dataSetRow["Annee"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Serie</property> + <expression name="expression">dataSetRow["Serie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Serie_Partielle</property> + <expression name="expression">dataSetRow["Serie_Partielle"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Engin</property> + <expression name="expression">dataSetRow["Engin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_Station</property> + <expression name="expression">dataSetRow["Code_Station"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Numero_Trait</property> + <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poche</property> + <expression name="expression">dataSetRow["Poche"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Navire</property> + <expression name="expression">dataSetRow["Navire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">MarineLitterCategory</property> + <expression name="expression">dataSetRow["MarineLitterCategory"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">MarineLitterSizeCategory</property> + <expression name="expression">dataSetRow["MarineLitterSizeCategory"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Number</property> + <expression name="expression">dataSetRow["Number"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Weight</property> + <expression name="expression">dataSetRow["Weight"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="name">Commentaire</property> + <expression name="expression">dataSetRow["Commentaire"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + <list-property name="filter"> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">row["Numero_Trait"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Numero_Trait"]</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">row["Code_Station"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Code_Station"]</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + </list-property> + <column id="3401"/> + <column id="3402"/> + <column id="3403"> + <property name="width">20mm</property> + </column> + <column id="3404"> + <property name="width">20mm</property> + </column> + <column id="3405"/> + <header> + <row id="3383"> + <cell id="3384"> + <label id="3406"> + <text-property name="text" key="categorie"></text-property> + </label> + </cell> + <cell id="3385"> + <label id="3407"> + <text-property name="text" key="categorie-taille"></text-property> + </label> + </cell> + <cell id="3386"> + <label id="3408"> + <text-property name="text" key="nbre"></text-property> + </label> + </cell> + <cell id="3387"> + <label id="3409"> + <text-property name="text" key="poids.sans-unite"></text-property> + </label> + </cell> + <cell id="3388"> + <label id="3410"> + <text-property name="text" key="commentaire_bis"></text-property> + </label> + </cell> + </row> + </header> + <detail> + <row id="3389"> + <property name="style">grid-detail-cell</property> + <cell id="3390"> + <data id="3411"> + <property name="textAlign">left</property> + <property name="resultSetColumn">MarineLitterCategory</property> + </data> + </cell> + <cell id="3391"> + <data id="3412"> + <property name="resultSetColumn">MarineLitterSizeCategory</property> + </data> + </cell> + <cell id="3392"> + <data id="3413"> + <property name="resultSetColumn">Number</property> + </data> + </cell> + <cell id="3393"> + <data id="3414"> + <structure name="numberFormat"> + <property name="category">Custom</property> + <property name="pattern">#0.####</property> + </structure> + <property name="resultSetColumn">Weight</property> + </data> + </cell> + <cell id="3394"> + <data id="3415"> + <property name="resultSetColumn">Commentaire</property> + </data> + </cell> + </row> + </detail> + </table> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + <grid name="rapport-capt-accident" id="3416"> + <property name="masterPage">Simple MasterPage Portrait</property> + <property name="pageBreakBefore">always</property> + <structure name="toc"> + <expression name="expressionValue">getMessage("title.rapport-capture-accidentelles");</expression> + </structure> + <column id="3417"/> + <row id="3418"> + <cell id="3419"> + <label id="3420"> + <property name="style">report-title</property> + <property name="fontSize">medium</property> + <property name="paddingTop">0px</property> + <property name="paddingBottom">5px</property> + <property name="textAlign">center</property> + <text-property name="text" key="title.rapport-capture-accidentelles"></text-property> + </label> + </cell> + </row> + <row id="3421"> + <cell id="3422"> + <text-data id="3604"> + <property name="paddingTop">10pt</property> + <expression name="valueExpr">cartouche;</expression> + <property name="contentType">html</property> + </text-data> + </cell> + </row> + <row id="3457"> + <cell id="3458"> + <table id="3460"> + <property name="dataSet">accidentalCatch</property> + <list-property name="boundDataColumns"> + <structure> + <property name="name">Annee</property> + <expression name="expression">dataSetRow["Annee"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Serie</property> + <expression name="expression">dataSetRow["Serie"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Serie_Partielle</property> + <expression name="expression">dataSetRow["Serie_Partielle"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Engin</property> + <expression name="expression">dataSetRow["Engin"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Code_Station</property> + <expression name="expression">dataSetRow["Code_Station"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Numero_Trait</property> + <expression name="expression">dataSetRow["Numero_Trait"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">Poche</property> + <expression name="expression">dataSetRow["Poche"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Navire</property> + <expression name="expression">dataSetRow["Navire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">BatchId</property> + <expression name="expression">dataSetRow["BatchId"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">ReferenceTaxonId</property> + <expression name="expression">dataSetRow["ReferenceTaxonId"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">ReferenceTaxonName</property> + <expression name="expression">dataSetRow["ReferenceTaxonName"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">Commentaire</property> + <expression name="expression">dataSetRow["Commentaire"]</expression> + <property name="dataType">string</property> + </structure> + <structure> + <property name="name">CaracteristicId</property> + <expression name="expression">dataSetRow["CaracteristicId"]</expression> + <property name="dataType">integer</property> + </structure> + <structure> + <property name="name">CaracteristicValue</property> + <expression name="expression">dataSetRow["CaracteristicValue"]</expression> + <property name="dataType">string</property> + </structure> + </list-property> + <list-property name="filter"> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">row["Numero_Trait"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Numero_Trait"]</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + <structure> + <property name="operator">eq</property> + <expression name="expr" type="javascript">row["Code_Station"]</expression> + <simple-property-list name="value1"> + <value>row._outer["Code_Station"]</value> + </simple-property-list> + <property name="updateAggregation">true</property> + </structure> + </list-property> + <column id="3473"/> + <column id="3474"> + <property name="width">25mm</property> + </column> + <column id="3475"> + <property name="width">40mm</property> + </column> + <header> + <row id="3461"> + <cell id="3462"> + <label id="3476"> + <text-property name="text" key="espece_bis"></text-property> + </label> + </cell> + <cell id="3463"> + <label id="3477"> + <text-property name="text" key="caracteristique"></text-property> + </label> + </cell> + <cell id="3464"> + <label id="3478"> + <text-property name="text" key="valeur"></text-property> + </label> + </cell> + </row> + </header> + <detail> + <row id="3465"> + <property name="style">grid-detail-cell</property> + <cell id="3466"> + <data id="3479"> + <property name="textAlign">left</property> + <property name="resultSetColumn">ReferenceTaxonName</property> + </data> + </cell> + <cell id="3467"> + <data id="3481"> + <property name="resultSetColumn">CaracteristicId</property> + </data> + </cell> + <cell id="3468"> + <data id="3482"> + <property name="resultSetColumn">CaracteristicValue</property> + </data> + </cell> + </row> + </detail> + </table> + </cell> + </row> + </grid> + </cell> + </row> + </grid> + </detail> + </list> + </cell> + </row> + </grid> + </body> + <list-property name="images"> + <structure> + <property name="name">logo-ifremer.PNG</property> + <property name="type">image/png</property> + <property name="data"> + iVBORw0KGgoAAAANSUhEUgAAApUAAACDCAIAAABTI3dfAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAEnFJREFUeF7tneG2 + oCiuRqvf/3nq+arPjGscC5V8iYgQ9ln3R9cUhmSDbEFP3X/+/Pnzix8IQAACEIAABOYi8ONvfiAAAQhA + AAIQmIvAr7nSJdtxCPz+/XucZMgEAhCAwGoE8PdqI+6rV5H0Txulma9jWkMAAhCAQJUA/maC3BLYxbz9 + x52kj39VbwlrCEAAAhBoRQB/tyKZOc5u5U3hFUkf/4p9eeY5QW0QgMDXBPD31yMwUv/FTnpP7c7fda8X + mkfnIw01uUAAAtMTwN/TD2HDAo4n5OfD8/1vj9q+/O/jHv1yy8778oajRigIQGBNAvh7zXE3qr4zdCFm + U+Rn5deP3xkMCEAAAhAQCeBvEdRazUQxK82KM/bC3xyqrzWxqBYCEGhHAH+3Yzl5pOJMuzj3rquaffnk + g0/6EIDAfATw93xj9lLGxcvvrRfvDltvXwQ/n6tX3pEX39mZb9P1L+kqn9a/hJ2wEIAABGIE8HeMW/Kr + Lo+1dTd7WxbPCmeXn3HffRZXvHGvP4XsHZ2fVFo9uySfKJQHAQh8RwB/f8d+4J7PH5+/vR2/3CKfJV08 + WByvavjNnff5I9B+4MEnNQhAYA4C+HuOcfoqS0WQAXuJl1QeGoo9uhjQ9VK/W+1fDS79QgACUxPA31MP + X9fkdUdO0VI8Ie928GC+xe862HQGAQgMTwB/Dz9EwyQ4hZX1JEV/HwPuQ6H3Ems5zJiTCAQgMC4B/D3u + 2AybWcxJCa46+rvPvnzYOUBiEIDA5wTw9+dDME0CxQFvAh8/KaGPvy9/EWCaGUOiEIDAmwTw95t0k8Y+ + SuWJArnWSyDphKIsCEAgQgB/R6gtfo3XOmna/4z757UsPvcoHwIQ2AngbyaDm8DnDvskgZ4H5vUC3QPG + BRCAQEYC+DvjqHap6ROJDtLp5xvxLiNMJxCAwNAE8PfQwzNgcrz8HucZYsDpQUoQgEA3Avi7G+okHe3+ + Ln4xehCrLZVGkilFGRCAQIgA/g5hW/ii/bfIljLlsMUuPBMpHQKrE8Dfq8+AcP3DKm21xMIjyIUQgMDU + BPD31MPXO3lefo/5cNB7HtAfBCAwAAH8PcAgTJLCrq6ffMfU2MpZTTKJSBMCEGhGAH83Q7lOoJU1OXLt + 68xAKoUABH4I4G+mwS2B4h/f3r9cY/89psWZyhCAwFIE8PdSwx0sll8VG1PY56yCA8xlEIDAhATw94SD + 1j1l/D2Lv49nJN2nCR1CAAJdCeDvrrjn7WwigS2e6rxzjMwhAAEXAfztwrVQ47uX34vbcYryF5qmlAqB + hQng74UHv1r65a96/1wxhcAWT5I5DQEIrEAAf68wyo9qvHPhFnRxUw5b/qMh52IIQGAGAvh7hlHqlWPx + b5tj6GH1bCbWa8rQDwQg8BkB/P0Z+pE7Ll5+76ma2qDBUARGnmPkBgEIPCSAvx8CzHn57m9+c2woHweS + yTlBqQoCEODfX2MO7IfklygqL78DLuGSbwkw2yEAgUwE2H9nGs14LecNNy+/v3XtS73HpwhXQgACgxHA + 34MNyEfpXPqbw/OXJPpt2I+mGN1CAAKNCeDvxkBnD7er5aeQ438f//itfuj9IYHZpyj5QwACGwH8vehM + 2H9VbBPzkULxW2SFLThXf6jPzy9fdMZTNgTSEcDf6YbUWVCxyS5EfikbFN7WwT15OmcHzSEAgXEJ4O9x + x6ZPZpUD831r3lZXi0TrM3z0AgEILEsAfy879BeF8/I7/GzBNIIABCDQmQD+7gz8++72T83Pqdz5mw/Z + lO/zvx9aMoAABFYigL9XGu1TrWcx700Ul4d3q5NeuL9QKCgtPYcoHgIQ+IgA/v4I/Bjd1l9+bzneubby + V5PqWU97jNEjCwhAYGkC+Hu54S9+c+z822K7mM97cd1wOVoen1GK/15u3lAwBCAwGAH8PdiAvJzO8eX3 + 3Yvwo3oLl39u5fqmv+2RwPk55uXBITwEIAABBwH87YCVqWlF0kdvdXO5qN5Ks/P+2Pu0sY3v+Z1CpnGn + FghAIA2Bs79//hf+Lz+Bv8X86yCtv2q/f/n9/0u8mjTb/8xApd/zRD1WYfZybrD1y/yHAAQgMAUB/J1c + 1Uch3cnpocsDptQvKVx+/ON2gylF6d39751C8lkxxdpEkhCAQJ0A/l5opa7Iaf+rS5fvc8grwobtzzm8 + 52924aybEIDA+ATw94r+vjst3424Cazi8oZiPvdVOTzX76jdwYFU9V5oCQEIQOArAvh7IX9XtrCXO07x + JXRAkHVDP/d3IKWv7kD6hQAEIBAjgL8z+1s5By724ndn7IrLA9Y8X1K80q4fFdxN+ieZxG4kroIABCDQ + mQD+zuzv42RSvsxSXn4X5+qXl+j6rEcL3wx6ApcPEOF+uRACEIBANwL4ezl/iy+/d7Nuc/Go/yd2LK59 + yd/HnCvZdrvN6AgCEIBAcwL4exV/71PnfGBeP4UuFNvW5c0ndOWB4FLkbyRATAhAAAIdCODvnP4uTsvv + XoQ/fPl9eXl9d15/Gng+4wPv6Sud/vr753l6RIAABCDQigD+zunv4/wQPwF76HJ943u5g281ocU0js3O + XRfavvtjw5wJBQEIQMBLAH/n9/fZ5XezZN+mH11+1r+5w1Yk6p2pYvv94CH22ls099ZMTIlmEIAABN4g + gL/zrMJ3h+R3/q5/kX4W4RZHFKT5jdsbs9nstEj+mIPL3Pj7jeEjJgQg4CKAv/P4ex9418vvwsrn2VPZ + i1/+Vf0Lc9fs9DauvPw+Hgkcn0K2LmI/3vRoDwEIQKAhAfyd0N/nDbe5NVc+Shft+O1n3oHeY/Lm/Lzh + MkQoCEAgQAB/J/f33eF5MVeOW/bKh2x3e3HzQ/TA1NR3xpfBjyI/b7iPl+Dv8OhwIQQg8CEB/J3E3+YO + u3BY5eV3/cB8n6x3h+eVJ4PARFfkWqR0+ce7epX4fH8eGDgugQAE3iaAv5P4+85hdxPovOGu72J3/e8P + CuaHbE3mruJXb+1NNt+cnzcZX4JAAAJhAvg7m7+PU6H+hXll23qeT5fH0YXLtz8WZ+nhqbldqPxUnjzM + 3pX4qNrESAMIQKA/Afy9ir/NA/Nt8hWn4uengfPn5a/OWsWvb/v71QIJDgEIQCBGAH9n9vfdXtzl8qPX + C8cfN9yx+WdeFfa3GVnc34txaAYBCECgMwH8ncrfylds+yb7LOZi8lU+Sr/cl78xd/H3G1SJCQEIJCCA + v1P5+27DXZmpyjvy4uX39gTQZ/bj7z6c6QUCEJiOAP5O6++HLi+8fv5tsT5zHX/34UwvEIDAdATwdx5/ + V/bExUn43TQVD8x7znL83ZM2fUEAAhMRwN+p/K0cax/bmMrv8IVa/W7B3xOtJqQKAQj0JIC/8/i77YF5 + INobExd/v0GVmBCAQAIC+Hsyfys77GJeKpe0/UdXGt4Ya/q7yf9/0jq6hmP0MNSe55M4x2KfxIldOxHq + WIFcNSYB/D2ZvwPTyHVgvsVXPkoPZBK4pJW/lTiuNmYt4TW9uNDs6NjAVUKTf1fO7PEy/9hV51Ct4rgg + b429P4EuvOgqXTyZVK0yJ05zAvg7ib+VTfYmZsXQ+Ntcnc1b0eXvSmOzo72BmfNlAz3+XUtXpbr56onp + xT4vsIigd/2GNV207xo3Z0LATwjg7yT+3mePqN7iwFzUf/85qqyVSlZKHFcbs9Mm66y4RXZl3tzieqXe + PGNPDOdezMHSG3hLaJ5ME9p6vbQcmQD+nsnfAcvWvzA/7sUDwTvMbGW5VNJQ4rjamJ02WWe7+Vvs6LJq + sVIX3mPjY6dNgphj1+q54Y3tbxPaYQJcOBQB/D2TvwNTRzkwF7fsgd6fX6Ks10ovShxXG7PTJuusolVX + 2mJWZnW6U/eWT/JsG8RVXZOuG+7ClRE0UccIcNVoBPB3Bn8rW+fzv80y2lwM7O22dUopxFzRvA3MTpV1 + 9ieI+VPvyLzc28Cs69xAqdSbRtF+6/ThT6A0/THFm1s4mSa0w71z4VAE8Le0+g81Zs+TGXnDXVSnLIsK + ECWOq43ZaZN1tv50oiQcMJBZmmuMmqh34/D8x1uaa/Ptaiw+dwaelhRKYQ5cOBQB/J3W37qkle37V7O2 + 1WKkxHG1MYGY0UQh3XWkxPeu/ntMs7rAY4GZcJ8GrtLEh4/LmEo5zZN5OKkC+XDJhwTw9xL+1l3+4Vzs + uQjqW6UwEGX5VtrE/F1J+0mn4TE6dtrK/fog3vUuDq5ylBIjIybQiljs+SyQJJf0IYC/0/r7OIHwd8yC + 4UNOcRt0KYZCSwExmGuHqXAzQswo4VEoEg4wCasrLO8tSfPHhVoJWJ9UWwRvp7QfkwD+Xm4qj3xafr5J + zOXv4WJkxg/ft2bkcwO9r4dSMTWgZ2KGEsWp46rkpgRxlWZWp0R7Plixp6WtXyVD2kxKAH/nnN/zbriL + G+mNFdm1GoZvbCVz0W2uxxoxYTM9MY5pOLFGM59WcfS6zNLEUGZpYpytmevHFZnG0xHA35P5e67d8/P7 + QVmtnvRixg8HNyOLQnLJ27XfarUvVCpVMDaJ0yTInm0fRAocMaXwpHLlQONBCODvyfx9nDcruLztcux1 + oUuHgZOD2AlnH6notbcaoyZxmgRRdrquFbzVkOn7b1d6NJ6UAP6e2N8ruLzhcnx5i5rxwze2GTkmb3MF + 1xM2MxRDrRlHhNP5USA8qVzl0HgQAmd//+FndgL/3Zcn+THdoG8TB/R3YBXouZMT0zPHKGUcsSj87QJF + YxcB/J3Ec1nLMN2Av4+IfDe/BVeMZoVRj7jmiiPCUfztmsMmJVc0VxU0Ho0A/s4qviR1vb1amfHDd6wZ + ObbOsv82R8Qkb0YwX1J4x65JSs0fBRQOtBmZAP5O4rmsZZgLn3clLe5GM3747jUjxzJXwrZqI9be6pHC + TLtJPiJ2M5m2DcTSmj9Y6P3SckAC+Dur+JLUpayST+4rM344uBlZFIn3gUPpV2wj1o6/RZ6VZiJq/K2D + WqEl/k7iuaxlKCvjkxvVjB8ObkbG395HE3EsTPJKHDNI2wZKSpyf65QWaYm/s4ovSV3KKvnkXjXjh4Ob + kfE3/t4niT7NzHmlh6Ll7ATwdxLPZS3DXK1iFtzvWzN++A43I8cyV8K2aiPWzvn5c+Aias7PdVArtMTf + WcWXpC5lZXxyo5rxw8HNyPib/Tf77/D9xYX/eZhLssxTRlICL1mQ/XdDsOy/FZijUcJ/CQjg76Tey1KW + sjI+uQ/N+OHgZuQ39t/hbJ9cOJqZTPJKsU2CKB152wybmLcQ2j8ngL+ziC5pHeZqFbNgh/33S68qW8ny + +dohMtQ7MsdaDNUkTpMgYsKuZsMm5qqCxk0I4O+k3stSlrla4e8joiaLgjdIq0cKc6zFxJrEaRJETNjV + bNjEXFXQuAkB/J1FdEnrMFcr/I2/i6XQnDPK0tkkiNKRt82wiXkLof1zAvg7qfeylGWuVvi7QPR8UfBG + SLn/fun1h5ftub15RzzvggizEMDfWUSXtA5ztVrN36ZX+i89+Lsnc/OO6JkMfX1LAH8n9V6WsszVCn+f + EXVeU/B3T+DmHdEzGfr6lgD+ziK6pHWYqxX+xt9vvP/eYrZ6NGm4ypt3RMO+CDU4Afyd1HtZyjJXqwX9 + bXrlIRPvmtVKcuZYi4m1ijMaZ+WRovPQiyNCs5cI4O8soktah7kWP1ywzPhPbrz3gr8a2VtyYn+/qvDY + 1H1v6L3jTvvPCeDvpN7LUpa5WsUWwf3GM+M/uUXfC25GjmHZwnpLXtzfT4h5Ub/6PBFIhku+JYC/s4gu + aR0viWp2fyvruCLjS7zeJSm3v4dCrSTjHT7az0sAfyf1Xpay8Pfd4qKQibXxLmf4O8Y5sHHH397Jmbs9 + /s4iuqR1KCvjk1vUjD9scGUpN6u7a+CqOr2/x0GtZOIaOxpPTQB/J/VelrIUAz25A834wwbfEnvpx1X1 + Cv4eBLWShmvsaDw1AfydRXRJ61D89OQONOMPG3xPzCwh0MBV9SL+Vtz5NmolB9fY0XhqAvg7qfeylKUs + iE/uQDP+sMGPiZlVeBu4ql7H34o+X0WtJOAaOxpPTQB/ZxFd0jqU1fDJHWjGHzb4OTGzFr2Bq+ql/N38 + tYULNf724srdHn8n9V6WshTlPLlFzfjDBr9LzKyoyTdr+u5fB2hmLoZqFcfszuyoOWr8bQ7KUg3wdxbR + Ja1DWSKf3LFm/GGDm4mZpW0NzDhmgwX33wWTbqjxtzkbl2qAv5N6j7IgAAEIQCA1AfydengpDgIQgAAE + khLA30kHlrIgAAEIQCA1AfydengpDgIQgAAEkhL4F9OQMdkvAe1SAAAAAElFTkSuQmCC + </property> + </structure> + </list-property> +</report> Added: trunk/tutti-service/src/test/resources/report/2013.12.05/version.appup =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/version.appup (rev 0) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/version.appup 2013-12-05 17:37:15 UTC (rev 1432) @@ -0,0 +1 @@ +2013.12.05 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2013-12-04 13:15:03 UTC (rev 1431) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2013-12-05 17:37:15 UTC (rev 1432) @@ -57,7 +57,7 @@ protected List<File> reports; - protected final ReportModel editObject = new ReportModel(); + protected final ReportModel editObject = new ReportModel(birtReportHome); public ReportUIModel() { super(null, toBeanBinder); @@ -114,6 +114,6 @@ @Override protected ReportModel newEntity() { - return new ReportModel(); + return new ReportModel(birtReportHome); } }

1 0