This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit a3822b1ec7e9ef4955bd1f27dbca4111e2faf743 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 7 16:24:20 2016 +0100 #8744 DataQuality wasn't copy in export row --- ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/MooringResultsEsduByEchotypeImportRow.java | 1 + ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/VoyageResultsEsduByEchotypeImportRow.java | 1 + ...ResultsEsduBySpeciesAndAgeCategoryImportRow.java | 1 + .../import-data/result/esdu/byEchotype.csv.gz | Bin 73195 -> 72758 bytes .../import-data/result/esdu/byEchotype_small.csv.gz | Bin 2802 -> 2791 bytes 7 files changed, 5 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java index ac2728b..f200708 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java @@ -73,6 +73,7 @@ public class MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow implements row.setEchotype(category.getEchotype()); row.setSizeCategory(category.getSpeciesCategory().getSizeCategory()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java index 491deb6..5f8676a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportRow.java @@ -59,6 +59,7 @@ public class MooringResultsEsduByEchotypeImportRow implements ResultAble, CellAb row.setCell(cell); row.setEchotype(category.getEchotype()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java index 260fd08..9622577 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java @@ -72,6 +72,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow implements R row.setEchotype(category.getEchotype()); row.setSizeCategory(category.getSpeciesCategory().getSizeCategory()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java index 632226b..0865712 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java @@ -58,6 +58,7 @@ public class VoyageResultsEsduByEchotypeImportRow implements ResultAble, CellAbl row.setCell(cell); row.setEchotype(category.getEchotype()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java index 0c0a5aa..6b54584 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java @@ -65,6 +65,7 @@ public class VoyageResultsEsduBySpeciesAndAgeCategoryImportRow implements Result row.setAgeCategory(category.getSpeciesCategory().getAgeCategory().getName()); row.setAgeCategoryMeaning(category.getSpeciesCategory().getAgeCategory().getMeaning()); row.result.addAll(cellResults); + row.setDataQuality(cellResults.get(0).getDataQuality()); return row; } diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz index 3518109..54f5cb9 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz index dbb9dfb..e433911 100644 Binary files a/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz and b/echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.