[Tutti-commits] r1093 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export

10 Jun 2013

Author: tchemit
Date: 2013-06-10 17:04:25 +0200 (Mon, 10 Jun 2013)
New Revision: 1093

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1093

Log:
refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv

Modified:
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java
   trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java
===================================================================

--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java	2013-06-10 14:45:01 UTC (rev 1092)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java	2013-06-10 15:04:25 UTC (rev 1093)
@@ -76,7 +76,7 @@
             switch (sampleCategoryEnum) {
 
                 case sortedUnsorted:
-                    addSampleCategory("VracHorVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY);
+                    addSampleCategory("VracHorsVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY);
                     break;
                 case size:
                     addSampleCategory("Cat_Tri", CatchExportRow.SIZE_SAMPLE_CATEGORY);
@@ -101,7 +101,7 @@
         newNullableColumnForExport("Poids_Classe_Taille", CatchExportRow.FREQUENCY_WEIGHT, TuttiCsvUtil.FLOAT);
         newNullableColumnForExport("Unite_Taille", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_UNIT);
         newNullableColumnForExport("Precision_Mesure", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_PRECISION, TuttiCsvUtil.FLOAT);
-        newNullableColumnForExport("Nbr", CatchExportRow.FREQUENCY_NUMBER, TuttiCsvUtil.INTEGER);
+        newNullableColumnForExport("Nbr", CatchExportRow.BATCH_NUMBER, TuttiCsvUtil.INTEGER);
 
         newColumnForExport("Poids_Reference", CatchExportRow.REFERENCE_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT);
         newColumnForExport("Coef_Final_Elevation", CatchExportRow.RAISING_FACTOR, TuttiCsvUtil.PRIMITIVE_FLOAT);
@@ -168,7 +168,7 @@
                      speciesBatch.getSampleCategoryComputedWeight(),
                      speciesBatch.getWeight(),
                      speciesBatch.getNumber(),
-                     speciesBatch.getComputedNumber(),
+//                     speciesBatch.getComputedNumber(),
                      speciesBatch.getRankOrder());
 
         if (speciesBatch.isChildBatchsEmpty()) {
@@ -259,7 +259,7 @@
                      speciesBatch.getSampleCategoryComputedWeight(),
                      speciesBatch.getWeight(),
                      speciesBatch.getNumber(),
-                     speciesBatch.getComputedNumber(),
+//                     speciesBatch.getComputedNumber(),
                      speciesBatch.getRankOrder());
 
         CatchExportRow row = currentRow.copy();
@@ -281,7 +281,7 @@
                      benthosBatch.getSampleCategoryComputedWeight(),
                      benthosBatch.getWeight(),
                      benthosBatch.getNumber(),
-                     benthosBatch.getComputedNumber(),
+//                     benthosBatch.getComputedNumber(),
                      benthosBatch.getRankOrder());
 
         if (benthosBatch.isChildBatchsEmpty()) {
@@ -372,7 +372,7 @@
                      benthosBatch.getSampleCategoryComputedWeight(),
                      benthosBatch.getWeight(),
                      benthosBatch.getNumber(),
-                     benthosBatch.getComputedNumber(),
+//                     benthosBatch.getComputedNumber(),
                      benthosBatch.getRankOrder());
 
         CatchExportRow row = currentRow.copy();
@@ -396,9 +396,11 @@
                                 Float sampleCategoryComputedWeight,
                                 Float batchWeight,
                                 Integer batchNumber,
-                                Integer batchComputedNumber,
+//                                Integer batchComputedNumber,
                                 Integer batchRankOrder
     ) {
+        currentRow.setBatchNumber(batchNumber);
+
         ExportSampleCategory<Serializable> sampleCategory =
                 new ExportSampleCategory<Serializable>();
         Caracteristic caracteristic = sampleCategoryToCaracteristics.get(sampleCategoryType);
@@ -409,8 +411,7 @@
         sampleCategory.setSampleWeight(batchWeight);
 
         sampleCategory.setComputedWeight(sampleCategoryComputedWeight);
-        sampleCategory.setNumber(batchNumber);
-        sampleCategory.setComputedNumber(batchComputedNumber);
+//        sampleCategory.setComputedNumber(batchComputedNumber);
         sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE);
         sampleCategory.setRankOrder(batchRankOrder);
 

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java	2013-06-10 14:45:01 UTC (rev 1092)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java	2013-06-10 15:04:25 UTC (rev 1093)
@@ -24,6 +24,7 @@
  * #L%
  */
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency;
 import fr.ifremer.tutti.persistence.entities.data.Cruise;
@@ -73,6 +74,8 @@
 
     public static final String RAISING_FACTOR = "raisingFactor";
 
+    public static final String BATCH_NUMBER = "batchNumber";
+
     protected Cruise cruise;
 
     protected FishingOperation fishingOperation;
@@ -88,8 +91,11 @@
     protected Species species;
 
     protected float referenceWeight;
+
     protected float raisingFactor;
 
+    protected Integer batchNumber;
+
     public void setCruise(Cruise cruise) {
         this.cruise = cruise;
     }
@@ -110,16 +116,24 @@
         this.raisingFactor = raisingFactor;
     }
 
+    public void setBatchNumber(Integer batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
     public void addCategory(ExportSampleCategory sampleCategory) {
         categories.put(sampleCategory.getCategoryType(), sampleCategory);
     }
 
     public void setSpeciesFrequency(SpeciesBatchFrequency speciesFrequency) {
+        Preconditions.checkNotNull(speciesFrequency);
         this.speciesFrequency = speciesFrequency;
+        this.batchNumber = speciesFrequency.getNumber();
     }
 
     public void setBenthosFrequency(BenthosBatchFrequency benthosFrequency) {
+        Preconditions.checkNotNull(benthosFrequency);
         this.benthosFrequency = benthosFrequency;
+        this.batchNumber = benthosFrequency.getNumber();
     }
 
     public Date getBeginDate() {
@@ -198,17 +212,26 @@
         return raisingFactor;
     }
 
+    public Integer getBatchNumber() {
+        return batchNumber;
+    }
+
     public CatchExportRow copy() {
         CatchExportRow result = new CatchExportRow();
         result.setCruise(cruise);
         result.setFishingOperation(fishingOperation);
         result.setSpeciesCategory(speciesCategory);
         result.categories.putAll(categories);
-        result.setBenthosFrequency(benthosFrequency);
-        result.setSpeciesFrequency(speciesFrequency);
+        if (benthosFrequency != null) {
+            result.setBenthosFrequency(benthosFrequency);
+        }
+        if (speciesFrequency != null) {
+            result.setSpeciesFrequency(speciesFrequency);
+        }
         result.setSpecies(species);
         result.setRaisingFactor(raisingFactor);
         result.setReferenceWeight(referenceWeight);
+        result.setBatchNumber(batchNumber);
         return result;
     }
 }
\ No newline at end of file

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java	2013-06-10 14:45:01 UTC (rev 1092)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java	2013-06-10 15:04:25 UTC (rev 1093)
@@ -58,10 +58,10 @@
 
     public static final String PROPERTY_SAMPLE_WEIGHT = "sampleWeight";
 
-    private Integer number;
+//    private Integer number;
+//
+//    private Integer computedNumber;
 
-    private Integer computedNumber;
-
     private Integer rankOrder;
 
     private String weightOrVolType;
@@ -70,22 +70,22 @@
 
     private Caracteristic categoryCaracteristic;
 
-    public Integer getNumber() {
-        return number;
-    }
+//    public Integer getNumber() {
+//        return number;
+//    }
+//
+//    public void setNumber(Integer number) {
+//        this.number = number;
+//    }
+//
+//    public Integer getComputedNumber() {
+//        return computedNumber;
+//    }
+//
+//    public void setComputedNumber(Integer computedNumber) {
+//        this.computedNumber = computedNumber;
+//    }
 
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public Integer getComputedNumber() {
-        return computedNumber;
-    }
-
-    public void setComputedNumber(Integer computedNumber) {
-        this.computedNumber = computedNumber;
-    }
-
     public String getWeightOrVolType() {
         return weightOrVolType;
     }

Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java	2013-06-10 14:45:01 UTC (rev 1092)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java	2013-06-10 15:04:25 UTC (rev 1093)
@@ -95,7 +95,7 @@
             "2013;Campagne CGFS;;A;2;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;";
 
     public static final String CATCH_CONTENT =
-            "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;Vrac;Num_Ordre_Vrac_H2;Tot_Vrac;Ech_Vrac;Type_Volume_Poids_Vrac;Unite_Volume_Poids_Vrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" +
+            "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;VracHorsVrac;Num_Ordre_VracHorsVrac_H2;Tot_VracHorsVrac;Ech_VracHorsVrac;Type_Volume_Poids_VracHorsVrac;Unite_Volume_Poids_VracHorsVrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" +
             "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.0;1;;cm;0.5;5;5.0;500.0;\n" +
             "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.5;2;;cm;0.5;2;5.0;500.0;\n" +
             "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;11.0;3;;cm;0.5;1;5.0;500.0;\n" +
@@ -104,7 +104,7 @@
             "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;11.0;2;;cm;;6;30.0;3000.0;\n" +
             "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;12.0;3;;cm;;7;30.0;3000.0;\n" +
             "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;M - Moyen;2;20.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;;;;;;;;20.0;2000.0;\n" +
-            "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;;20.0;1.0;";
+            "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;";
 
     public static final String MARINE_LITTER_CONTENT =
             "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment;TotalWeight\n" +

    

[Tutti-commits] r1093 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export

tchemit＠users.forge.codelutin.com