branch feature/6688 updated (984e593 -> f063f8d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from 984e593 use immutable list and not set + remove todo new c280091 fix log level to show batch tree new efbe375 delete no more used test (db associated was lost...) new 1b320da fix marine litter pb new 90d909e add engin_id + fix computed flag (they must be nullable) new 5642b0d fix tests + update test data new edacc60 reformat + imporve gear rank order import-export new 44f5de5 check engin + rank oder are in cruise new e55d5ea fix header name new bb4050a gear rank order can be null (if no gear) new f063f8d operation parameters were not saved The 10 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 f063f8d237e8e90d170a7ca053d2399e99384c4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 21:07:17 2015 +0100 operation parameters were not saved commit bb4050ab09b85442aa38e50dfc006020cc4d189b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:54:21 2015 +0100 gear rank order can be null (if no gear) commit e55d5eab3876c35d555d1317e8e46cc68a677a77 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:53:39 2015 +0100 fix header name commit 44f5de587d0c5378f514a85fcdb419bd81b6bfce Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:53:30 2015 +0100 check engin + rank oder are in cruise commit edacc6097dd598dd7e434b6234a42ae0bd9dd33e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:37:05 2015 +0100 reformat + imporve gear rank order import-export commit 5642b0da72cd9b741b784b31dab4b8815aebebd0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:36:06 2015 +0100 fix tests + update test data commit 90d909e5629265923f8c04e88187b90acce59b97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:35:49 2015 +0100 add engin_id + fix computed flag (they must be nullable) commit 1b320dae8f1ecf068c63af4b7cdcf338981f5fb8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:33:49 2015 +0100 fix marine litter pb commit efbe375821593fac1634e2f347a2432869069374 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:24:52 2015 +0100 delete no more used test (db associated was lost...) commit c280091730ebeb1cc2ae8731b1c9bcad36215ee6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 19:44:44 2015 +0100 fix log level to show batch tree Summary of changes: .../persistence/service/util/BatchTreeHelper.java | 4 +- .../GenericFormatImportOperationContext.java | 10 +- .../GenericformatImportPersitenceHelper.java | 29 ++- .../consumer/CsvConsumerForOperation.java | 29 ++- .../genericformat/csv/AccidentalCatchModel.java | 5 +- .../service/genericformat/csv/CatchModel.java | 3 +- .../tutti/service/genericformat/csv/CatchRow.java | 4 +- .../csv/IndividualObservationModel.java | 3 +- .../genericformat/csv/MarineLitterModel.java | 3 +- .../service/genericformat/csv/OperationModel.java | 7 +- .../service/genericformat/csv/OperationRow.java | 54 ++--- .../csv/RowWithCruiseContextSupport.java | 2 +- .../csv/RowWithOperationContextSupport.java | 15 ++ .../genericformat/csv/SampleCategoryRow.java | 2 +- .../service/genericformat/csv/SurveyModel.java | 2 +- .../GenericFormatExportService2Test.java | 240 --------------------- .../GenericFormatExportServiceTest.java | 30 +-- .../resources/genericFormat/empty/operation.csv | 6 +- .../src/main/filtered-resources/log4j.properties | 3 +- 19 files changed, 127 insertions(+), 324 deletions(-) delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService2Test.java -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit c280091730ebeb1cc2ae8731b1c9bcad36215ee6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 19:44:44 2015 +0100 fix log level to show batch tree --- .../fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java | 4 +--- tutti-ui-swing/src/main/filtered-resources/log4j.properties | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java index 8019173..a9e5beb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java @@ -623,9 +623,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { public void displayCatchBatch(CatchBatch result) { StringBuilder sb = new StringBuilder(); displayBatch(result, 0, sb); - if (log.isDebugEnabled()) { - log.debug(sb.toString()); - } + log.info(sb.toString()); } protected void displayBatch(Batch batch, int level, StringBuilder sb) { diff --git a/tutti-ui-swing/src/main/filtered-resources/log4j.properties b/tutti-ui-swing/src/main/filtered-resources/log4j.properties index 3792874..5420de6 100644 --- a/tutti-ui-swing/src/main/filtered-resources/log4j.properties +++ b/tutti-ui-swing/src/main/filtered-resources/log4j.properties @@ -31,7 +31,8 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n # tutti levels log4j.logger.fr.ifremer=INFO -#log4j.logger.fr.ifremer.tutti.persistence.service.util.BatchTreeHelper=DEBUG +# Keep this one to Info to show batch tree +log4j.logger.fr.ifremer.tutti.persistence.service.util.BatchTreeHelper=INFO log4j.logger.fr.ifremer.tutti.service.toconfirmreport=DEBUG #See https://forum.hibernate.org/viewtopic.php?p=2404391 -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit efbe375821593fac1634e2f347a2432869069374 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:24:52 2015 +0100 delete no more used test (db associated was lost...) --- .../GenericFormatExportService2Test.java | 240 --------------------- 1 file changed, 240 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService2Test.java deleted file mode 100644 index 275e40b..0000000 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService2Test.java +++ /dev/null @@ -1,240 +0,0 @@ -package fr.ifremer.tutti.service.genericformat; - -/* - * #%L - * Tutti :: Service - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.ProgressionModel; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.ServiceDbResource; -import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.catches.WeightComputingService; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.nuiton.jaxx.application.ApplicationBusinessException; - -import java.io.File; -import java.net.URL; -import java.util.List; - -/** - * Test export of catches. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.3.2 - */ -public class GenericFormatExportService2Test { - - @ClassRule - public static final ServiceDbResource dbResource = - ServiceDbResource.readDb("dbExport"); - - public static final String PROGRAM_ID = "CAM-TEST_ELEVATION"; - - public static final String CRUISE_ID = "100003"; - - public static final String OPERATION_1_ID = "100112"; - - public static final String OPERATION_2_ID = "100113"; - - public static final String OPERATION_3_ID = "100114"; - - protected GenericFormatExportService service; - - protected ServiceDbResource.DataContext dataContext; - - protected File dataDirectory; - - @Before - public void setUp() throws Exception { - - dataDirectory = dbResource.getConfig().getDataDirectory(); - - dbResource.setCountryInConfig("12"); - - dbResource.openDataContext(); - - TuttiServiceContext serviceContext = dbResource.getServiceContext(); - - service = serviceContext.getService(GenericFormatExportService.class); - - } - - @Test - public void exportWithErrors() throws Exception { - - - TuttiServiceContext serviceContext = dbResource.getServiceContext(); - - PersistenceService persistenceService = serviceContext.getService(PersistenceService.class); - - // check there is a error while compute weight for a cruise - boolean errorDetected = false; - WeightComputingService computingService = serviceContext.getService(WeightComputingService.class); - List<String> allFishingOperation = persistenceService.getAllFishingOperationIds(CRUISE_ID); - for (String fishingOperation : allFishingOperation) { - try { - computingService.getComputedSpeciesBatches(fishingOperation); - } catch (Exception e) { - errorDetected = true; - break; - } - } - - Assert.assertTrue(errorDetected); - - File exportFile = new File(dataDirectory, "exportCruise.zip"); - - Files.createParentDirs(exportFile); - - Assert.assertFalse(exportFile.exists()); - - ProgressionModel progressionModel = new ProgressionModel(); - progressionModel.setTotal(9); - try { - service.exportCruise(CRUISE_ID, exportFile, progressionModel); - // got an error after but export was still performed - Assert.fail(); - } catch (ApplicationBusinessException e) { - // got an error - Assert.assertTrue(true); - } - // export perform, file exist - Assert.assertTrue(exportFile.exists()); - - String urlPrefix = "jar:" + exportFile.toURI().toURL() + "!/exportCruise-" + CRUISE_ID + "/"; - { - // check species file content - - URL url = new URL(urlPrefix + "species.csv"); - ServiceDbResource.assertFileContent("species export:\n", - url, - "Id;Code_Rubin;Nom_Scientifique;Code_campagne\n" + - "380;ACANECH;Acanthocardia echinata;\n" + - "1358;ALOSALO;Alosa alosa;\n" + - "1938;AGONCAT;Agonus cataphractus;\n" + - "4622;ABIEABI;Abietinaria abietina;\n" + - "11183;;Brissopsis atlantica;"); - - } - - { - // check accidentalCatch file content - - URL url = new URL(urlPrefix + "accidentalCatch.csv"); - ServiceDbResource.assertFileContent("accidentalCatch export:\n", - url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); - - } - - { - // check operation file content - - URL url = new URL(urlPrefix + "operation.csv"); - ServiceDbResource.assertFileContent("operation export:\n", - url, - "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;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; [...] - "2013;test elevation;1;B;2;1;OTB 20/28.10;278970;01/07/2013 00:00:00;;;01/07/2013 00:00:00;;;00;NA;NA;NA;?;N;-9.0;;;Commentaire sur le trait B-2-1@@@@avec@@saut@@de @@ligne;1000.0;Y;280.0;Y;20.0;Y;700.0;N;-9.0;?;-9.0;?;200.0;Y;180.0;Y;180.0;Y;20.0;Y;0.0;Y;0.0;Y;100.0;Y;100.0;N;50.0;Y;0.0;Y;2.0;N;0.0;Y;100.0;N\n" + - "2013;test elevation;1;A;1;1;OTB 20/28.10;278970;01/07/2013 00:00:00;;;01/07/2013 00:00:00;;;00;NA;NA;NA;?;N;-9.0;;;commentaire trait A-1-1@@Avec @@saut@@de@@ligne@@...;1000.0;Y;180.0;Y;20.0;Y;800.0;N;-9.0;?;-9.0;?;200.0;Y;180.0;Y;180.0;Y;20.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y\n" + - "2013;test elevation;1;C;3;1;;278970;25/09/2013 00:00:00;;;25/09/2013 00:00:00;;;00;NA;NA;NA;?;N;-9.0;;;;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?"); - - } - - { - // check survey file content - - URL url = new URL(urlPrefix + "survey.csv"); - ServiceDbResource.assertFileContent("survey export:\n", - url, - "Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire\n" + - "2013;test elevation;1;278970;FRA;CGFS - Manche Est / Sud Mer du Nord;test elevation_2013_1;;01/07/2013 00:00:00;La Barbotière (Gujan-Mestras);04/07/2013 00:00:00;La Barbotière (Gujan-Mestras);Adrian LEVREL;Alain BISEAU;"); - - } - - { - // check individualObservation file content - - URL url = new URL(urlPrefix + "individualObservation.csv"); - ServiceDbResource.assertFileContent("individualObservation export:\n", - url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue"); - - } - - { - // check catch file content - - URL url = new URL("jar:" + exportFile.toURI().toURL() + "!/exportCruise-" + CRUISE_ID + "/catch.csv"); - ServiceDbResource.assertFileContent("Catch export:\n", - url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_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;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Mat [...] - "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;3.5\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;3.5\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;3.5\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-horsvrac 20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;7.0\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;7.0\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;5.4444447\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;5.4444447\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;5.4444447\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;5.4444447\n" + - "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-horsvrac-20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" + - "2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;0.0;1.0\n" + - "2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;Mâle;2;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;0.0;1.0\n" + - "2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;Femelle;3;;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;;1.0;1.0"); - - } - - { - // check gearCaracteristics file content - - URL url = new URL(urlPrefix + "gearCaracteristics.csv"); - ServiceDbResource.assertFileContent("gearCaracteristics export:\n", - url, - "Annee;Serie;Serie_Partielle;Engin;Code_PMFM;Libelle_PMFM;Valeur"); - - } - - { - // check marineLitter file content - - URL url = new URL(urlPrefix + "marineLitter.csv"); - ServiceDbResource.assertFileContent("marineLitter export:\n", - url, - "Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire\n" + - "2013;test elevation;1;OTB 20/28.10;B;2;1;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;10;;Trait B-2-1 Macro dechet L1 Plastique (nb 10)@@@@avec @@@@commentaire..."); - - } - { - // check parameter file content - - URL url = new URL(urlPrefix + "parameter.csv"); - ServiceDbResource.assertFileContent("parameter export:\n", - url, - "Annee;Serie;Serie_Partielle;Code_station;Id_Operation;Poche;Code_PMFM;Libelle_PMFM;Valeur"); - - } - } -} -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 1b320dae8f1ecf068c63af4b7cdcf338981f5fb8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:33:49 2015 +0100 fix marine litter pb --- .../service/genericformat/GenericformatImportPersitenceHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java index 5ba021e..584441c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java @@ -141,7 +141,11 @@ public class GenericformatImportPersitenceHelper { if (log.isInfoEnabled()) { log.info("Persist " + marineLitterBatches.size() + " marine litter(s) of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); } - persistenceService.createMarineLitterBatches(fishingOperationId, marineLitterBatches); + //FIXME Does not work (all batches are persisted, but the last one only displayed later in application) +// persistenceService.createMarineLitterBatches(fishingOperationId, marineLitterBatches); + for (MarineLitterBatch marineLitterBatch : marineLitterBatches) { + persistenceService.createMarineLitterBatch(marineLitterBatch); + } } -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 90d909e5629265923f8c04e88187b90acce59b97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:35:49 2015 +0100 add engin_id + fix computed flag (they must be nullable) --- .../consumer/CsvConsumerForOperation.java | 19 ++++---- .../service/genericformat/csv/OperationModel.java | 7 +-- .../service/genericformat/csv/OperationRow.java | 54 +++++++++++----------- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java index 28940e9..91512d7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java @@ -9,6 +9,7 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFac import fr.ifremer.tutti.service.genericformat.GenericFormatImportValidationHelper; import fr.ifremer.tutti.service.genericformat.csv.OperationModel; import fr.ifremer.tutti.service.genericformat.csv.OperationRow; +import org.apache.commons.lang3.BooleanUtils; import org.nuiton.csv.ImportRow; import org.nuiton.validator.NuitonValidatorResult; @@ -73,34 +74,34 @@ public class CsvConsumerForOperation extends CsvComsumer<OperationRow, Operation CatchBatch catchBatch = bean.getCatchBatch(); - if (bean.isCatchTotalWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getCatchTotalWeightComputed(), false)) { catchBatch.setCatchTotalWeight(null); } - if (bean.isCatchTotalRejectedWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getCatchTotalRejectedWeightComputed(), false)) { catchBatch.setCatchTotalRejectedWeight(null); } - if (bean.isSpeciesTotalSortedWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getSpeciesTotalSortedWeightComputed(), false)) { catchBatch.setSpeciesTotalSortedWeight(null); } - if (bean.isSpeciesTotalInertWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getSpeciesTotalInertWeightComputed(), false)) { catchBatch.setSpeciesTotalInertWeight(null); } - if (bean.isSpeciesTotalLivingNotItemizedWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getSpeciesTotalLivingNotItemizedWeightComputed(), false)) { catchBatch.setSpeciesTotalLivingNotItemizedWeight(null); } - if (bean.isBenthosTotalSortedWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getBenthosTotalSortedWeightComputed(), false)) { catchBatch.setBenthosTotalSortedWeight(null); } - if (bean.isBenthosTotalInertWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getBenthosTotalInertWeightComputed(), false)) { catchBatch.setBenthosTotalInertWeight(null); } - if (bean.isBenthosTotalLivingNotItemizedWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getBenthosTotalLivingNotItemizedWeightComputed(), false)) { catchBatch.setBenthosTotalLivingNotItemizedWeight(null); } - if (bean.isMarineLitterTotalWeightComputed()) { + if (BooleanUtils.toBooleanDefaultIfNull(bean.getMarineLitterTotalWeightComputed(), false)) { catchBatch.setMarineLitterTotalWeight(null); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java index 3c7d9a6..9ce2ab2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -74,7 +73,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", OperationRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_FORMATTER); newColumnForExport("DateDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.DAY_TIME_SECOND); @@ -153,6 +152,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newNullableColumnForExport("Poids_Total_Macro_Dechet_Calcule", OperationRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN); newColumnForExport("Serie_Id", Cruise.PROPERTY_PROGRAM, TuttiCsvUtil.PROGRAM_TECHNICAL_FORMATTER); + newColumnForExport("Engin_Id", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_TECHNICAL_FORMATTER); newColumnForExport("Navire_Id", FishingOperation.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_TECHNICAL_FORMATTER); newColumnForExport("Strate_Id", FishingOperation.PROPERTY_STRATA, TuttiCsvUtil.FISHING_OPERATION_STRATA_TECHNICAL_FORMATTER); newColumnForExport("Sous_Strate_Id", FishingOperation.PROPERTY_SUB_STRATA, TuttiCsvUtil.FISHING_OPERATION_SUB_STRATA_TECHNICAL_FORMATTER); @@ -172,7 +172,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newMandatoryColumn("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newMandatoryColumn("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newIgnoredColumn("Engin"); - newIgnoredColumn("Rang_Engin"); + newMandatoryColumn("Rang_Engin", OperationRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newIgnoredColumn("Navire"); newMandatoryColumn("DateDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.DAY_TIME_SECOND); @@ -250,6 +250,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newMandatoryColumn("Poids_Total_Macro_Dechet_Calcule", OperationRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.PRIMITIVE_BOOLEAN); newMandatoryColumn("Serie_Id", Cruise.PROPERTY_PROGRAM, parserFactory.getProgramParser()); + newMandatoryColumn("Engib_Id", FishingOperation.PROPERTY_GEAR, parserFactory.getGearParser()); newMandatoryColumn("Navire_Id", FishingOperation.PROPERTY_VESSEL, parserFactory.getVesselParser()); newMandatoryColumn("Strate_Id", FishingOperation.PROPERTY_STRATA, parserFactory.getFishingOperationStrataParser()); newMandatoryColumn("Sous_Strate_Id", FishingOperation.PROPERTY_SUB_STRATA, parserFactory.getFishingOperationSubStrataParser()); 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 b8da4c3..7e1c766 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 @@ -123,23 +123,23 @@ public class OperationRow extends RowWithOperationContextSupport { protected CatchBatch catchBatch; - protected boolean catchTotalWeightComputed; + protected Boolean catchTotalWeightComputed; - protected boolean catchTotalRejectedWeightComputed; + protected Boolean catchTotalRejectedWeightComputed; - protected boolean speciesTotalSortedWeightComputed; + protected Boolean speciesTotalSortedWeightComputed; - protected boolean speciesTotalInertWeightComputed; + protected Boolean speciesTotalInertWeightComputed; - protected boolean speciesTotalLivingNotItemizedWeightComputed; + protected Boolean speciesTotalLivingNotItemizedWeightComputed; - protected boolean benthosTotalSortedWeightComputed; + protected Boolean benthosTotalSortedWeightComputed; - protected boolean benthosTotalInertWeightComputed; + protected Boolean benthosTotalInertWeightComputed; - protected boolean benthosTotalLivingNotItemizedWeightComputed; + protected Boolean benthosTotalLivingNotItemizedWeightComputed; - protected boolean marineLitterTotalWeightComputed; + protected Boolean marineLitterTotalWeightComputed; public static OperationRow newEmptyInstance() { @@ -490,75 +490,75 @@ public class OperationRow extends RowWithOperationContextSupport { return true; } - public boolean isCatchTotalWeightComputed() { + public Boolean getCatchTotalWeightComputed() { return catchTotalWeightComputed; } - public boolean isCatchTotalRejectedWeightComputed() { + public Boolean getCatchTotalRejectedWeightComputed() { return catchTotalRejectedWeightComputed; } - public boolean isSpeciesTotalSortedWeightComputed() { + public Boolean getSpeciesTotalSortedWeightComputed() { return speciesTotalSortedWeightComputed; } - public boolean isSpeciesTotalInertWeightComputed() { + public Boolean getSpeciesTotalInertWeightComputed() { return speciesTotalInertWeightComputed; } - public boolean isSpeciesTotalLivingNotItemizedWeightComputed() { + public Boolean getSpeciesTotalLivingNotItemizedWeightComputed() { return speciesTotalLivingNotItemizedWeightComputed; } - public boolean isBenthosTotalSortedWeightComputed() { + public Boolean getBenthosTotalSortedWeightComputed() { return benthosTotalSortedWeightComputed; } - public boolean isBenthosTotalInertWeightComputed() { + public Boolean getBenthosTotalInertWeightComputed() { return benthosTotalInertWeightComputed; } - public boolean isBenthosTotalLivingNotItemizedWeightComputed() { + public Boolean getBenthosTotalLivingNotItemizedWeightComputed() { return benthosTotalLivingNotItemizedWeightComputed; } - public boolean isMarineLitterTotalWeightComputed() { + public Boolean getMarineLitterTotalWeightComputed() { return marineLitterTotalWeightComputed; } - public void setCatchTotalWeightComputed(boolean catchTotalWeightComputed) { + public void setCatchTotalWeightComputed(Boolean catchTotalWeightComputed) { this.catchTotalWeightComputed = catchTotalWeightComputed; } - public void setCatchTotalRejectedWeightComputed(boolean catchTotalRejectedWeightComputed) { + public void setCatchTotalRejectedWeightComputed(Boolean catchTotalRejectedWeightComputed) { this.catchTotalRejectedWeightComputed = catchTotalRejectedWeightComputed; } - public void setSpeciesTotalSortedWeightComputed(boolean speciesTotalSortedWeightComputed) { + public void setSpeciesTotalSortedWeightComputed(Boolean speciesTotalSortedWeightComputed) { this.speciesTotalSortedWeightComputed = speciesTotalSortedWeightComputed; } - public void setSpeciesTotalInertWeightComputed(boolean speciesTotalInertWeightComputed) { + public void setSpeciesTotalInertWeightComputed(Boolean speciesTotalInertWeightComputed) { this.speciesTotalInertWeightComputed = speciesTotalInertWeightComputed; } - public void setSpeciesTotalLivingNotItemizedWeightComputed(boolean speciesTotalLivingNotItemizedWeightComputed) { + public void setSpeciesTotalLivingNotItemizedWeightComputed(Boolean speciesTotalLivingNotItemizedWeightComputed) { this.speciesTotalLivingNotItemizedWeightComputed = speciesTotalLivingNotItemizedWeightComputed; } - public void setBenthosTotalSortedWeightComputed(boolean benthosTotalSortedWeightComputed) { + public void setBenthosTotalSortedWeightComputed(Boolean benthosTotalSortedWeightComputed) { this.benthosTotalSortedWeightComputed = benthosTotalSortedWeightComputed; } - public void setBenthosTotalInertWeightComputed(boolean benthosTotalInertWeightComputed) { + public void setBenthosTotalInertWeightComputed(Boolean benthosTotalInertWeightComputed) { this.benthosTotalInertWeightComputed = benthosTotalInertWeightComputed; } - public void setBenthosTotalLivingNotItemizedWeightComputed(boolean benthosTotalLivingNotItemizedWeightComputed) { + public void setBenthosTotalLivingNotItemizedWeightComputed(Boolean benthosTotalLivingNotItemizedWeightComputed) { this.benthosTotalLivingNotItemizedWeightComputed = benthosTotalLivingNotItemizedWeightComputed; } - public void setMarineLitterTotalWeightComputed(boolean marineLitterTotalWeightComputed) { + public void setMarineLitterTotalWeightComputed(Boolean marineLitterTotalWeightComputed) { this.marineLitterTotalWeightComputed = marineLitterTotalWeightComputed; } -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 5642b0da72cd9b741b784b31dab4b8815aebebd0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:36:06 2015 +0100 fix tests + update test data --- .../GenericFormatExportServiceTest.java | 30 +++++++++++----------- .../resources/genericFormat/empty/operation.csv | 6 ++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java index bf58be0..c82af3b 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java @@ -73,27 +73,27 @@ public class GenericFormatExportServiceTest { "2013;Campagne CGFS;;ScientificGear;1;287;Volet dépresseur (drague) - engin - totale - Déclaration d'un professionnel;Oui;CAM-CGFS;-2;401"; public static final String OPERATION_WITH_NO_CATCH_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;Po [...] - "2010;Campagne CGFS;;65;65;1;GOV 19.7/25.9;1;278970;13/10/2010 13:35:00;50.22833;0.31833;13/10/2010 14:05:00;50.22167;0.28333;30;Strate 4J;NA;Localité 4J2;N;Y;2512;;;avarie - chalut annulé completement à poil;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-CGFS;278970;57345;;57837;;"; + "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;Po [...] + "2010;Campagne CGFS;;65;65;1;GOV 19.7/25.9;1;278970;13/10/2010 13:35:00;50.22833;0.31833;13/10/2010 14:05:00;50.22167;0.28333;30;Strate 4J;NA;Localité 4J2;N;Y;2512;;;avarie - chalut annulé completement à poil;-9.0;?;-9.0;Y;-9.0;Y;-9.0;?;-9.0;N;-9.0;N;-9.0;Y;-9.0;?;-9.0;Y;-9.0;Y;-9.0;?;-9.0;?;-9.0;Y;-9.0;?;-9.0;Y;-9.0;Y;-9.0;?;-9.0;?;-9.0;?;CAM-CGFS;377;278970;57345;;57837;;"; public static final String OPERATION_WITH_NO_CATCH_CONTENT_AND_NO_GEAR = - "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;Po [...] - "2010;Campagne CGFS;;65;65;1;;;278970;13/10/2010 13:35:00;50.22833;0.31833;13/10/2010 14:05:00;50.22167;0.28333;30;Strate 4J;NA;Localité 4J2;N;Y;2512;;;avarie - chalut annulé completement à poil;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;-9.0;?;CAM-CGFS;278970;57345;;57837;;"; + "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;Po [...] + "2010;Campagne CGFS;;65;65;1;;0;278970;13/10/2010 13:35:00;50.22833;0.31833;13/10/2010 14:05:00;50.22167;0.28333;30;Strate 4J;NA;Localité 4J2;N;Y;2512;;;avarie - chalut annulé completement à poil;-9.0;?;-9.0;Y;-9.0;Y;-9.0;?;-9.0;N;-9.0;N;-9.0;Y;-9.0;?;-9.0;Y;-9.0;Y;-9.0;?;-9.0;?;-9.0;Y;-9.0;?;-9.0;Y;-9.0;Y;-9.0;?;-9.0;?;-9.0;?;CAM-CGFS;;278970;57345;;57837;;"; public static final String OPERATION_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;Po [...] - "2013;Campagne CGFS;;A;1;1;GOV 19.7/25.9;1;278970;01/05/2013 00:00:00;;;01/05/2013 00:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;-9;Vincent AURECHE;;op1;120.0;Y;100.0;Y;20.0;Y;0.0;Y;-9.0;?;-9.0;?;120.0;Y;100.0;Y;100.0;Y;20.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;6.0;Y;CAM-CGFS;278970;57308;;57776;1981;\n" + - "2013;Campagne CGFS;;A;2;1;GOV 19.7/25.9;1;278970;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;-9;Robert BELLAIL|Herve BARONE;;OP2;0.0;Y;0.0;Y;0.0;Y;0.0;Y;-9.0;?;-9.0;?;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;CAM-CGFS;278970;57308;;57776;30|62;"; + "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;Po [...] + "2013;Campagne CGFS;;A;1;1;GOV 19.7/25.9;1;278970;01/05/2013 00:00:00;;;01/05/2013 00:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;-9;Vincent AURECHE;;op1;120.0;Y;100.0;Y;20.0;Y;0.0;Y;-9.0;N;-9.0;N;120.0;Y;100.0;Y;100.0;Y;20.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;6.0;Y;CAM-CGFS;377;278970;57308;;57776;1981;\n" + + "2013;Campagne CGFS;;A;2;1;GOV 19.7/25.9;1;278970;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;-9;Robert BELLAIL|Herve BARONE;;OP2;0.0;Y;0.0;Y;0.0;Y;0.0;Y;-9.0;N;-9.0;N;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;0.0;Y;CAM-CGFS;377;278970;57308;;57776;30|62;"; public static final String PARAMETER_CONTENT = - "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_PMFM;Libelle_PMFM;Valeur;Serie_Id;Valeur_Id\n" + - "2013;Campagne CGFS;;A;1;1;1164;Catégorie UE - produit/lot - totale - Diffusion par une Halle à marée;Cat UE10;CAM-CGFS;1482\n" + - "2013;Campagne CGFS;;A;1;1;1302;(Gross Tonnage) : augmentation de tonnage accordée pour des raisons de sécurité - navire - totale - Déclaration d'un professionnel;10.0;CAM-CGFS;10.0\n" + - "2013;Campagne CGFS;;A;1;1;194;\"Etat de la mer - masse d'eau, eau brute - totale - Observation par un observateur\";\"2 - belle, vagues de 0.1 à 0.5 mètres\";CAM-CGFS;281\n" + - "2013;Campagne CGFS;;A;1;1;821;Direction vent - air - totale - Instrument de bord;0.1;CAM-CGFS;0.1\n" + - "2013;Campagne CGFS;;A;1;1;149;Coût de la glace - navire - totale - Déclaration d'un professionnel;10.0;CAM-CGFS;10.0\n" + - "2013;Campagne CGFS;;A;2;1;1062;Catégorie de fraicheur - produit/lot - totale - Diffusion par une Halle à marée;A - Catégorie A;CAM-CGFS;1421\n" + - "2013;Campagne CGFS;;A;2;1;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;CAM-CGFS;2.0"; + "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Code_PMFM;Libelle_PMFM;Valeur;Type;Serie_Id;Valeur_Id\n" + + "2013;Campagne CGFS;;A;1;1;1164;Catégorie UE - produit/lot - totale - Diffusion par une Halle à marée;Cat UE10;GEAR;CAM-CGFS;1482\n" + + "2013;Campagne CGFS;;A;1;1;1302;(Gross Tonnage) : augmentation de tonnage accordée pour des raisons de sécurité - navire - totale - Déclaration d'un professionnel;10.0;GEAR;CAM-CGFS;10.0\n" + + "2013;Campagne CGFS;;A;1;1;194;\"Etat de la mer - masse d'eau, eau brute - totale - Observation par un observateur\";\"2 - belle, vagues de 0.1 à 0.5 mètres\";VESSEL;CAM-CGFS;281\n" + + "2013;Campagne CGFS;;A;1;1;821;Direction vent - air - totale - Instrument de bord;0.1;VESSEL;CAM-CGFS;0.1\n" + + "2013;Campagne CGFS;;A;1;1;149;Coût de la glace - navire - totale - Déclaration d'un professionnel;10.0;VESSEL;CAM-CGFS;10.0\n" + + "2013;Campagne CGFS;;A;2;1;1062;Catégorie de fraicheur - produit/lot - totale - Diffusion par une Halle à marée;A - Catégorie A;GEAR;CAM-CGFS;1421\n" + + "2013;Campagne CGFS;;A;2;1;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;VESSEL;CAM-CGFS;2.0"; public static final String CATCH_CONTENT = "Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Code_Taxon;Code_Espece_Campagne;Nom_Scientifique;Benthos;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_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;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Matu [...] diff --git a/tutti-service/src/test/resources/genericFormat/empty/operation.csv b/tutti-service/src/test/resources/genericFormat/empty/operation.csv index b544c3a..dcba55b 100644 --- a/tutti-service/src/test/resources/genericFormat/empty/operation.csv +++ b/tutti-service/src/test/resources/genericFormat/empty/operation.csv @@ -1,3 +1,3 @@ -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;Poids_Total_Car [...] -2014;Campagne EVHOE;1;S0820;1;1;GOV 36/47;1;868095;19/10/2014 02:00:00;;;19/10/2014 02:00:00;;;00;Strate Gn3;NA;NA;Y;N;-9;;;;177.471;Y;177.471;Y;0.0;Y;0.0;Y;169.7;N;205.1;N;176.213;Y;176.213;Y;176.213;Y;0.0;Y;0.0;Y;0.0;Y;1.258;Y;1.258;Y;1.258;Y;0.0;Y;0.0;Y;0.0;Y;0.68;Y;CAM-EVHOE;868095;57623;;;; -2014;Campagne EVHOE;1;S0981;156;1;GOV 36/47;1;868095;30/11/2014 01:00:00;;;30/11/2014 01:00:00;;;00;Strate Cc4w;NA;NA;Y;N;-9;;;;138.512;Y;138.512;Y;0.0;Y;0.0;Y;160.7;N;141.2;N;138.157;Y;138.157;Y;138.157;Y;0.0;Y;0.0;Y;0.0;Y;0.355;Y;0.355;Y;0.355;Y;0.0;Y;0.0;Y;0.0;Y;0.174;Y;CAM-EVHOE;868095;63356;;;; +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;Poids_Total_Car [...] +2014;Campagne EVHOE;1;S0820;1;1;GOV 36/47;1;868095;19/10/2014 02:00:00;;;19/10/2014 02:00:00;;;00;Strate Gn3;NA;NA;Y;N;-9;;;;177.471;Y;177.471;Y;0.0;Y;0.0;Y;169.7;N;205.1;N;176.213;Y;176.213;Y;176.213;Y;0.0;Y;0.0;Y;0.0;Y;1.258;Y;1.258;Y;1.258;Y;0.0;Y;0.0;Y;0.0;Y;0.68;Y;CAM-EVHOE;379;868095;57623;;;; +2014;Campagne EVHOE;1;S0981;156;1;GOV 36/47;1;868095;30/11/2014 01:00:00;;;30/11/2014 01:00:00;;;00;Strate Cc4w;NA;NA;Y;N;-9;;;;138.512;Y;138.512;Y;0.0;Y;0.0;Y;160.7;N;141.2;N;138.157;Y;138.157;Y;138.157;Y;0.0;Y;0.0;Y;0.0;Y;0.355;Y;0.355;Y;0.355;Y;0.0;Y;0.0;Y;0.0;Y;0.174;Y;CAM-EVHOE;379;868095;63356;;;; -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit edacc6097dd598dd7e434b6234a42ae0bd9dd33e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:37:05 2015 +0100 reformat + imporve gear rank order import-export --- .../service/genericformat/csv/AccidentalCatchModel.java | 5 ++--- .../tutti/service/genericformat/csv/CatchModel.java | 3 +-- .../ifremer/tutti/service/genericformat/csv/CatchRow.java | 4 ++-- .../genericformat/csv/IndividualObservationModel.java | 3 +-- .../service/genericformat/csv/MarineLitterModel.java | 3 +-- .../genericformat/csv/RowWithCruiseContextSupport.java | 2 +- .../genericformat/csv/RowWithOperationContextSupport.java | 15 +++++++++++++++ .../service/genericformat/csv/SampleCategoryRow.java | 2 +- .../tutti/service/genericformat/csv/SurveyModel.java | 2 +- 9 files changed, 25 insertions(+), 14 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java index d2135b2..92c7a9e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -76,7 +75,7 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", AccidentalCatchRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Id_Lot", AccidentalCatchRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Code_Taxon", AccidentalBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); @@ -103,7 +102,7 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden newIgnoredColumn("Engin"); newIgnoredColumn("Rang_Engin"); - newMandatoryColumn("Id_Lot",AccidentalCatchRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); + newMandatoryColumn("Id_Lot", AccidentalCatchRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newMandatoryColumn("Code_Taxon", AccidentalBatch.PROPERTY_SPECIES, parserFactory.getSpeciesParser()); newIgnoredColumn("Nom_Scientifique"); newMandatoryColumn("Commentaire", AccidentalBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java index cb775a6..e68214f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java @@ -28,7 +28,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.CaracteristicValueParserFormatter; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; @@ -87,7 +86,7 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", CatchRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Code_Taxon", SpeciesBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); newColumnForExport("Code_Espece_Campagne", SpeciesBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_SURVEY_CODE_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java index 958566c..3b874c7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java @@ -242,8 +242,8 @@ public class CatchRow extends RowWithOperationContextSupport { public ExportSampleCategory getSampleCategory(SampleCategoryModelEntry sampleCategoryModelEntry) { int categoryOrder = sampleCategoryModelEntry.getOrder(); - if (sampleCategory.size()< categoryOrder) { - sampleCategory.add(categoryOrder , new ExportSampleCategory()); + if (sampleCategory.size() < categoryOrder) { + sampleCategory.add(categoryOrder, new ExportSampleCategory()); } return sampleCategory.get(categoryOrder); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java index 5a03a82..dfb75e5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -76,7 +75,7 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", IndividualObservationRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Id_Lot", IndividualObservationRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Code_Taxon", IndividualObservationBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java index 77a368a..09312bb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -76,7 +75,7 @@ public class MarineLitterModel extends AbstractTuttiImportExportModel<MarineLitt newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", MarineLitterRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Categorie", MarineLitterBatch.PROPERTY_MARINE_LITTER_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); newColumnForExport("Categorie_Taille", MarineLitterBatch.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java index f8f7995..9f56d45 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java @@ -54,5 +54,5 @@ public class RowWithCruiseContextSupport implements Serializable { public String getSurveyPart() { return cruise.getSurveyPart(); } - + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java index af51911..51caf23 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java @@ -15,8 +15,12 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport private static final long serialVersionUID = 1L; + public static final String PROPERTY_GEAR_RANK_ORDER = "gearRankOrder"; + private FishingOperation fishingOperation; + protected short gearRankOrder; + public void forImport() { super.forImport(); setFishingOperation(FishingOperations.newFishingOperation()); @@ -24,6 +28,9 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport public void setFishingOperation(FishingOperation fishingOperation) { this.fishingOperation = fishingOperation; + if (getGear() != null) { + setGearRankOrder(getGear().getRankOrder()); + } } public void setStationNumber(String stationNumber) { @@ -46,6 +53,10 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport fishingOperation.setGear(gear); } + public void setGearRankOrder(short gearRankOrder) { + this.gearRankOrder = gearRankOrder; + } + public FishingOperation getFishingOperation() { return fishingOperation; } @@ -70,4 +81,8 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport return fishingOperation.getMultirigAggregation(); } + public short getGearRankOrder() { + return gearRankOrder; + } + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java index 5b9e2ca..d7c347b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java @@ -45,7 +45,7 @@ public class SampleCategoryRow implements Serializable { public void setCaracteristic(Caracteristic caracteristic) { sampleCategoryModelEntry.setCaracteristic(caracteristic); - if (caracteristic!=null) { + if (caracteristic != null) { sampleCategoryModelEntry.setCategoryId(caracteristic.getIdAsInt()); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java index 6b05fb5..897433f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java @@ -55,7 +55,7 @@ public class SurveyModel extends AbstractTuttiImportExportModel<SurveyRow> { @Override public SurveyRow newEmptyInstance() { - SurveyRow row= SurveyRow.newEmptyInstance(); + SurveyRow row = SurveyRow.newEmptyInstance(); return row; } -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 44f5de587d0c5378f514a85fcdb419bd81b6bfce Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:53:30 2015 +0100 check engin + rank oder are in cruise --- .../genericformat/consumer/CsvConsumerForOperation.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java index 91512d7..0cbef2f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java @@ -3,6 +3,7 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.CsvComsumer; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -49,6 +50,15 @@ public class CsvConsumerForOperation extends CsvComsumer<OperationRow, Operation fishingOperation.setCruise(cruise); + Gear gear = bean.getGear(); + int rankOrder = bean.getGearRankOrder(); + + Gear cruiseGear = importContext.getGear(cruise, gear, rankOrder); + if (cruiseGear == null) { + addCheckError(row, new GearNotFoundInCruiseException(cruise, gear, rankOrder)); + } + bean.setGear(cruiseGear); + NuitonValidatorResult validatorResult = validationHelper.validateFishingOperation(fishingOperation); if (validatorResult.hasFatalMessages()) { -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit e55d5eab3876c35d555d1317e8e46cc68a677a77 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:53:39 2015 +0100 fix header name --- .../java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java index 9ce2ab2..1556ebd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java @@ -250,7 +250,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newMandatoryColumn("Poids_Total_Macro_Dechet_Calcule", OperationRow.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.PRIMITIVE_BOOLEAN); newMandatoryColumn("Serie_Id", Cruise.PROPERTY_PROGRAM, parserFactory.getProgramParser()); - newMandatoryColumn("Engib_Id", FishingOperation.PROPERTY_GEAR, parserFactory.getGearParser()); + newMandatoryColumn("Engin_Id", FishingOperation.PROPERTY_GEAR, parserFactory.getGearParser()); newMandatoryColumn("Navire_Id", FishingOperation.PROPERTY_VESSEL, parserFactory.getVesselParser()); newMandatoryColumn("Strate_Id", FishingOperation.PROPERTY_STRATA, parserFactory.getFishingOperationStrataParser()); newMandatoryColumn("Sous_Strate_Id", FishingOperation.PROPERTY_SUB_STRATA, parserFactory.getFishingOperationSubStrataParser()); -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit bb4050ab09b85442aa38e50dfc006020cc4d189b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:54:21 2015 +0100 gear rank order can be null (if no gear) --- .../service/genericformat/csv/RowWithOperationContextSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java index 51caf23..00de902 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java @@ -19,7 +19,7 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport private FishingOperation fishingOperation; - protected short gearRankOrder; + protected Short gearRankOrder; public void forImport() { super.forImport(); @@ -53,7 +53,7 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport fishingOperation.setGear(gear); } - public void setGearRankOrder(short gearRankOrder) { + public void setGearRankOrder(Short gearRankOrder) { this.gearRankOrder = gearRankOrder; } @@ -81,7 +81,7 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport return fishingOperation.getMultirigAggregation(); } - public short getGearRankOrder() { + public Short getGearRankOrder() { return gearRankOrder; } -- 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 feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit f063f8d237e8e90d170a7ca053d2399e99384c4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 21:07:17 2015 +0100 operation parameters were not saved --- .../GenericFormatImportOperationContext.java | 10 +++++----- .../GenericformatImportPersitenceHelper.java | 23 +++++++++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java index bce9d5b..9999ca6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java @@ -67,12 +67,12 @@ public class GenericFormatImportOperationContext { return fishingOperationLabel; } - public boolean withParameters() { - - boolean withGearFeatures = MapUtils.isNotEmpty(gearUseFeatures); - boolean withVesselFeatures = MapUtils.isNotEmpty(vesselUseFeatures); - return withGearFeatures || withVesselFeatures; + public boolean withGearFeatures() { + return MapUtils.isNotEmpty(gearUseFeatures); + } + public boolean withVesselFeatures() { + return MapUtils.isNotEmpty(vesselUseFeatures); } public boolean withMarineLitterBatches() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java index 584441c..f1f8851 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java @@ -107,7 +107,7 @@ public class GenericformatImportPersitenceHelper { Iterable<GenericFormatImportOperationContext> fishingOperationContexts = importContext.getImportedFishingOperationContexts(new Predicate<GenericFormatImportOperationContext>() { @Override public boolean apply(GenericFormatImportOperationContext input) { - return input.withParameters(); + return input.withGearFeatures() || input.withVesselFeatures(); } }); @@ -115,9 +115,26 @@ public class GenericformatImportPersitenceHelper { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - if (log.isInfoEnabled()) { - log.info("Persist parameters of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); + if (fishingOperationContext.withGearFeatures()) { + + CaracteristicMap gearUseFeatures = fishingOperationContext.getGearUseFeatures(); + fishingOperation.setGearUseFeatures(gearUseFeatures); + if (log.isInfoEnabled()) { + log.info("Persist " + gearUseFeatures.size() + " gear use features of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); + } + + } + + if (fishingOperationContext.withVesselFeatures()) { + + CaracteristicMap vesselUseFeatures = fishingOperationContext.getVesselUseFeatures(); + fishingOperation.setVesselUseFeatures(vesselUseFeatures); + if (log.isInfoEnabled()) { + log.info("Persist " + vesselUseFeatures.size() + " vessel use features of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); + } + } + persistenceService.saveFishingOperation(fishingOperation); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm