Tutti-commits
Threads by month
- ----- 2026 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- 4058 discussions
Author: maven-release
Date: 2013-06-13 12:16:16 +0200 (Thu, 13 Jun 2013)
New Revision: 1108
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1108
Log:
[maven-release-plugin] copy for tag tutti-2.3.1
Added:
tags/tutti-2.3.1/
1
0
r1107 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com June 13, 2013
by maven-release＠users.forge.codelutin.com June 13, 2013
June 13, 2013
Author: maven-release
Date: 2013-06-13 12:16:08 +0200 (Thu, 13 Jun 2013)
New Revision: 1107
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1107
Log:
[maven-release-plugin] prepare release tutti-2.3.1
Modified:
trunk/pom.xml
trunk/tutti-persistence/pom.xml
trunk/tutti-service/pom.xml
trunk/tutti-ui-swing/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-06-13 10:11:50 UTC (rev 1106)
+++ trunk/pom.xml 2013-06-13 10:16:08 UTC (rev 1107)
@@ -32,7 +32,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
<packaging>pom</packaging>
<name>Tutti</name>
@@ -86,12 +86,12 @@
</modules>
<scm>
- <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url>
+ <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1</url>
<connection>
- scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk
+ scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1
</connection>
<developerConnection>
- scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk
+ scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.3.1
</developerConnection>
</scm>
<distributionManagement>
Modified: trunk/tutti-persistence/pom.xml
===================================================================
--- trunk/tutti-persistence/pom.xml 2013-06-13 10:11:50 UTC (rev 1106)
+++ trunk/tutti-persistence/pom.xml 2013-06-13 10:16:08 UTC (rev 1107)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: trunk/tutti-service/pom.xml
===================================================================
--- trunk/tutti-service/pom.xml 2013-06-13 10:11:50 UTC (rev 1106)
+++ trunk/tutti-service/pom.xml 2013-06-13 10:16:08 UTC (rev 1107)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: trunk/tutti-ui-swing/pom.xml
===================================================================
--- trunk/tutti-ui-swing/pom.xml 2013-06-13 10:11:50 UTC (rev 1106)
+++ trunk/tutti-ui-swing/pom.xml 2013-06-13 10:16:08 UTC (rev 1107)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
1
0
r1106 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 13, 2013
by tchemit＠users.forge.codelutin.com June 13, 2013
June 13, 2013
Author: tchemit
Date: 2013-06-13 12:11:50 +0200 (Thu, 13 Jun 2013)
New Revision: 1106
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1106
Log:
fixes #2690: [EXPORT GENERIQUE] je ne suis pas certain que l'export g?\195?\169n?\195?\169rique contienne toute la donn?\195?\169e brute
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.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/TuttiCsvUtil.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-06-13 09:17:55 UTC (rev 1105)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-06-13 10:11:50 UTC (rev 1106)
@@ -32,6 +32,7 @@
import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue;
import fr.ifremer.tutti.persistence.entities.referential.Gear;
import fr.ifremer.tutti.persistence.entities.referential.Person;
+import fr.ifremer.tutti.persistence.entities.referential.Vessel;
import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.beanutils.NestedNullException;
import org.apache.commons.beanutils.PropertyUtils;
@@ -179,6 +180,22 @@
}
}
+ public static class VesselFormatter implements ValueFormatter<Vessel> {
+
+
+ @Override
+ public String format(Vessel value) {
+ String result = "";
+ if (value != null) {
+ result = value.getRegistrationCode();
+ if (result == null) {
+ result = value.getInternationalRegistrationCode();
+ }
+ }
+ return result;
+ }
+ }
+
/**
* @param <E>
* @author tchemit <chemit(a)codelutin.com>
@@ -305,6 +322,9 @@
public static final ValueFormatter<Serializable> CARACTERISTIC_VALUE_FORMATTER =
new CaracteristicValueFormatter();
+ public static final ValueFormatter<Vessel> VESSEL_VALUE_FORMATTER =
+ new VesselFormatter();
+
public static final ValueFormatter<List<Person>> LIST_PERSON_FORMATTER =
new ListPersonValueFormatter();
@@ -436,7 +456,7 @@
Lists.transform(value, new Function<Gear, String>() {
@Override
public String apply(Gear input) {
- return input.getLabel() + ' ' + input.getName();
+ return input.getName();
}
});
return Joiner.on('|').join(decoratedValues);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-13 09:17:55 UTC (rev 1105)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportModel.java 2013-06-13 10:11:50 UTC (rev 1106)
@@ -31,7 +31,6 @@
import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
import fr.ifremer.tutti.persistence.entities.referential.Gear;
import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation;
-import fr.ifremer.tutti.persistence.entities.referential.Vessel;
import fr.ifremer.tutti.service.TuttiCsvUtil;
import java.util.List;
@@ -67,7 +66,7 @@
newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION);
newColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, Gear.PROPERTY_NAME);
- newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, Vessel.PROPERTY_NAME);
+ newColumnForExport("Navire", FishingOperation.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER);
newColumnForExport("DateDeb_Op", FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.DAY_TIME_SECOND);
newColumnForExport("LatDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, TuttiCsvUtil.FLOAT);
newColumnForExport("LongDeb", FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, TuttiCsvUtil.FLOAT);
@@ -99,6 +98,12 @@
newNullableColumnForExport("Poids_Total_Non_Trie", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, TuttiCsvUtil.FLOAT);
newNullableColumnForExport("Poids_Total_Non_Trie_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN);
+ newNullableColumnForExport("Poids_Total_Tremis", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT, TuttiCsvUtil.FLOAT);
+ newNullableColumnForExport("Poids_Total_Tremis_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN);
+
+ newNullableColumnForExport("Poids_Total_Carroussel", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT, TuttiCsvUtil.FLOAT);
+ newNullableColumnForExport("Poids_Total_Carroussel_Calcule", OperationExportRow.PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN);
+
newNullableColumnForExport("Poids_Total_Espece", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT, TuttiCsvUtil.FLOAT);
newNullableColumnForExport("Poids_Total_Espece_Calcule", OperationExportRow.PROPERTY_SPECIES_TOTAL_WEIGHT_COMPUTED, TuttiCsvUtil.BOOLEAN);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-13 09:17:55 UTC (rev 1105)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-13 10:11:50 UTC (rev 1106)
@@ -376,7 +376,8 @@
public Float getSpeciesTotalSampleSortedWeight() {
return TuttiExportService.getValueOrComputedValue(
- null, catchBatch.getSpeciesTotalSampleSortedComputedWeight());
+ catchBatch.getSpeciesTotalSampleSortedComputedWeight(),
+ catchBatch.getSpeciesTotalSampleSortedComputedWeight());
}
public Boolean getSpeciesTotalSampleSortedWeightComputed() {
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java 2013-06-13 09:17:55 UTC (rev 1105)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SurveyExportModel.java 2013-06-13 10:11:50 UTC (rev 1106)
@@ -27,7 +27,6 @@
import fr.ifremer.tutti.persistence.entities.data.Cruise;
import fr.ifremer.tutti.persistence.entities.data.Program;
import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation;
-import fr.ifremer.tutti.persistence.entities.referential.Vessel;
import fr.ifremer.tutti.service.TuttiCsvUtil;
import java.util.List;
@@ -46,7 +45,7 @@
newColumnForExport("Annee", Cruise.PROPERTY_BEGIN_DATE, TuttiCsvUtil.YEAR);
newColumnForExport("Serie", Cruise.PROPERTY_PROGRAM, Program.PROPERTY_NAME);
newColumnForExport("Serie_Partielle", Cruise.PROPERTY_SURVEY_PART);
- newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY_NAME);
+ newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_VALUE_FORMATTER);
newColumnForExport("Pays", SurveyExportRow.PROPERTY_COUNTRY);
newColumnForExport("Zone_Etude", Program.PROPERTY_ZONE, TuttiLocation.PROPERTY_NAME);
newColumnForExport("Id_Sismer", Cruise.PROPERTY_NAME);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-13 09:17:55 UTC (rev 1105)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-13 10:11:50 UTC (rev 1106)
@@ -126,7 +126,7 @@
result = computedValue == null ? null : true;
} else {
- result = true;
+ result = false;
}
return result;
}
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-13 09:17:55 UTC (rev 1105)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-13 10:11:50 UTC (rev 1106)
@@ -79,15 +79,16 @@
public static final String SURVEY_CONTENT =
"Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Nombre_de_poche;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Engin;Chef_Mission;Resp_Salle_Tri;Commentaire\n" +
- "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;1;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;GOV1925 GOV 19.7/25.9;Vincent AURECHE;;;";
+ "2013;Campagne CGFS;;278970;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;1;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;GOV 19.7/25.9;Vincent AURECHE;;;";
- public static final String OPERATION_WITH_NO_CATCH_CONTENT = "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;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_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" +
- "2010;Campagne CGFS;;65;65;1;GOV 19.7/25.9;GWEN DREZ;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.0;NA;NA;NA;;avarie - chalut annulé completement à poil;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;";
+ public static final String OPERATION_WITH_NO_CATCH_CONTENT =
+ "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;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_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" +
+ "2010;Campagne CGFS;;65;65;1;GOV 19.7/25.9;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.0;NA;NA;NA;;avarie - chalut annulé completement à poil;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;;?;";
public static final String OPERATION_CONTENT =
- "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;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_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" +
- "2013;Campagne CGFS;;A;1;1;GOV 19.7/25.9;GWEN DREZ;01/05/2013 00:00:00;;;01/05/2013 00:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Vincent AURECHE;op1;120.0;Y;100.0;Y;20.0;Y;0.0;Y;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;\n" +
- "2013;Campagne CGFS;;A;2;1;GOV 19.7/25.9;GWEN DREZ;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Robert BELLAIL|Herve BARONE;OP2;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;0.0;Y;0.0;Y;0.0;Y;0.0;Y;";
+ "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;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_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule\n" +
+ "2013;Campagne CGFS;;A;1;1;GOV 19.7/25.9;278970;01/05/2013 00:00:00;;;01/05/2013 00:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Vincent AURECHE;op1;120.0;Y;100.0;Y;20.0;Y;0.0;Y;;?;;?;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;\n" +
+ "2013;Campagne CGFS;;A;2;1;GOV 19.7/25.9;278970;11/05/2013 08:00:00;;;11/05/2013 08:23:00;;;23;Strate 1D;NA;Localité 1D2;?;N;;NA;NA;NA;Robert BELLAIL|Herve BARONE;OP2;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;0.0;Y;0.0;Y;0.0;Y;0.0;Y;";
public static final String PARAMETER_CONTENT =
"Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Poche;Code_PMFM;Libelle_PMFm;Valeur\n" +
1
0
r1105 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/test/java/fr/ifremer/tutti/service tutti-service/src/test/java/fr/ifremer/tutti/service/export tutti-service/src/test/resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home
by tchemit＠users.forge.codelutin.com June 13, 2013
by tchemit＠users.forge.codelutin.com June 13, 2013
June 13, 2013
Author: tchemit
Date: 2013-06-13 11:17:55 +0200 (Thu, 13 Jun 2013)
New Revision: 1105
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1105
Log:
fixes #2692: [EXPORT GENERIQUE] table species.csv colonne Code campagne vide
Added:
trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -1,5 +1,29 @@
package fr.ifremer.tutti.service.catches.multipost;
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 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 java.util.Date;
/**
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -1,5 +1,29 @@
package fr.ifremer.tutti.service.catches.multipost;
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.service.TuttiCsvUtil;
/**
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -1,5 +1,29 @@
package fr.ifremer.tutti.service.catches.multipost;
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 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 java.util.Date;
/**
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -1,5 +1,29 @@
package fr.ifremer.tutti.service.catches.multipost;
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.service.TuttiCsvUtil;
/**
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -194,9 +194,6 @@
log.debug("Will export program: " + programId);
}
List<Cruise> allCruise = persistenceService.getAllCruise(programId);
-// for (Cruise cruise : allCruise) {
-// checkCruise(progressionModel, cruise);
-// }
File basedir = new File(context.getConfig().newTempFile(
"exportProgram"), "exportProgram-" + programId);
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -26,10 +26,13 @@
import fr.ifremer.tutti.persistence.RessourceClassLoader;
import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigOption;
+import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
import fr.ifremer.tutti.persistence.test.DatabaseResource;
import fr.ifremer.tutti.service.config.TuttiServiceConfig;
import fr.ifremer.tutti.service.config.TuttiServiceConfigOption;
+import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService;
import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
import org.junit.runner.Description;
import org.nuiton.i18n.I18n;
import org.nuiton.util.config.ApplicationConfig;
@@ -113,6 +116,16 @@
return serviceConfig;
}
+ public TuttiProtocol loadProtocol(File protocolFile) {
+ Assert.assertTrue(protocolFile.exists());
+
+ TuttiProtocolImportExportService tuttiProtocolImportExportService =
+ getServiceContext().getService(TuttiProtocolImportExportService.class);
+
+ TuttiProtocol protocol = tuttiProtocolImportExportService.importProtocol(protocolFile);
+ return protocol;
+ }
+
@Override
protected void before(Description description) throws Throwable {
super.before(description);
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-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -33,6 +33,7 @@
import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch;
import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch;
import fr.ifremer.tutti.persistence.entities.data.Program;
+import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
import fr.ifremer.tutti.persistence.entities.referential.Species;
import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation;
import fr.ifremer.tutti.service.PersistenceService;
@@ -110,6 +111,38 @@
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;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;A;1;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;";
+ public static final String CATCH_CONTENT_2 =
+ "Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;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" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;365;Vrac;1;0.005;0.005;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.005;2.5E-5;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;491;Vrac;2;0.004;0.004;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.004;1.6000002E-5;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;300;Vrac;3;0.015;0.015;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.015;2.2499998E-4;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1811;Vrac;4;0.07;0.07;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;1;0.07;0.0049;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1644;Vrac;5;1.06;1.06;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;36.0;1;;cm;1.0;1;1.06;1.1235999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1644;Vrac;5;1.06;1.06;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;38.0;2;;cm;1.0;1;1.06;1.1235999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1362;Vrac;6;0.038;0.038;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;10.5;1;;cm;0.5;2;0.038;0.0014439999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1362;Vrac;6;0.038;0.038;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;12.5;2;;cm;0.5;1;0.038;0.0014439999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1362;Vrac;6;0.038;0.038;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;13.0;3;;cm;0.5;1;0.038;0.0014439999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1986;Vrac;7;0.66;0.66;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;25.0;1;;cm;1.0;1;0.66;0.4356;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1986;Vrac;7;0.66;0.66;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;28.0;2;;cm;1.0;1;0.66;0.4356;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1986;Vrac;7;0.66;0.66;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;30.0;3;;cm;1.0;1;0.66;0.4356;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;489;Vrac;8;0.28;0.28;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;302;9.0;1;;cm;1.0;1;0.28;0.0784;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;489;Vrac;8;0.28;0.28;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;302;10.0;2;;cm;1.0;3;0.28;0.0784;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;489;Vrac;8;0.28;0.28;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;302;11.0;3;;cm;1.0;2;0.28;0.0784;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1988;Vrac;9;0.152;0.152;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;15.0;1;;cm;1.0;1;0.152;0.023103999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1988;Vrac;9;0.152;0.152;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;18.0;2;;cm;1.0;1;0.152;0.023103999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1690;Vrac;10;0.036;0.036;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;11.0;1;;cm;1.0;1;0.036;0.0012959999;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1978;Vrac;11;0.852;0.852;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;26.0;1;;cm;1.0;1;0.852;0.725904;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1978;Vrac;11;0.852;0.852;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;30.0;2;;cm;1.0;1;0.852;0.725904;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1351;Vrac;12;0.022;0.022;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;307;10.5;1;;cm;0.5;1;0.022;4.8400002E-4;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1772;Vrac;13;0.18;0.18;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;306;27.0;1;;cm;1.0;1;0.18;0.0324;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1242;Vrac;14;;;Poids;;NA;;;;;;Femelle;1;1.0;1.0;Poids;;NA;;;;;;NA;;;;;;306;51.0;1;;cm;1.0;1;1.0;1.0;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1242;Vrac;14;;;Poids;;NA;;;;;;Femelle;1;1.0;1.0;Poids;;NA;;;;;;NA;;;;;;306;55.0;2;;cm;1.0;1;1.0;1.0;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;8.0;1;;cm;1.0;1;0.96;126.0;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;9.0;2;;cm;1.0;20;0.96;126.0;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;10.0;3;;cm;1.0;89;0.96;126.0;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;P - Petit;1;131.12;0.96;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;11.0;4;;cm;1.0;5;0.96;126.0;\n" +
+ "2010;Campagne CGFS;;GOV 19.7/25.9;20;20;1;GWEN DREZ;1662;Vrac;15;;;Poids;;G - Gros;2;0.13;0.13;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;306;23.0;1;;cm;1.0;1;0.13;17.0625;";
+
public static final String MARINE_LITTER_CONTENT =
"Annee;Serie;Serie_Partielle;Engin;Id_Operation;NumOrdre_Station;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;GWEN DREZ;L1 PLASTIQUE;A: <5*5 cm= 25 cm2;2;5.0;S1;\n" +
@@ -140,6 +173,24 @@
"11242;AAPT;Aaptos;;\n" +
"11243;AAPTAAP;Aaptos aaptos;;";
+ public static final String SPECIES_CONTENT_2 =
+ "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "300;BUCCUND;Buccinum undatum;;\n" +
+ "365;AEQUOPE;Aequipecten opercularis;;\n" +
+ "489;LOLIVUL;Loligo vulgaris;LOLIVUL;\n" +
+ "491;ALLO;Alloteuthis;ALLOSPP;\n" +
+ "1242;SCYOCAN;Scyliorhinus canicula;SCYOCAN;\n" +
+ "1351;SARDPIL;Sardina pilchardus;SARDPIL;\n" +
+ "1362;ENGRENC;Engraulis encrasicolus;ENGRENC;\n" +
+ "1644;DICELAB;Dicentrarchus labrax;DICELAB;\n" +
+ "1662;TRACTRA;Trachurus trachurus;TRACTRA;\n" +
+ "1690;MULLSUR;Mullus surmuletus;MULLSUR;\n" +
+ "1772;SCOMSCO;Scomber scombrus;SCOMSCO;\n" +
+ "1811;CALMLYR;Callionymus lyra;CALMLYR;\n" +
+ "1978;PLEUPLA;Pleuronectes platessa;;\n" +
+ "1986;LIMDLIM;Limanda limanda;;\n" +
+ "1988;MICTKIT;Microstomus kitt;;";
+
protected TuttiExportService service;
protected PersistenceService persistenceService;
@@ -234,7 +285,7 @@
@Test
public void exportOperations() throws Exception {
- loadData(PROGRAM_ID, CRUISE_CGFS_ID);
+// loadData(PROGRAM_ID, CRUISE_CGFS_ID);
TuttiExportService.ExportContext exportContext =
service.createExportContext(dataDirectory, null);
@@ -303,6 +354,40 @@
CATCH_CONTENT);
}
+ // To fix http://forge.codelutin.com/issues/2692
+ @Test
+ public void exportCatchesAndSpecies() throws Exception {
+
+ File protocolFile = new File("src/test/resources/tuttiProtocol.tuttiProtocol");
+
+ TuttiProtocol protocol = dbResource.loadProtocol(protocolFile);
+
+ loadData(PROGRAM_ID, CRUISE_CGFS_ID);
+
+ FishingOperation operation = TuttiEntities.findById(operations, "100000");
+ operations = Lists.newArrayList(operation);
+
+ TuttiExportService.ExportContext exportContext =
+ service.createExportContext(dataDirectory, protocol);
+
+ try {
+ service.exportCatches(exportContext, cruise, operations);
+ service.exportSpecies(exportContext, exportContext.getSpeciesToExport());
+ } finally {
+ exportContext.close();
+ }
+
+ assertFileContent("species export:\n",
+ exportContext.speciesFile,
+ SPECIES_CONTENT_2);
+
+ assertFileContent("Catch export:\n",
+ exportContext.catchFile,
+ CATCH_CONTENT_2);
+
+
+ }
+
// To fix http://forge.codelutin.com/issues/2523
@Test
public void exportBadCatches() throws Exception {
Added: trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol
===================================================================
--- trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol (rev 0)
+++ trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol 2013-06-13 09:17:55 UTC (rev 1105)
@@ -0,0 +1,1782 @@
+id: aefaad71-2731-4184-978b-847f6e60c692
+name: ano-2486
+benthos:
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 907
+ speciesSurveyCode: ALPHGLA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 886
+ speciesSurveyCode: CHLOGRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 990
+ speciesSurveyCode: DARDSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1140
+ speciesSurveyCode: DORILAN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1012
+ speciesSurveyCode: GALADIS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1013
+ speciesSurveyCode: GALAINT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 951
+ speciesSurveyCode: HOMAVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1029
+ speciesSurveyCode: HOMOBAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1136
+ speciesSurveyCode: MACRSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1111
+ speciesSurveyCode: MAJASQU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1067
+ speciesSurveyCode: MCPIDEP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1066
+ speciesSurveyCode: MCPITUB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1075
+ speciesSurveyCode: MCPIVER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1015
+ speciesSurveyCode: MUNISPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 999
+ speciesSurveyCode: PAGUEXC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 994
+ speciesSurveyCode: PAGUPRI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 997
+ speciesSurveyCode: PAGUSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 885
+ speciesSurveyCode: PAPANAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1028
+ speciesSurveyCode: PAROCUV
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 868
+ speciesSurveyCode: PASISIV
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 866
+ speciesSurveyCode: PASISPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 880
+ speciesSurveyCode: PLESACA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 881
+ speciesSurveyCode: PLESANT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 7185
+ speciesSurveyCode: PLESEDW
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 882
+ speciesSurveyCode: PLESGIG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 883
+ speciesSurveyCode: PLESHET
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 884
+ speciesSurveyCode: PLESMAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 879
+ speciesSurveyCode: PLESSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 953
+ speciesSurveyCode: POLCTYP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 935
+ speciesSurveyCode: PONPNOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 934
+ speciesSurveyCode: PONPSPI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 928
+ speciesSurveyCode: PONTCAT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 929
+ speciesSurveyCode: PONTLAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 10607
+ speciesSurveyCode: PROCEDU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 915
+ speciesSurveyCode: PROCSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 858
+ speciesSurveyCode: SOLOMEM
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 715
+ speciesSurveyCode: SCALSCA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 837
+ speciesSurveyCode: EUPHSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 831
+ speciesSurveyCode: SQUIMAN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 353
+ speciesSurveyCode: ATRIFRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 379
+ speciesSurveyCode: CARDACU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 378
+ speciesSurveyCode: CARDECH
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 382
+ speciesSurveyCode: CARDSPI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 362
+ speciesSurveyCode: PECTSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 261
+ speciesSurveyCode: APORPES
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 262
+ speciesSurveyCode: APORSER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 305
+ speciesSurveyCode: BUCCSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 280
+ speciesSurveyCode: CASSECH
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 281
+ speciesSurveyCode: CASSTYR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 2451
+ speciesSurveyCode: GIBBSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3928
+ speciesSurveyCode: MUREBRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 292
+ speciesSurveyCode: MURETRU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 318
+ speciesSurveyCode: SCAPNIG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1189
+ speciesSurveyCode: MICOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1191
+ speciesSurveyCode: MICOVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 224
+ speciesSurveyCode: MBBRYOZ
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3671
+ speciesSurveyCode: GRYPVIT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 4626
+ speciesSurveyCode: ADAMCAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 133
+ speciesSurveyCode: ALCYPAL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3037
+ speciesSurveyCode: ALCYSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 6758
+ speciesSurveyCode: FMVERET
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 6804
+ speciesSurveyCode: FUNIQUA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 2224
+ speciesSurveyCode: ORACTIN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 7390
+ speciesSurveyCode: ANTESPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 11181
+ speciesSurveyCode: ASTRIRR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 11943
+ speciesSurveyCode: ASTRSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 6812
+ speciesSurveyCode: CIDACID
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1151
+ speciesSurveyCode: CLOPHIU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 4235
+ speciesSurveyCode: ECHNACU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3397
+ speciesSurveyCode: HOLOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 4240
+ speciesSurveyCode: LEPRSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1155
+ speciesSurveyCode: OPHUOPH
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1177
+ speciesSurveyCode: STICREG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 395
+ speciesSurveyCode: SPISSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 246
+ speciesSurveyCode: CANIGRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 245
+ speciesSurveyCode: CANIZIZ
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 226
+ speciesSurveyCode: CLGASTE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 12060
+ speciesSurveyCode: FMAPLYS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 250
+ speciesSurveyCode: TURRSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 4413
+ speciesSurveyCode: APLYSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 155
+ speciesSurveyCode: APHRACU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 196
+ speciesSurveyCode: FMMALDA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3032
+ speciesSurveyCode: FMSABED
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 209
+ speciesSurveyCode: FMSERPU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 150
+ speciesSurveyCode: MBANNEL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 211
+ speciesSurveyCode: STERSCU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3668
+ speciesSurveyCode: DENTSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 147
+ speciesSurveyCode: SIPSNUD
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 7
+ speciesSurveyCode: MBPORIF
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1182
+ speciesSurveyCode: CLASCID
+ weightEnabled: true
+gearUseFeaturePmfmId: []
+lengthClassesPmfmId: []
+species:
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 299
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 848
+ speciesSurveyCode: ARISFOL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 299
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 849
+ speciesSurveyCode: ARITANT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 299
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 855
+ speciesSurveyCode: PAPELON
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 299
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 949
+ speciesSurveyCode: NEPRNOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 507
+ speciesSurveyCode: ILLECOI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 489
+ speciesSurveyCode: LOLIVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1277
+ speciesSurveyCode: CENTGRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1282
+ speciesSurveyCode: SCYMLIC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1245
+ speciesSurveyCode: GALUMEL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1220
+ speciesSurveyCode: HEXAGRI
+ weightEnabled: true
+- !SpeciesProtocol
+ calcifySampleEnabled: true
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 2050
+ speciesSurveyCode: LOPHBUD
+ weightEnabled: true
+- !SpeciesProtocol
+ calcifySampleEnabled: true
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 2049
+ speciesSurveyCode: LOPHPIS
+ weightEnabled: true
+- !SpeciesProtocol
+ calcifySampleEnabled: true
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1540
+ speciesSurveyCode: MERLMER
+ weightEnabled: true
+- !SpeciesProtocol
+ calcifySampleEnabled: true
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1689
+ speciesSurveyCode: MULLBAR
+ weightEnabled: true
+- !SpeciesProtocol
+ calcifySampleEnabled: true
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1690
+ speciesSurveyCode: MULLSUR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1257
+ speciesSurveyCode: MUSTAST
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1258
+ speciesSurveyCode: MUSTMED
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1256
+ speciesSurveyCode: MUSTMUS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1329
+ speciesSurveyCode: MYLIAQU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1263
+ speciesSurveyCode: OXYNCEN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1312
+ speciesSurveyCode: RAJAALB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1313
+ speciesSurveyCode: RAJAAST
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1306
+ speciesSurveyCode: RAJABAT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1310
+ speciesSurveyCode: RAJACIR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1302
+ speciesSurveyCode: RAJACLA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1314
+ speciesSurveyCode: RAJAMEL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1315
+ speciesSurveyCode: RAJAMIR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1308
+ speciesSurveyCode: RAJAOXY
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1316
+ speciesSurveyCode: RAJAPOL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1318
+ speciesSurveyCode: RAJAUND
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1292
+ speciesSurveyCode: RHINCEM
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1293
+ speciesSurveyCode: RHINRHI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1242
+ speciesSurveyCode: SCYOCAN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1243
+ speciesSurveyCode: SCYOSTE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1266
+ speciesSurveyCode: SQUAACA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1267
+ speciesSurveyCode: SQUABLA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1288
+ speciesSurveyCode: SQUTACU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1289
+ speciesSurveyCode: SQUTOCL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1287
+ speciesSurveyCode: SQUTSQU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ maturityEnabled: true
+ sexEnabled: true
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1297
+ speciesSurveyCode: TORPMAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 299
+ sizeEnabled: true
+ speciesReferenceTaxonId: 957
+ speciesSurveyCode: PALIELE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 299
+ sizeEnabled: true
+ speciesReferenceTaxonId: 853
+ speciesSurveyCode: PENAKER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ sizeEnabled: true
+ speciesReferenceTaxonId: 514
+ speciesSurveyCode: OCTOVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ sizeEnabled: true
+ speciesReferenceTaxonId: 522
+ speciesSurveyCode: ELEDCIR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ sizeEnabled: true
+ speciesReferenceTaxonId: 521
+ speciesSurveyCode: ELEDMOS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ sizeEnabled: true
+ speciesReferenceTaxonId: 467
+ speciesSurveyCode: SEPIOFF
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 1417
+ sizeEnabled: true
+ speciesReferenceTaxonId: 509
+ speciesSurveyCode: TODASAG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1912
+ speciesSurveyCode: ASPICUC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1698
+ speciesSurveyCode: BOOPBOO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1953
+ speciesSurveyCode: CITHMAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1700
+ speciesSurveyCode: DIPLANN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1702
+ speciesSurveyCode: DIPLPUN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1703
+ speciesSurveyCode: DIPLSAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1704
+ speciesSurveyCode: DIPLVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1362
+ speciesSurveyCode: ENGRENC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1632
+ speciesSurveyCode: EPINSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1920
+ speciesSurveyCode: EUTRGUR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1905
+ speciesSurveyCode: HELIDAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1961
+ speciesSurveyCode: LEPMBOS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1710
+ speciesSurveyCode: LITHMOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1553
+ speciesSurveyCode: MICMPOU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1714
+ speciesSurveyCode: PAGEACA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1715
+ speciesSurveyCode: PAGEBOG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1713
+ speciesSurveyCode: PAGEERY
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1695
+ speciesSurveyCode: SPARPAG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1573
+ speciesSurveyCode: PHYIBLE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1641
+ speciesSurveyCode: POLYAME
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1957
+ speciesSurveyCode: PSETMAX
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1351
+ speciesSurveyCode: SARDPIL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 3789
+ speciesSurveyCode: SCOMPNE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1772
+ speciesSurveyCode: SCOMSCO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1996
+ speciesSurveyCode: SOLEVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1723
+ speciesSurveyCode: SPICMAE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1724
+ speciesSurveyCode: SPICSMA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1663
+ speciesSurveyCode: TRACMED
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1662
+ speciesSurveyCode: TRACTRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1921
+ speciesSurveyCode: TRIGLUC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1922
+ speciesSurveyCode: TRIPLAS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1558
+ speciesSurveyCode: TRISCAP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ lengthStepPmfmId: 307
+ sizeEnabled: true
+ speciesReferenceTaxonId: 1619
+ speciesSurveyCode: ZEUSFAB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 495
+ speciesSurveyCode: ABRAVER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 491
+ speciesSurveyCode: ALLOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1358
+ speciesSurveyCode: ALOSALO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1359
+ speciesSurveyCode: ALOSFAL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1637
+ speciesSurveyCode: ANTHANT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1547
+ speciesSurveyCode: ANTOMEG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1394
+ speciesSurveyCode: ARGESPY
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1970
+ speciesSurveyCode: ARNOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1972
+ speciesSurveyCode: ARNOIMP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1971
+ speciesSurveyCode: ARNOLAT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1973
+ speciesSurveyCode: ARNORUP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1974
+ speciesSurveyCode: ARNOTHO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1913
+ speciesSurveyCode: ASPIOBS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 523
+ speciesSurveyCode: BATISPO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1818
+ speciesSurveyCode: BLENOCE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 2004
+ speciesSurveyCode: BUGLLUT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1810
+ speciesSurveyCode: CALMSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1811
+ speciesSurveyCode: CALMLYR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1812
+ speciesSurveyCode: CALMMAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1814
+ speciesSurveyCode: CALMRIS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1624
+ speciesSurveyCode: CAPOAPE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1860
+ speciesSurveyCode: CARPACU
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1720
+ speciesSurveyCode: CECACIR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1279
+ speciesSurveyCode: CENTUYA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1654
+ speciesSurveyCode: CEPOMAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1383
+ speciesSurveyCode: CHAUSLO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1335
+ speciesSurveyCode: CHIMMON
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1410
+ speciesSurveyCode: CLORAGA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1532
+ speciesSurveyCode: COELCOE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1533
+ speciesSurveyCode: COELOCC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1467
+ speciesSurveyCode: CONGCON
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1474
+ speciesSurveyCode: DALOIMB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1321
+ speciesSurveyCode: DASICEN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1322
+ speciesSurveyCode: DASIPAS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 3003
+ speciesSurveyCode: DASITOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1323
+ speciesSurveyCode: DASIVIO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1789
+ speciesSurveyCode: GOBIQUA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1706
+ speciesSurveyCode: DENTDEN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1644
+ speciesSurveyCode: DICELAB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 10581
+ speciesSurveyCode: DIPLCER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1475
+ speciesSurveyCode: ECHEMIR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1648
+ speciesSurveyCode: EPIGSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1649
+ speciesSurveyCode: EPIGCON
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1650
+ speciesSurveyCode: EPIGDEN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1586
+ speciesSurveyCode: GADAMAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 7693
+ speciesSurveyCode: GADIARG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1579
+ speciesSurveyCode: GAIDMED
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1580
+ speciesSurveyCode: GAIDVUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1396
+ speciesSurveyCode: GLOSLEI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1783
+ speciesSurveyCode: GOBISPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1785
+ speciesSurveyCode: GOBINIG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 501
+ speciesSurveyCode: HISTSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 7700
+ speciesSurveyCode: HOPLMED
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1428
+ speciesSurveyCode: LAMASPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1429
+ speciesSurveyCode: LAMACRO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1590
+ speciesSurveyCode: LEPOLEP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1960
+ speciesSurveyCode: LEPMWHS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1917
+ speciesSurveyCode: LEPTCAV
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1918
+ speciesSurveyCode: LEPTDIE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1791
+ speciesSurveyCode: GOBIFRI
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1882
+ speciesSurveyCode: LIZAAUR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1881
+ speciesSurveyCode: LIZARAM
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1883
+ speciesSurveyCode: LIZASAL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 488
+ speciesSurveyCode: LOLISPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 12582
+ speciesSurveyCode: LOLIFOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1497
+ speciesSurveyCode: MACOSCO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1379
+ speciesSurveyCode: MAURMUE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1551
+ speciesSurveyCode: GADUMER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 2011
+ speciesSurveyCode: MICUVAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1567
+ speciesSurveyCode: MOLVDYP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1568
+ speciesSurveyCode: MOLVMAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1566
+ speciesSurveyCode: MOLVMOL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1593
+ speciesSurveyCode: MORAMOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1877
+ speciesSurveyCode: MUGICEP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1414
+ speciesSurveyCode: MYCOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1464
+ speciesSurveyCode: NETTMEL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1527
+ speciesSurveyCode: NEZUAEQ
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1528
+ speciesSurveyCode: NEZUSCL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1483
+ speciesSurveyCode: NOTABON
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1711
+ speciesSurveyCode: OBLAMEL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 513
+ speciesSurveyCode: OCTOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 515
+ speciesSurveyCode: OCTODEP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 517
+ speciesSurveyCode: OCTOSAL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1476
+ speciesSurveyCode: OPHCRUF
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1857
+ speciesSurveyCode: OPDIBAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1858
+ speciesSurveyCode: OPDIROC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1477
+ speciesSurveyCode: OPHISER
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1572
+ speciesSurveyCode: PHYIPHY
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 519
+ speciesSurveyCode: OCTOTET
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1300
+ speciesSurveyCode: RAJASPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1301
+ speciesSurveyCode: RAJABRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1309
+ speciesSurveyCode: RAJAFUL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1304
+ speciesSurveyCode: RAJAMON
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1311
+ speciesSurveyCode: RAJANAE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1317
+ speciesSurveyCode: RAJARDA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 471
+ speciesSurveyCode: ROSSMAC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1775
+ speciesSurveyCode: SADASAR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1716
+ speciesSurveyCode: SARPSAL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1894
+ speciesSurveyCode: SCORSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1895
+ speciesSurveyCode: SCORELO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1897
+ speciesSurveyCode: SCORLOP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1898
+ speciesSurveyCode: SCORMAD
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1899
+ speciesSurveyCode: SCORNOT
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1896
+ speciesSurveyCode: SCORPOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1900
+ speciesSurveyCode: SCORSCO
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 466
+ speciesSurveyCode: SEPISPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 468
+ speciesSurveyCode: SEPIELE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 469
+ speciesSurveyCode: SEPIORB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 476
+ speciesSurveyCode: SEPOSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1628
+ speciesSurveyCode: SERACAB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1629
+ speciesSurveyCode: SERAHEP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1995
+ speciesSurveyCode: SOLESPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1998
+ speciesSurveyCode: SOLEIMP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1999
+ speciesSurveyCode: SOLEKLE
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 2000
+ speciesSurveyCode: SOLELAS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1997
+ speciesSurveyCode: SOLESEN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1693
+ speciesSurveyCode: SPARAUR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1874
+ speciesSurveyCode: SPHYSPY
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1721
+ speciesSurveyCode: SPICSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1718
+ speciesSurveyCode: SPODCAN
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1356
+ speciesSurveyCode: SPRASPR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1286
+ speciesSurveyCode: SQUTSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 6835
+ speciesSurveyCode: STOMBOA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 2018
+ speciesSurveyCode: SYMPNIG
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1815
+ speciesSurveyCode: CALMPHA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 508
+ speciesSurveyCode: TODIEBL
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1295
+ speciesSurveyCode: TORPSPP
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1298
+ speciesSurveyCode: TORPNOB
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1296
+ speciesSurveyCode: TORPTOR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1760
+ speciesSurveyCode: TRAHARA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1759
+ speciesSurveyCode: TRAHDRA
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1761
+ speciesSurveyCode: TRAHRAD
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1664
+ speciesSurveyCode: TRACPIC
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1910
+ speciesSurveyCode: TRIGLYR
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1560
+ speciesSurveyCode: TRISLUS
+ weightEnabled: true
+- !SpeciesProtocol
+ countIfNoFrequencyEnabled: true
+ speciesReferenceTaxonId: 1764
+ speciesSurveyCode: URANSCA
+ weightEnabled: true
+vesselUseFeaturePmfmId: []
Property changes on: trunk/tutti-service/src/test/resources/tuttiProtocol.tuttiProtocol
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -109,6 +109,9 @@
TuttiProtocol protocol = null;
if (getContext().isProtocolFilled()) {
protocol = getDataContext().getProtocol();
+ if (log.isInfoEnabled()) {
+ log.info("Will use protocol "+protocol.getName());
+ }
}
TuttiExportService service = getContext().getTuttiExportService();
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-06-12 07:45:06 UTC (rev 1104)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-06-13 09:17:55 UTC (rev 1105)
@@ -113,6 +113,9 @@
TuttiProtocol protocol = null;
if (getContext().isProtocolFilled()) {
protocol = getDataContext().getProtocol();
+ if (log.isInfoEnabled()) {
+ log.info("Will use protocol "+protocol.getName());
+ }
}
TuttiExportService service = getContext().getTuttiExportService();
service.exportProgram(program.getId(), protocol, file, progressionModel);
1
0
r1104 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com June 12, 2013
by kmorin＠users.forge.codelutin.com June 12, 2013
June 12, 2013
Author: kmorin
Date: 2013-06-12 09:45:06 +0200 (Wed, 12 Jun 2013)
New Revision: 1104
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1104
Log:
fixes #2704 [ERGO] - Parcourt des tableaux bloqu?\195?\169 sur certains champs non ?\195?\169ditables
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java 2013-06-11 16:25:14 UTC (rev 1103)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableCellAction.java 2013-06-12 07:45:06 UTC (rev 1104)
@@ -67,7 +67,9 @@
int rowCount = getRowCount();
- while (currentRow <= rowCount || currentColumn <= columnCount) {
+ // I commented the part of the code to skip the not editable cells (ref #2704)
+// while (currentRow <= rowCount || currentColumn <= columnCount) {
+ if (currentRow <= rowCount || currentColumn <= columnCount) {
// go to next cell
currentColumn++;
@@ -85,25 +87,25 @@
// create a new row in model
addNewRow();
- } else {
-
- // can not create new row, so do nothing
- break;
+// } else {
+//
+// // can not create new row, so do nothing
+// break;
}
}
}
- if (isCellEditable(currentRow, currentColumn)) {
+// if (isCellEditable(currentRow, currentColumn)) {
doSelectCell(currentRow, currentColumn);
- break;
- } else {
- if (log.isDebugEnabled()) {
- log.debug("Cell not editable at " +
- getCellCoordinate(currentRow, currentColumn));
- }
- }
+// break;
+// } else {
+// if (log.isDebugEnabled()) {
+// log.debug("Cell not editable at " +
+// getCellCoordinate(currentRow, currentColumn));
+// }
+// }
}
}
}
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-06-11 16:25:14 UTC (rev 1103)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-06-12 07:45:06 UTC (rev 1104)
@@ -64,11 +64,12 @@
int rowCount = getRowCount();
- while (currentRow < rowCount) {
-
+ // I commented the part of the code to skip the not editable cells (ref #2704)
+// while (currentRow < rowCount) {
+ if (currentRow < rowCount) {
// go to next cell
currentRow++;
- boolean canSelect = true;
+// boolean canSelect = true;
// select next cell
if (currentRow >= rowCount) {
@@ -80,23 +81,23 @@
// create a new row in model
addNewRow();
- } else {
- canSelect = false;
+// } else {
+// canSelect = false;
}
- } else {
- canSelect = isCellEditable(currentRow, currentColumn);
+// } else {
+// canSelect = isCellEditable(currentRow, currentColumn);
}
- if (canSelect) {
+// if (canSelect) {
doSelectCell(currentRow, currentColumn);
- break;
- } else {
- if (log.isDebugEnabled()) {
- log.debug("Cell not editable at " +
- getCellCoordinate(currentRow, currentColumn));
- }
- }
+// break;
+// } else {
+// if (log.isDebugEnabled()) {
+// log.debug("Cell not editable at " +
+// getCellCoordinate(currentRow, currentColumn));
+// }
+// }
}
}
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java 2013-06-11 16:25:14 UTC (rev 1103)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableCellAction.java 2013-06-12 07:45:06 UTC (rev 1104)
@@ -64,7 +64,9 @@
int columnCount = getColumnCount();
- while (currentRow > 0 || currentColumn > 0) {
+ // I commented the part of the code to skip the not editable cells (ref #2704)
+// while (currentRow > 0 || currentColumn > 0) {
+ if (currentRow > 0 || currentColumn > 0) {
// go to next cell
currentColumn--;
@@ -76,15 +78,15 @@
currentRow--;
}
- if (isCellEditable(currentRow, currentColumn)) {
+// if (isCellEditable(currentRow, currentColumn)) {
doSelectCell(currentRow, currentColumn);
- break;
- } else {
- if (log.isDebugEnabled()) {
- log.debug("Cell not editable at " +
- getCellCoordinate(currentRow, currentColumn));
- }
- }
+// break;
+// } else {
+// if (log.isDebugEnabled()) {
+// log.debug("Cell not editable at " +
+// getCellCoordinate(currentRow, currentColumn));
+// }
+// }
}
}
}
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-06-11 16:25:14 UTC (rev 1103)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-06-12 07:45:06 UTC (rev 1104)
@@ -65,22 +65,24 @@
int rowCount = getRowCount();
- while (currentRow > 0) {
+ // I commented the part of the code to skip the not editable cells (ref #2704)
+// while (currentRow > 0) {
+ if (currentRow > 0) {
// go to next cell
currentRow--;
- boolean canSelect = isCellEditable(currentRow, currentColumn);
-
- if (canSelect) {
+// boolean canSelect = isCellEditable(currentRow, currentColumn);
+//
+// if (canSelect) {
doSelectCell(currentRow, currentColumn);
- break;
- } else {
- if (log.isDebugEnabled()) {
- log.debug("Cell not editable at " +
- getCellCoordinate(currentRow, currentColumn));
- }
- }
+// break;
+// } else {
+// if (log.isDebugEnabled()) {
+// log.debug("Cell not editable at " +
+// getCellCoordinate(currentRow, currentColumn));
+// }
+// }
}
}
}
1
0
See <http://ci.nuiton.org/jenkins/job/tutti/906/changes>
Changes:
[Tony Chemit] fixes #2701: [EXPORT DONNEES] erreur suite export générique
------------------------------------------
[...truncated 80 lines...]
[INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-persistence ---
[INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…>
[INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…>
[INFO] [WARNING] bundle en_GB contains 55/55 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-persistence ---
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-persistence ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 8 resources
[INFO] Copying 0 resource
[INFO]
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-persistence ---
[INFO] Compiling 132 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/cl…>
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti-persistence ---
[INFO] Executing tasks
main:
[mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/su…>
[INFO] Executed tasks
[INFO]
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-persistence ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 7 resources
[INFO]
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ tutti-persistence ---
[INFO] Compiling 31 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/te…>
[INFO]
[INFO] --- maven-surefire-plugin:2.14.1:test (default-test) @ tutti-persistence ---
[INFO] Surefire report directory: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/su…>
-------------------------------------------------------
T E S T S
-------------------------------------------------------
Running fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocolsTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.373 sec
Running fr.ifremer.tutti.persistence.service.CruisePersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec
Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplTest
2013-06-11 18:15:57,433 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplTest
2013-06-11 18:15:57,611 178 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.12 sec
Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplUpTodateTest
2013-06-11 18:15:57,619 186 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplUpTodateTest
2013-06-11 18:15:57,622 189 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceImplUpTodateTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeServiceCopyTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeHelperTest
2013-06-11 18:15:57,631 198 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeHelperTest
2013-06-11 18:15:57,634 201 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.synchro.ReferentialSynchronizeHelperTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest
2013-06-11 18:15:57,654 221 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest
2013-06-11 18:15:57,666 233 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.028 sec
Running fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest
2013-06-11 18:15:57,673 240 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest
2013-06-11 18:15:57,680 247 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec
Running fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest
2013-06-11 18:15:57,693 260 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest
2013-06-11 18:15:57,713 280 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceReadTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.024 sec
Running fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec
Running fr.ifremer.tutti.persistence.service.MarineLitterBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest
2013-06-11 18:15:57,722 289 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest
2013-06-11 18:15:57,729 296 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.AttachmentPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest
2013-06-11 18:15:57,737 304 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest
2013-06-11 18:15:57,744 311 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec
Running fr.ifremer.tutti.persistence.service.SpeciesBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.CruisePersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.TuttiEnumerationFileTest
2013-06-11 18:15:57,746 313 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.TuttiEnumerationFileTest
2013-06-11 18:15:57,767 334 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.TuttiEnumerationFileTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec
Running fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest
2013-06-11 18:15:57,771 338 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest
2013-06-11 18:15:57,776 343 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec
Running fr.ifremer.tutti.persistence.service.PlanktonBatchPersistenceServiceWriteTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.PlanktonBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec
Running fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest
2013-06-11 18:15:57,785 352 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest
2013-06-11 18:15:57,788 355 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.ProtocolPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.007 sec
Running fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest
2013-06-11 18:15:57,805 372 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest
2013-06-11 18:15:57,812 379 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.ReferentialPersistenceServiceReadTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.022 sec
Running fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceServiceReadTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec
Running fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest
2013-06-11 18:15:57,815 382 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest
2013-06-11 18:15:57,825 392 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…,> test [class fr.ifremer.tutti.persistence.service.ProgramPersistenceServiceReadTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.009 sec
Running fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest
2013-06-11 18:15:57,831 398 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest
2013-06-11 18:15:57,834 401 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.FishingOperationPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec
Running fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest
2013-06-11 18:15:57,837 404 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest
2013-06-11 18:15:57,842 409 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/db, test [class fr.ifremer.tutti.persistence.service.CatchBatchPersistenceServiceWriteTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec
Results :
Tests run: 31, Failures: 0, Errors: 0, Skipped: 29
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-persistence ---
[INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-persistence ---
[INFO]
[INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti-persistence ---
[INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.jar
[INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.pom
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tutti :: Service 2.4-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-service ---
[INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target>
[INFO]
[INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-service ---
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-service ---
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-service ---
[INFO] Load rules file validation.rules
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-service ---
[INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/genera…>
[INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/genera…>
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-service ---
[WARNING] bundle en_GB contains 252/252 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-service ---
[INFO] Copying 22 resources
[INFO]
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-service ---
[INFO] Compiling 82 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classes>
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected
[INFO] 1 error
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Tutti ............................................. SUCCESS [6.703s]
[INFO] Tutti :: Persistence .............................. SUCCESS [21.031s]
[INFO] Tutti :: Service .................................. FAILURE [1.354s]
[INFO] Tutti :: UI ....................................... SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 30.794s
[INFO] Finished at: Tue Jun 11 18:16:02 CEST 2013
[INFO] Final Memory: 36M/125M
[INFO] ------------------------------------------------------------------------
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-service/2.4-SNAPSHOT/tutti-service-2.4-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-ui-swing/2.4-SNAPSHOT/tutti-ui-swing-2.4-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-06-11_18-15-26/archive/fr.ifremer/tutti/2.4-SNAPSHOT/tutti-2.4-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.4-SNAPSHOT-s…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-06-11_18-15-26/archive/fr.ifremer/tutti/2.4-SNAPSHOT/tutti-2.4-SNAPSHOT-site_fr.xml
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-06-11_18-15-26/archive/fr.ifremer.tutti/tutti-persistence/2.4-SNAPSHOT/tutti-persistence-2.4-SNAPSHOT.jar
Waiting for Jenkins to finish collecting data
mavenExecutionResult exceptions not empty
message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-service: Compilation failure
bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected
cause : Compilation failure
bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected
Stack trace :
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-service: Compilation failure
bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239)
at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:100)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:66)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:326)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
at java.util.concurrent.FutureTask.run(FutureTask.java:166)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:722)
Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure
bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/main/java…>:[487,63] error: ';' expected
at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729)
at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209)
... 27 more
Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com
channel stopped
1
1
June 11, 2013
See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/906/c…>
Changes:
[Tony Chemit] fixes #2701: [EXPORT DONNEES] erreur suite export générique
------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tutti :: Service 2.4-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-service ---
[INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…>
[INFO]
[INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-service ---
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-service ---
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-service ---
[INFO] Load rules file validation.rules
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-service ---
[INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…>
[INFO] Copying tutti-service.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…>
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-service ---
[WARNING] bundle en_GB contains 252/252 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-service ---
[INFO] Copying 22 resources
[INFO]
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-service ---
[INFO] Compiling 82 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/ta…>
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] bootstrap class path not set in conjunction with -source 1.6
<http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-service/ws/sr…>:[487,63] error: ';' expected
[INFO] 1 error
[INFO] -------------------------------------------------------------
1
1
r1103 - in trunk: . tutti-persistence tutti-service tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-ui-swing
by tchemit＠users.forge.codelutin.com June 11, 2013
by tchemit＠users.forge.codelutin.com June 11, 2013
June 11, 2013
Author: tchemit
Date: 2013-06-11 18:25:14 +0200 (Tue, 11 Jun 2013)
New Revision: 1103
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1103
Log:
pass to version 2.3.1-SNAPSHOT
fix build
Modified:
trunk/pom.xml
trunk/tutti-persistence/pom.xml
trunk/tutti-service/pom.xml
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java
trunk/tutti-ui-swing/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-06-11 16:01:59 UTC (rev 1102)
+++ trunk/pom.xml 2013-06-11 16:25:14 UTC (rev 1103)
@@ -32,7 +32,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tutti</name>
Modified: trunk/tutti-persistence/pom.xml
===================================================================
--- trunk/tutti-persistence/pom.xml 2013-06-11 16:01:59 UTC (rev 1102)
+++ trunk/tutti-persistence/pom.xml 2013-06-11 16:25:14 UTC (rev 1103)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: trunk/tutti-service/pom.xml
===================================================================
--- trunk/tutti-service/pom.xml 2013-06-11 16:01:59 UTC (rev 1102)
+++ trunk/tutti-service/pom.xml 2013-06-11 16:25:14 UTC (rev 1103)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 16:01:59 UTC (rev 1102)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 16:25:14 UTC (rev 1103)
@@ -484,7 +484,6 @@
return TuttiExportService.getValueOrComputedValueComputed(
catchBatch.getMarineLitterTotalWeight(),
catchBatch.getMarineLitterTotalComputedWeight());
- catchBatch.getMarineLitterTotalComputedWeight());
}
protected Serializable getGearUseFeature(Caracteristic caracteristic) {
Modified: trunk/tutti-ui-swing/pom.xml
===================================================================
--- trunk/tutti-ui-swing/pom.xml 2013-06-11 16:01:59 UTC (rev 1102)
+++ trunk/tutti-ui-swing/pom.xml 2013-06-11 16:25:14 UTC (rev 1103)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
1
0
r1102 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 11, 2013
by tchemit＠users.forge.codelutin.com June 11, 2013
June 11, 2013
Author: tchemit
Date: 2013-06-11 18:01:59 +0200 (Tue, 11 Jun 2013)
New Revision: 1102
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1102
Log:
fixes #2701: [EXPORT DONNEES] erreur suite export g?\195?\169n?\195?\169rique
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/OperationExportRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.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-11 15:14:17 UTC (rev 1101)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-11 16:01:59 UTC (rev 1102)
@@ -261,7 +261,10 @@
speciesBatch.getRankOrder());
CatchExportRow row = currentRow.copy();
- row.setReferenceWeight(speciesBatch.getSampleCategoryWeight());
+ float referenceWeight = TuttiExportService.getValueOrComputedValue(
+ speciesBatch.getSampleCategoryWeight(),
+ speciesBatch.getSampleCategoryComputedWeight());
+ row.setReferenceWeight(referenceWeight);
row.setRaisingFactor(1.f);
rows.add(row);
}
@@ -372,7 +375,11 @@
benthosBatch.getRankOrder());
CatchExportRow row = currentRow.copy();
- row.setReferenceWeight(benthosBatch.getSampleCategoryWeight());
+
+ float referenceWeight = TuttiExportService.getValueOrComputedValue(
+ benthosBatch.getSampleCategoryWeight(),
+ benthosBatch.getSampleCategoryComputedWeight());
+ row.setReferenceWeight(referenceWeight);
row.setRaisingFactor(1.f);
rows.add(row);
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 15:14:17 UTC (rev 1101)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/OperationExportRow.java 2013-06-11 16:01:59 UTC (rev 1102)
@@ -279,172 +279,214 @@
}
public Float getCatchTotalWeight() {
- return getValueOrComputedValue(catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getCatchTotalWeight(),
+ catchBatch.getCatchTotalComputedWeight());
}
public Boolean getCatchTotalWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getCatchTotalWeight(),
+ catchBatch.getCatchTotalComputedWeight());
}
public Float getCatchTotalSortedTremisWeight() {
- return getValueOrComputedValue(catchBatch.getCatchTotalSortedTremisWeight(), null);
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getCatchTotalSortedTremisWeight(), null);
}
public Boolean getCatchTotalSortedTremisWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getCatchTotalSortedTremisWeight(), null);
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getCatchTotalSortedTremisWeight(), null);
}
public Float getCatchTotalSortedCarousselWeight() {
- return getValueOrComputedValue(catchBatch.getCatchTotalSortedCarousselWeight(), null);
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getCatchTotalSortedCarousselWeight(), null);
}
public Boolean getCatchTotalSortedCarousselWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getCatchTotalSortedCarousselWeight(), null);
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getCatchTotalSortedCarousselWeight(), null);
}
public Float getCatchTotalSortedWeight() {
- return getValueOrComputedValue(null, catchBatch.getCatchTotalSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getCatchTotalSortedComputedWeight());
}
public Boolean getCatchTotalSortedWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getCatchTotalSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getCatchTotalSortedComputedWeight());
}
public Float getCatchTotalUnsortedWeight() {
- return getValueOrComputedValue(null, catchBatch.getCatchTotalUnsortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getCatchTotalUnsortedComputedWeight());
}
public Boolean getCatchTotalUnsortedWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getCatchTotalUnsortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getCatchTotalUnsortedComputedWeight());
}
public Float getCatchTotalRejectedWeight() {
- return getValueOrComputedValue(catchBatch.getCatchTotalRejectedWeight(), catchBatch.getCatchTotalRejectedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getCatchTotalRejectedWeight(),
+ catchBatch.getCatchTotalRejectedComputedWeight());
}
public Boolean getCatchTotalRejectedWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getCatchTotalRejectedWeight(), catchBatch.getCatchTotalRejectedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getCatchTotalRejectedWeight(),
+ catchBatch.getCatchTotalRejectedComputedWeight());
}
public Float getSpeciesTotalWeight() {
- return getValueOrComputedValue(null, catchBatch.getSpeciesTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getSpeciesTotalComputedWeight());
}
public Boolean getSpeciesTotalWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getSpeciesTotalComputedWeight());
}
public Float getSpeciesTotalSortedWeight() {
- return getValueOrComputedValue(catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getSpeciesTotalSortedWeight(),
+ catchBatch.getSpeciesTotalSortedComputedWeight());
}
public Boolean getSpeciesTotalSortedWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getSpeciesTotalSortedWeight(),
+ catchBatch.getSpeciesTotalSortedComputedWeight());
}
public Float getSpeciesTotalUnsortedWeight() {
- return getValueOrComputedValue(null, catchBatch.getSpeciesTotalUnsortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getSpeciesTotalUnsortedComputedWeight());
}
public Boolean getSpeciesTotalUnsortedWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalUnsortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getSpeciesTotalUnsortedComputedWeight());
}
public Float getSpeciesTotalSampleSortedWeight() {
- return getValueOrComputedValue(null, catchBatch.getSpeciesTotalSampleSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getSpeciesTotalSampleSortedComputedWeight());
}
public Boolean getSpeciesTotalSampleSortedWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getSpeciesTotalSampleSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getSpeciesTotalSampleSortedComputedWeight());
}
public Float getSpeciesTotalInertWeight() {
- return getValueOrComputedValue(catchBatch.getSpeciesTotalInertWeight(), catchBatch.getSpeciesTotalInertComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getSpeciesTotalInertWeight(),
+ catchBatch.getSpeciesTotalInertComputedWeight());
}
public Boolean getSpeciesTotalInertWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalInertWeight(), catchBatch.getSpeciesTotalInertComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getSpeciesTotalInertWeight(),
+ catchBatch.getSpeciesTotalInertComputedWeight());
}
public Float getSpeciesTotalLivingNotItemizedWeight() {
- return getValueOrComputedValue(catchBatch.getSpeciesTotalLivingNotItemizedWeight(), catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getSpeciesTotalLivingNotItemizedWeight(),
+ catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight());
}
public Boolean getSpeciesTotalLivingNotItemizedWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getSpeciesTotalLivingNotItemizedWeight(), catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getSpeciesTotalLivingNotItemizedWeight(),
+ catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight());
}
public Float getBenthosTotalWeight() {
- return getValueOrComputedValue(null, catchBatch.getBenthosTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getBenthosTotalComputedWeight());
}
public Boolean getBenthosTotalWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getBenthosTotalComputedWeight());
}
public Float getBenthosTotalSortedWeight() {
- return getValueOrComputedValue(catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getBenthosTotalSortedWeight(),
+ catchBatch.getBenthosTotalSortedComputedWeight());
}
public Boolean getBenthosTotalSortedWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getBenthosTotalSortedWeight(),
+ catchBatch.getBenthosTotalSortedComputedWeight());
}
public Float getBenthosTotalUnsortedWeight() {
- return getValueOrComputedValue(null, catchBatch.getBenthosTotalUnsortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getBenthosTotalUnsortedComputedWeight());
}
public Boolean getBenthosTotalUnsortedWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalUnsortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getBenthosTotalUnsortedComputedWeight());
}
public Float getBenthosTotalSampleSortedWeight() {
- return getValueOrComputedValue(null, catchBatch.getBenthosTotalSampleSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ null, catchBatch.getBenthosTotalSampleSortedComputedWeight());
}
public Boolean getBenthosTotalSampleSortedWeightComputed() {
- return getValueOrComputedValueComputed(null, catchBatch.getBenthosTotalSampleSortedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ null, catchBatch.getBenthosTotalSampleSortedComputedWeight());
}
public Float getBenthosTotalInertWeight() {
- return getValueOrComputedValue(catchBatch.getBenthosTotalInertWeight(), catchBatch.getBenthosTotalInertComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getBenthosTotalInertWeight(),
+ catchBatch.getBenthosTotalInertComputedWeight());
}
public Boolean getBenthosTotalInertWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getBenthosTotalInertWeight(), catchBatch.getBenthosTotalInertComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getBenthosTotalInertWeight(),
+ catchBatch.getBenthosTotalInertComputedWeight());
}
public Float getBenthosTotalLivingNotItemizedWeight() {
- return getValueOrComputedValue(catchBatch.getBenthosTotalLivingNotItemizedWeight(), catchBatch.getBenthosTotalLivingNotItemizedComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getBenthosTotalLivingNotItemizedWeight(),
+ catchBatch.getBenthosTotalLivingNotItemizedComputedWeight());
}
public Boolean getBenthosTotalLivingNotItemizedWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getBenthosTotalLivingNotItemizedWeight(), catchBatch.getBenthosTotalLivingNotItemizedComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getBenthosTotalLivingNotItemizedWeight(),
+ catchBatch.getBenthosTotalLivingNotItemizedComputedWeight());
}
public Float getMarineLitterTotalWeight() {
- return getValueOrComputedValue(catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValue(
+ catchBatch.getMarineLitterTotalWeight(),
+ catchBatch.getMarineLitterTotalComputedWeight());
}
public Boolean getMarineLitterTotalWeightComputed() {
- return getValueOrComputedValueComputed(catchBatch.getMarineLitterTotalWeight(), catchBatch.getMarineLitterTotalComputedWeight());
+ return TuttiExportService.getValueOrComputedValueComputed(
+ catchBatch.getMarineLitterTotalWeight(),
+ catchBatch.getMarineLitterTotalComputedWeight());
+ catchBatch.getMarineLitterTotalComputedWeight());
}
- protected Float getValueOrComputedValue(Float value, Float computedValue) {
- return value == null ? computedValue : value;
- }
-
- protected Boolean getValueOrComputedValueComputed(Float value, Float computedValue) {
- Boolean result;
- if (value == null) {
-
- result = computedValue == null ? null : true;
- } else {
- result = true;
- }
- return result;
- }
-
protected Serializable getGearUseFeature(Caracteristic caracteristic) {
CaracteristicMap gearUseFeatures = fishingOperation.getGearUseFeatures();
Serializable serializable = gearUseFeatures == null ? null : gearUseFeatures.get(caracteristic);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 15:14:17 UTC (rev 1101)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-06-11 16:01:59 UTC (rev 1102)
@@ -116,6 +116,21 @@
protected Caracteristic pmfmIdCaracteristic;
+ public static Float getValueOrComputedValue(Float value, Float computedValue) {
+ return value == null ? computedValue : value;
+ }
+
+ public static Boolean getValueOrComputedValueComputed(Float value, Float computedValue) {
+ Boolean result;
+ if (value == null) {
+
+ result = computedValue == null ? null : true;
+ } else {
+ result = true;
+ }
+ return result;
+ }
+
@Override
public void setServiceContext(TuttiServiceContext context) {
super.setServiceContext(context);
1
0
r1101 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com June 11, 2013
by kmorin＠users.forge.codelutin.com June 11, 2013
June 11, 2013
Author: kmorin
Date: 2013-06-11 17:14:17 +0200 (Tue, 11 Jun 2013)
New Revision: 1101
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1101
Log:
fixes #2700 [MENSURATION] - Saisie en d?\195?\169nombrement et message affich?\195?\169 sans donn?\195?\169es saisies
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-06-11 15:14:17 UTC (rev 1101)
@@ -105,7 +105,7 @@
});
result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
result.setLengthStep(defaultStep);
- result.setValid(true);
+ result.setValid(defaultStep != null);
return result;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-06-11 15:14:17 UTC (rev 1101)
@@ -297,7 +297,7 @@
#dataInFrequenciesWarningContainer {
background: {new java.awt.Color(245, 218, 88)};
- visible: {model.getRowsInError().size() != model.getRows().size()};
+ visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()};
}
#dataInFrequenciesWarning {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-06-11 15:14:17 UTC (rev 1101)
@@ -126,6 +126,7 @@
Object newValue) {
boolean recomputeAllRows;
+ BenthosFrequencyUIModel model = getModel();
if (row.getWeight() != null) {
// check if no row had a weight, then if one of them now has a weight,
@@ -141,7 +142,7 @@
}
- List<BenthosFrequencyRowModel> rows = getModel().getRows();
+ List<BenthosFrequencyRowModel> rows = model.getRows();
Integer totalNumber = 0;
Float totalWeight = 0f;
for (BenthosFrequencyRowModel r : rows) {
@@ -159,12 +160,17 @@
}
}
}
- getModel().setTotalNumber(totalNumber);
- getModel().setTotalWeight(totalWeight);
+ model.setTotalNumber(totalNumber);
+ model.setTotalWeight(totalWeight);
if (!recomputeAllRows) {
recomputeRowValidState(row);
}
+ if (row.isValid() && row.getNumber() == null && row.getWeight() == null) {
+ model.addEmptyRow(row);
+ } else {
+ model.removeEmptyRow(row);
+ }
}
@Override
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-06-11 15:14:17 UTC (rev 1101)
@@ -24,11 +24,15 @@
* #L%
*/
+import com.google.common.collect.Sets;
import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel;
import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel;
import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel;
+import java.util.List;
+import java.util.Set;
+
/**
* @author tchemit <chemit(a)codelutin.com>
* @since 0.2
@@ -65,6 +69,8 @@
public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight";
+ public static final String PROPERTY_EMPTY_ROWS = "emptyRows";
+
public static enum ConfigurationMode {
SIMPLE,
AUTO_GEN,
@@ -135,10 +141,18 @@
*/
protected Float totalWeight;
+ protected Set<BenthosFrequencyRowModel> emptyRows;
+
public BenthosFrequencyUIModel() {
super(SpeciesBatchRowModel.class, null, null);
+ setEmptyRows(Sets.<BenthosFrequencyRowModel>newHashSet());
}
+ public void setRows(List<BenthosFrequencyRowModel> rows) {
+ super.setRows(rows);
+ setEmptyRows(Sets.<BenthosFrequencyRowModel>newHashSet());
+ }
+
public ConfigurationMode getConfigurationMode() {
return configurationMode;
}
@@ -263,6 +277,25 @@
firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight);
}
+ public Set<BenthosFrequencyRowModel> getEmptyRows() {
+ return emptyRows;
+ }
+
+ public void setEmptyRows(Set<BenthosFrequencyRowModel> emptyRows) {
+ this.emptyRows = emptyRows;
+ firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows);
+ }
+
+ public void addEmptyRow(BenthosFrequencyRowModel row) {
+ emptyRows.add(row);
+ firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows);
+ }
+
+ public void removeEmptyRow(BenthosFrequencyRowModel row) {
+ emptyRows.remove(row);
+ firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows);
+ }
+
@Override
protected SpeciesBatchRowModel newEntity() {
return new SpeciesBatchRowModel();
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-06-11 15:14:17 UTC (rev 1101)
@@ -105,7 +105,7 @@
});
result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
result.setLengthStep(defaultStep);
- result.setValid(true);
+ result.setValid(defaultStep != null);
return result;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-06-11 15:14:17 UTC (rev 1101)
@@ -297,7 +297,7 @@
#dataInFrequenciesWarningContainer {
background: {new java.awt.Color(245, 218, 88)};
- visible: {model.getRowsInError().size() != model.getRows().size()};
+ visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()};
}
#dataInFrequenciesWarning {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-06-11 15:14:17 UTC (rev 1101)
@@ -127,6 +127,7 @@
Object newValue) {
boolean recomputeAllRows;
+ SpeciesFrequencyUIModel model = getModel();
if (row.getWeight() != null) {
// check if no row had a weight, then if one of them now has a weight,
@@ -141,7 +142,7 @@
recomputeAllRows = withWeightRows.isEmpty();
}
- List<SpeciesFrequencyRowModel> rows = getModel().getRows();
+ List<SpeciesFrequencyRowModel> rows = model.getRows();
Integer totalNumber = 0;
Float totalWeight = 0f;
for (SpeciesFrequencyRowModel r : rows) {
@@ -159,12 +160,17 @@
}
}
}
- getModel().setTotalNumber(totalNumber);
- getModel().setTotalWeight(totalWeight);
+ model.setTotalNumber(totalNumber);
+ model.setTotalWeight(totalWeight);
if (!recomputeAllRows) {
recomputeRowValidState(row);
}
+ if (row.isValid() && row.getNumber() == null && row.getWeight() == null) {
+ model.addEmptyRow(row);
+ } else {
+ model.removeEmptyRow(row);
+ }
}
@Override
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-06-11 15:09:23 UTC (rev 1100)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-06-11 15:14:17 UTC (rev 1101)
@@ -24,10 +24,14 @@
* #L%
*/
+import com.google.common.collect.Sets;
import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel;
import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel;
+import java.util.List;
+import java.util.Set;
+
/**
* @author tchemit <chemit(a)codelutin.com>
* @since 0.2
@@ -64,6 +68,8 @@
public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight";
+ public static final String PROPERTY_EMPTY_ROWS = "emptyRows";
+
public static enum ConfigurationMode {
SIMPLE,
AUTO_GEN,
@@ -134,10 +140,18 @@
*/
protected Integer simpleCount;
+ protected Set<SpeciesFrequencyRowModel> emptyRows;
+
public SpeciesFrequencyUIModel() {
super(SpeciesBatchRowModel.class, null, null);
+ setEmptyRows(Sets.<SpeciesFrequencyRowModel>newHashSet());
}
+ public void setRows(List<SpeciesFrequencyRowModel> rows) {
+ super.setRows(rows);
+ setEmptyRows(Sets.<SpeciesFrequencyRowModel>newHashSet());
+ }
+
public ConfigurationMode getConfigurationMode() {
return configurationMode;
}
@@ -262,6 +276,25 @@
firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight);
}
+ public Set<SpeciesFrequencyRowModel> getEmptyRows() {
+ return emptyRows;
+ }
+
+ public void setEmptyRows(Set<SpeciesFrequencyRowModel> emptyRows) {
+ this.emptyRows = emptyRows;
+ firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows);
+ }
+
+ public void addEmptyRow(SpeciesFrequencyRowModel row) {
+ emptyRows.add(row);
+ firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows);
+ }
+
+ public void removeEmptyRow(SpeciesFrequencyRowModel row) {
+ emptyRows.remove(row);
+ firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows);
+ }
+
@Override
protected SpeciesBatchRowModel newEntity() {
return new SpeciesBatchRowModel();
1
0