This is an automated email from the git hooks/post-receive script. New commit to branch feature/8164 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 02b99a7be3f3b71a9bceb4779304c3823c9bf768 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 29 17:24:47 2016 +0200 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) --- .../protocol/CalcifiedPiecesSamplingRow.java | 6 +++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 ++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java index 5a144e8..542e080 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java @@ -38,6 +38,12 @@ public class CalcifiedPiecesSamplingRow implements Serializable { public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_REFTAX = "reftax"; + + public static final String PROPERTY_SURVEY_CODE = "surveyCode"; + + public static final String PROPERTY_SCIENTIFIC_NAME = "scientificName"; + public static final String PROPERTY_MIN_SIZE = "minSize"; public static final String PROPERTY_MAX_SIZE = "maxSize"; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java index d44b84e..3379dca 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java @@ -45,7 +45,8 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo CalcifiedPiecesSamplingRowModel result = new CalcifiedPiecesSamplingRowModel(separator); - result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_REFTAX, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, new ValueFormatter<Species>() { @Override @@ -54,6 +55,26 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo } }); + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SURVEY_CODE, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + new ValueFormatter<Species>() { + + @Override + public String format(Species species) { + return String.valueOf(species.getSurveyCode()); + } + }); + + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SCIENTIFIC_NAME, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + new ValueFormatter<Species>() { + + @Override + public String format(Species species) { + return String.valueOf(species.getName()); + } + }); + result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_MATURITY, TuttiCsvUtil.BOOLEAN); result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_SEX, TuttiCsvUtil.PRIMITIVE_BOOLEAN); result.newColumnForExport(CalcifiedPiecesSamplingRow.PROPERTY_MIN_SIZE, TuttiCsvUtil.PRIMITIVE_INTEGER); @@ -71,7 +92,8 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo CalcifiedPiecesSamplingRowModel result = new CalcifiedPiecesSamplingRowModel(separator); - result.newForeignKeyColumn(CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, + result.newForeignKeyColumn(CalcifiedPiecesSamplingRow.PROPERTY_REFTAX, + CalcifiedPiecesSamplingRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_REFERENCE_TAXON_ID, allSpecies); @@ -84,6 +106,9 @@ public class CalcifiedPiecesSamplingRowModel extends AbstractTuttiImportExportMo result.newMandatoryColumn(CalcifiedPiecesSamplingRow.PROPERTY_OPERATION_LIMITATION, TuttiCsvUtil.INTEGER); result.newMandatoryColumn(CalcifiedPiecesSamplingRow.PROPERTY_ZONE_LIMITATION, TuttiCsvUtil.INTEGER); + result.newIgnoredColumn(CalcifiedPiecesSamplingRow.PROPERTY_SURVEY_CODE); + result.newIgnoredColumn(CalcifiedPiecesSamplingRow.PROPERTY_SCIENTIFIC_NAME); + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.