branch develop updated (f5ccf41 -> 441e785)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f5ccf41 Fixes #8013 Merge branch 'feature/8013' into develop new 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) new dbdd317 Correction du poids total espèce vrac non exporté (see #8022) new 441e785 fixes #8022 Merge branch 'feature/8022' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 441e78539ac85d20547d3aabe0ce7819242bd357 Merge: f5ccf41 dbdd317 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 17:48:51 2016 +0100 fixes #8022 Merge branch 'feature/8022' into develop commit dbdd31790d02b4b9db3672eac4c01f5bd1baf13f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 17:48:43 2016 +0100 Correction du poids total espèce vrac non exporté (see #8022) commit 7ef392016c2df1cda1bfacfb47bbfa16f311b701 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 17:21:18 2016 +0100 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) Summary of changes: .../tutti/service/genericformat/csv/OperationRow.java | 6 +++--- .../genericformat/GenericFormatExportServiceAno7992Test.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7ef392016c2df1cda1bfacfb47bbfa16f311b701 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 17:21:18 2016 +0100 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) --- .../tutti/service/genericformat/csv/OperationRow.java | 2 +- .../genericformat/GenericFormatExportServiceAno7992Test.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java index 21f3a05..52be77a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java @@ -197,7 +197,7 @@ public class OperationRow extends RowWithOperationContextSupport { batch.setSpeciesTotalUnsortedComputedWeight(catchBatch.getSpeciesTotalUnsortedComputedWeight()); batch.setSpeciesTotalSampleSortedComputedWeight(catchBatch.getSpeciesTotalSampleSortedComputedWeight()); batch.setSpeciesTotalLivingNotItemizedWeight(catchBatch.getSpeciesTotalLivingNotItemizedWeight()); - batch.setSpeciesTotalLivingNotItemizedWeight(catchBatch.getSpeciesTotalLivingNotItemizedWeight()); + batch.setSpeciesTotalLivingNotItemizedComputedWeight(catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); batch.setSpeciesTotalInertWeight(catchBatch.getSpeciesTotalInertWeight()); batch.setSpeciesTotalInertComputedWeight(catchBatch.getSpeciesTotalInertComputedWeight()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java index 01ea8c0..3151bda 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java @@ -53,6 +53,12 @@ public class GenericFormatExportServiceAno7992Test { @ClassRule public static final ServiceDbResource dbResource = ServiceDbResource.readDb("dbAno7992"); + public static final String OPERATION_FILE_CONTENT + = "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Navire;DateDeb;LatDeb;LongDeb;DateFin;LatFin;LongFin;Duree;Strate;Sous_Strate;Localite;Validite_OP;Rectiligne;Distance;Saisisseur;Navire_Associe;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; [...] + "2015;Campagne EVHOE;;A;1;1;GOV 11.90/16.45;1;590117;03/11/2015 00:00:00;;;03/11/2015 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;6.4;Y;6.4;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;6.4;Y;6.4;N;3.2;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100000;100000;590117;;;;;\n" + + "2015;Campagne EVHOE;;A;2;1;GOV 11.90/16.45;1;590117;23/02/2016 00:00:00;;;23/02/2016 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;200.0;Y;200.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;200.0;Y;200.0;N;100.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100001;100016;590117;;;;;\n" + + "2015;Campagne EVHOE;;A;3;1;GOV 11.90/16.45;1;590117;24/02/2016 00:00:00;;;24/02/2016 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;200.0;Y;200.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;200.0;Y;200.0;N;100.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100002;100029;590117;;;;;\n"; + public static final String CATCH_FILE_CONTENT = "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Lot_A_Confirmer;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Commentaire_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;Commentaire_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Commentaire [...] "2015;Campagne EVHOE;;A;1;1;949;NEPH-NOR;Nephrops norvegicus;N;N;Vrac;1;3.2;;Poids;kg;;NA;;;;;kg;;Male;1;2.54;;Poids;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;NA;;;;;kg;;;;;;;;;;?;2.54;2.519685;2.3188405;CAM-EVHOE;311;100004;NA;;300;100005;NA;;NA;;NA;;NA;;NA;\n" + @@ -199,9 +205,13 @@ public class GenericFormatExportServiceAno7992Test { Path catchPath = exportResult.getArchive().getCatchPath(); String catchFileContent = new String(java.nio.file.Files.readAllBytes(catchPath)); System.out.println("Catch file:\n" + catchFileContent); - Assert.assertEquals(CATCH_FILE_CONTENT, catchFileContent); + Path operationPath = exportResult.getArchive().getOperationPath(); + String operationFileContent = new String(java.nio.file.Files.readAllBytes(operationPath)); + System.out.println("Operation file:\n" + operationFileContent); + Assert.assertEquals(OPERATION_FILE_CONTENT, operationFileContent); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit dbdd31790d02b4b9db3672eac4c01f5bd1baf13f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 17:48:43 2016 +0100 Correction du poids total espèce vrac non exporté (see #8022) --- .../fr/ifremer/tutti/service/genericformat/csv/OperationRow.java | 4 ++-- .../genericformat/GenericFormatExportServiceAno7992Test.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java index 52be77a..ddce430 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java @@ -193,7 +193,7 @@ public class OperationRow extends RowWithOperationContextSupport { batch.setSpeciesTotalComputedWeight(catchBatch.getSpeciesTotalComputedWeight()); batch.setSpeciesTotalSortedWeight(catchBatch.getSpeciesTotalSortedWeight()); - batch.setSpeciesTotalSortedWeight(catchBatch.getSpeciesTotalSortedWeight()); + batch.setSpeciesTotalSortedComputedWeight(catchBatch.getSpeciesTotalSortedComputedWeight()); batch.setSpeciesTotalUnsortedComputedWeight(catchBatch.getSpeciesTotalUnsortedComputedWeight()); batch.setSpeciesTotalSampleSortedComputedWeight(catchBatch.getSpeciesTotalSampleSortedComputedWeight()); batch.setSpeciesTotalLivingNotItemizedWeight(catchBatch.getSpeciesTotalLivingNotItemizedWeight()); @@ -551,7 +551,7 @@ public class OperationRow extends RowWithOperationContextSupport { public Float getSpeciesTotalSortedWeight() { return Numbers.getValueOrComputedValue( catchBatch.getSpeciesTotalSortedWeight(), - catchBatch.getSpeciesTotalSortedWeight()); + catchBatch.getSpeciesTotalSortedComputedWeight()); } public Float getSpeciesTotalUnsortedWeight() { diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java index 3151bda..ed68ef9 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java @@ -55,9 +55,9 @@ public class GenericFormatExportServiceAno7992Test { public static final String OPERATION_FILE_CONTENT = "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Navire;DateDeb;LatDeb;LongDeb;DateFin;LatFin;LongFin;Duree;Strate;Sous_Strate;Localite;Validite_OP;Rectiligne;Distance;Saisisseur;Navire_Associe;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; [...] - "2015;Campagne EVHOE;;A;1;1;GOV 11.90/16.45;1;590117;03/11/2015 00:00:00;;;03/11/2015 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;6.4;Y;6.4;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;6.4;Y;6.4;N;3.2;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100000;100000;590117;;;;;\n" + - "2015;Campagne EVHOE;;A;2;1;GOV 11.90/16.45;1;590117;23/02/2016 00:00:00;;;23/02/2016 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;200.0;Y;200.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;200.0;Y;200.0;N;100.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100001;100016;590117;;;;;\n" + - "2015;Campagne EVHOE;;A;3;1;GOV 11.90/16.45;1;590117;24/02/2016 00:00:00;;;24/02/2016 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;200.0;Y;200.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;200.0;Y;200.0;N;100.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100002;100029;590117;;;;;\n"; + "2015;Campagne EVHOE;;A;1;1;GOV 11.90/16.45;1;590117;03/11/2015 00:00:00;;;03/11/2015 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;6.4;Y;6.4;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;6.4;Y;6.4;N;3.2;Y;0.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100000;100000;590117;;;;;\n" + + "2015;Campagne EVHOE;;A;2;1;GOV 11.90/16.45;1;590117;23/02/2016 00:00:00;;;23/02/2016 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;200.0;Y;200.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;200.0;Y;200.0;N;100.0;Y;0.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100001;100016;590117;;;;;\n" + + "2015;Campagne EVHOE;;A;3;1;GOV 11.90/16.45;1;590117;24/02/2016 00:00:00;;;24/02/2016 00:00:00;;;00;NA;NA;NA;Y;N;-9;;;;200.0;Y;200.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;200.0;Y;200.0;N;100.0;Y;0.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-EVHOE;386;100002;100029;590117;;;;;\n"; public static final String CATCH_FILE_CONTENT = "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Lot_A_Confirmer;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Commentaire_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;Commentaire_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Commentaire [...] -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 441e78539ac85d20547d3aabe0ce7819242bd357 Merge: f5ccf41 dbdd317 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 25 17:48:51 2016 +0100 fixes #8022 Merge branch 'feature/8022' into develop .../tutti/service/genericformat/csv/OperationRow.java | 6 +++--- .../genericformat/GenericFormatExportServiceAno7992Test.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm