This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 23fc0c1dd67075797d0d7f242cf53e74a2ebf486 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>.