- Tutti-commits - mailman.cloud.codelutin.com

r871 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config
by tchemit＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: tchemit Date: 2013-04-23 17:36:33 +0200 (Tue, 23 Apr 2013) New Revision: 871 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/871 Log: fixes #2352: [TECH] Probl?\195?\168me avec le fichier conf.properties lors du d?\195?\169placement du r?\195?\169pertoire Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java 2013-04-23 09:43:37 UTC (rev 870) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java 2013-04-23 15:36:33 UTC (rev 871) @@ -183,7 +183,9 @@ public void generateExternalDbFiles(boolean force) { try { - generateDbConfiguration(force); + // always generate db configuration file + // see http://forge.codelutin.com/issues/2352 + generateDbConfiguration(true); } catch (IOException e) { throw new TuttiTechnicalException("Could not generate db configuration file");

1 0

r870 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: maven-release Date: 2013-04-23 11:43:37 +0200 (Tue, 23 Apr 2013) New Revision: 870 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/870 Log: [maven-release-plugin] prepare for next development iteration 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-04-23 09:43:29 UTC (rev 869) +++ trunk/pom.xml 2013-04-23 09:43:37 UTC (rev 870) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.0</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.0 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.0 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-23 09:43:29 UTC (rev 869) +++ trunk/tutti-persistence/pom.xml 2013-04-23 09:43:37 UTC (rev 870) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-23 09:43:29 UTC (rev 869) +++ trunk/tutti-service/pom.xml 2013-04-23 09:43:37 UTC (rev 870) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-23 09:43:29 UTC (rev 869) +++ trunk/tutti-ui-swing/pom.xml 2013-04-23 09:43:37 UTC (rev 870) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0</version> + <version>2.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r869 - tags
by maven-release＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: maven-release Date: 2013-04-23 11:43:29 +0200 (Tue, 23 Apr 2013) New Revision: 869 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/869 Log: [maven-release-plugin] copy for tag tutti-2.0 Added: tags/tutti-2.0/

1 0

r868 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: maven-release Date: 2013-04-23 11:43:21 +0200 (Tue, 23 Apr 2013) New Revision: 868 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/868 Log: [maven-release-plugin] prepare release tutti-2.0 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-04-23 09:39:47 UTC (rev 867) +++ trunk/pom.xml 2013-04-23 09:43:21 UTC (rev 868) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.0</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.0 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.0 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-23 09:39:47 UTC (rev 867) +++ trunk/tutti-persistence/pom.xml 2013-04-23 09:43:21 UTC (rev 868) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-23 09:39:47 UTC (rev 867) +++ trunk/tutti-service/pom.xml 2013-04-23 09:43:21 UTC (rev 868) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-23 09:39:47 UTC (rev 867) +++ trunk/tutti-ui-swing/pom.xml 2013-04-23 09:43:21 UTC (rev 868) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r867 - trunk/src/site/rst
by tchemit＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: tchemit Date: 2013-04-23 11:39:47 +0200 (Tue, 23 Apr 2013) New Revision: 867 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/867 Log: update documentation Modified: trunk/src/site/rst/features.rst trunk/src/site/rst/mapping.rst Modified: trunk/src/site/rst/features.rst =================================================================== --- trunk/src/site/rst/features.rst 2013-04-23 09:22:23 UTC (rev 866) +++ trunk/src/site/rst/features.rst 2013-04-23 09:39:47 UTC (rev 867) @@ -43,9 +43,52 @@ - Installer une base à partir d'une url distante via le mécanisme de mise à jour intégré. -- Mise à jour automatique via le mécanisme de mise à jour intégré. -- Exporter la base de travail (sous forme d'archive zip). +- Mise à jour automatique via le mécanisme de mise à jour intégré (mis à jour des référentiels). +- Exporter les données de Tutti (base de travail / protocols / pièces-jointes) (sous forme d'archive zip). +- Exporter les données de Tutti puis les supprimer , permet alors de pouvoir installer une nouvelle base ou importer des données de Tutti. +- Import les données de Tuttii : permet d'importer les données d'une autre instance de Tutti précedemment exportées. +Le format de l'archive d'un export est le suivant : + +:: + + tutti-2.0-SNAPSHOT-2013-04-23/ + |-- db + | |-- allegro.backup + | |-- allegro.data + | |-- allegro.log + | |-- allegro.properties + | |-- allegro.script + | `-- version.appup + |-- meas_files + | |-- CATCH_BATCH + | | |-- OBJ100000 + | | | |-- CATCH_BATCH-OBJ100000-100005.tnk + | | | `-- CATCH_BATCH-OBJ100000-100006.car + | | `-- OBJ100003 + | |-- OPERATION + | | `-- OBJ100000 + | | |-- OPERATION-OBJ100000-100000.dat + | | `-- OPERATION-OBJ100000-100007.dat + | `-- SAMPLE + | |-- OBJ100000 + | | `-- SAMPLE-OBJ100000-100002.asc + | |-- OBJ100015 + | | `-- SAMPLE-OBJ100015-100001.dat + | |-- OBJ100018 + | | `-- SAMPLE-OBJ100018-100002.dat + | |-- OBJ100022 + | | `-- SAMPLE-OBJ100022-100003.dat + | `-- OBJ100040 + | `-- SAMPLE-OBJ100040-100004.dat + `-- protocol + |-- 194016f4-3bea-40a2-aea2-792401b9f3c9.tuttiProtocol + `-- 54f6cb48-2463-4212-9e9b-5849db109acc.tuttiProtocol + +Pour le moment si vous voulez importer une base sans les autres données +(pièces-jointes / protocole), il vous suffit alors simplement de créer une +archive zip qui respecte ce format. + Pour utiliser ces fonctionnalités, rendez-vous sur l'écran **Gestionnaire de base** (Menu fichier -> Gestionnaire de base). Modified: trunk/src/site/rst/mapping.rst =================================================================== --- trunk/src/site/rst/mapping.rst 2013-04-23 09:22:23 UTC (rev 866) +++ trunk/src/site/rst/mapping.rst 2013-04-23 09:39:47 UTC (rev 867) @@ -304,7 +304,6 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) MeasurementFile.name : nom MeasurementFile.comments : commentaire - **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Capture > Espèces ~~~~~~~~~~~~~~~~~ @@ -329,7 +328,6 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) MeasurementFile.name : nom MeasurementFile.comments : commentaire - **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Tableau Chaque ligne du tableau est stockée sous la forme d'un lot (Batch) positionné @@ -376,7 +374,6 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif ?) MeasurementFile.name : nom MeasurementFile.comments : commentaire - **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Mensuration > Type de mesure Dupliqué pour chaque lot de mensuration créé (un lot pour chaque taille saisie) @@ -422,7 +419,6 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) MeasurementFile.name : nom MeasurementFile.comments : commentaire - **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Tableau Chaque ligne du tableau est stockée sous la forme d'un lot (Batch) positionné @@ -469,7 +465,6 @@ MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) MeasurementFile.name : nom MeasurementFile.comments : commentaire - **WARNING** : modification de modèle à faire pour pouvoir avoir MEASUREMENT_FILE.PMFM_FK=null Mensuration > Type de mesure Dupliqué pour chaque lot de mensuration créé (un lot pour chaque taille saisie) @@ -492,5 +487,128 @@ Mensuration > Tableau > Poids observé Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1) +Capture > Macro déchets +~~~~~~~~~~~~~~~~~~~~~~~ +Macro-dechets > Poids total + Lot "Capture > Hors Vrac > Macro déchets" + Batch.quantificationMeasurement.numericalValue (QUANTIFICATION_MEASUREMENT.NUMERICAL_VALUE avec IS_REFERENT=1 et PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) + +Pièces Jointes + Chaque pièce jointes est stockée dans MeasurementFile + (MEASUREMENT_FILE avec PMFM_FK=null, OBJECT_TYPE_FK='CATCH_BATCH' et OBJECT_ID=<ID du lot HORS VRAC > Macro déchets>) + MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) + MeasurementFile.name : nom + MeasurementFile.comments : commentaire + +Tableau + Chaque ligne du tableau est stockée sous la forme d'un lot (Batch) positionné + soit sous le lot "Capture > Vrac > Benthos" + soit sous "Capture > Hors Vrac > Benthos" + +Tableau > Catégorie + Batch.sortingMeasurement.qualitativeValue (SORTING_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.MARINE_LITTER_TYPE>) + +Tableau > Catégorie de taille + Batch.sortingMeasurement.qualitativeValue (SORTING_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.MARINE_LITTER_SIZE_CATEGORY>) + +Tableau > Nombre + Batch.quantificationMeasurement.qualitativeValue (QUANTIFICATION_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.SIZE_CATEGORY>) + +Tableau > Poids + Batch.individualCount + +Tableau > Commentaire + Batch.comments + +Tableau > Pièces Jointes + Chaque pièce jointes est stockée dans MeasurementFile + (MEASUREMENT_FILE avec PMFM_FK=null, OBJECT_TYPE_FK='SAMPLE' et OBJECT_ID=<ID du lot de la ligne du tableau>) + MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) + MeasurementFile.name : nom + MeasurementFile.comments : commentaire + +Capture > Captures accidentelles +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Utilisation table *Sample* et *SampleMeasurement* + +Tableau + Chaque ligne du tableau est stockée sous la forme d'un prélèvement (Sample). + +Tableau > Espèce + Sample.referenceTaxon + +Tableau > Sexe + Sample.sampleMeasurements.qualitativeValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.SEX>) + +Tableau > Poids observé (kg) + Sample.sampleMeasurements.numericalValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) + +Tableau > Taille + Sample.sampleMeasurements.numericalValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.>) + +Tableau > Classe de taille + Sample.sampleMeasurements.qualitativeValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.>) + +Tableau > Mort ou vivant + Sample.sampleMeasurements.qualitativeValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.>) + +Tableau > Autres caractéristiques + Tableau avec une entrée dans Sample.sampleMeasurements pour le pmfm choisi + +Tableau > Commentaire + Batch.comments + +Tableau > Pièces Jointes + Chaque pièce jointes est stockée dans MeasurementFile + (MEASUREMENT_FILE avec PMFM_FK=null, OBJECT_TYPE_FK='SAMPLE' et OBJECT_ID=<ID du lot de la ligne du tableau>) + MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) + MeasurementFile.name : nom + MeasurementFile.comments : commentaire + +Capture > Données individuelles +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Utilisation table *Sample* + +Utilisation table *Sample* + +Tableau + Chaque ligne du tableau est stockée sous la forme d'un prélèvement (Sample). + +Tableau > Espèce + Sample.referenceTaxon + +Tableau > Poids (g) + Sample.sampleMeasurements.numericalValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.WEIGHT_OBSERVED>) + +Tableau > Taille + Sample.sampleMeasurements.numericalValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.SEX>) + +Tableau > Classe de taille + Sample.sampleMeasurements.qualitativeValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=(celui choisi)) + +Tableau > Mort ou vivant + Sample.sampleMeasurements.qualitativeValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.DEAD_OR_ALIVE>) + +Tableau > Autres caractéristiques + Tableau avec une entrée dans Sample.sampleMeasurements pour le pmfm choisi + +Tableau > Code prélèvement pièce calcifiée + Sample.sampleMeasurements.alphanumericalValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.OTOLITHE_ID>) + +Tableau > Code prélèvement autre + Sample.sampleMeasurements.alphanumericalValue (SAMPLE_MEASUREMENT.QUALITATIVE_VALUE_FK avec PMFM_FK=<PmfmId.SAMPLE_ID>) + +Tableau > Commentaire + Batch.comments + +Tableau > Pièces Jointes + Chaque pièce jointes est stockée dans MeasurementFile + (MEASUREMENT_FILE avec PMFM_FK=null, OBJECT_TYPE_FK='SAMPLE' et OBJECT_ID=<ID du lot de la ligne du tableau>) + MeasurementFile.path : chemin du fichier (copier dans un répertoire, puis stocké en relatif) + MeasurementFile.name : nom + MeasurementFile.comments : commentaire + .. _détail des requêtes: referential.html \ No newline at end of file

1 0

r866 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: kmorin Date: 2013-04-23 11:22:23 +0200 (Tue, 23 Apr 2013) New Revision: 866 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/866 Log: fixme http://forge.codelutin.com/issues/2350 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-23 08:42:40 UTC (rev 865) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-23 09:22:23 UTC (rev 866) @@ -48,6 +48,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; @@ -383,7 +384,10 @@ Cache referentSpeciesByIdCache = cacheService.getCache("referentSpeciesById"); for (TaxonRefVO source : sources) { Species target = loadSpecies(source); - target.setRefTaxCode(target.getExternalCode()); + + // FIXME kmorin 20130423 http://forge.codelutin.com/issues/2350 + target.setRefTaxCode(StringUtils.trim(target.getExternalCode())); + if (target.isReferenceTaxon()) { // Add to cache : @@ -410,8 +414,10 @@ Cache referentSpeciesByIdCache = cacheService.getCache("referentSpeciesById"); for (TaxonRefVO source : sources) { Species target = loadSpecies(source); - target.setRefTaxCode(target.getExternalCode()); + // FIXME kmorin 20130423 http://forge.codelutin.com/issues/2350 + target.setRefTaxCode(StringUtils.trim(target.getExternalCode())); + // Add to cache : referentSpeciesByIdCache.put(target.getReferenceTaxonId(), target);

1 0

r865 - trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data
by tchemit＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: tchemit Date: 2013-04-23 10:42:40 +0200 (Tue, 23 Apr 2013) New Revision: 865 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/865 Log: add missing svn properties + ... Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml 2013-04-23 08:33:32 UTC (rev 864) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml 2013-04-23 08:42:40 UTC (rev 865) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml 2013-04-23 08:33:32 UTC (rev 864) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml 2013-04-23 08:42:40 UTC (rev 865) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml 2013-04-23 08:33:32 UTC (rev 864) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml 2013-04-23 08:42:40 UTC (rev 865) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml 2013-04-23 08:33:32 UTC (rev 864) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml 2013-04-23 08:42:40 UTC (rev 865) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r864 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: kmorin Date: 2013-04-23 10:33:32 +0200 (Tue, 23 Apr 2013) New Revision: 864 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/864 Log: add external code as reftax code Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-23 08:11:37 UTC (rev 863) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-04-23 08:33:32 UTC (rev 864) @@ -383,6 +383,7 @@ Cache referentSpeciesByIdCache = cacheService.getCache("referentSpeciesById"); for (TaxonRefVO source : sources) { Species target = loadSpecies(source); + target.setRefTaxCode(target.getExternalCode()); if (target.isReferenceTaxon()) { // Add to cache :

1 0

r863 - trunk/tutti-service
by tchemit＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: tchemit Date: 2013-04-23 10:11:37 +0200 (Tue, 23 Apr 2013) New Revision: 863 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/863 Log: optimize dependencies Modified: trunk/tutti-service/pom.xml Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-23 08:09:40 UTC (rev 862) +++ trunk/tutti-service/pom.xml 2013-04-23 08:11:37 UTC (rev 863) @@ -144,11 +144,6 @@ </dependency> <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - </dependency> - - <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> </dependency>

1 0

r862 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter tutti-ui-swing/
by kmorin＠users.forge.codelutin.com 23 Apr '13

23 Apr '13

Author: kmorin Date: 2013-04-23 10:09:40 +0200 (Tue, 23 Apr 2013) New Revision: 862 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/862 Log: put the validation in the validation service Added: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingService.java 2013-04-23 08:09:40 UTC (rev 862) @@ -45,6 +45,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorResult; +import org.nuiton.validator.NuitonValidatorScope; import java.util.List; import java.util.Map; @@ -251,7 +252,7 @@ catchBatch.setSpeciesTotalSortedComputedWeight(speciesTotalSortedWeight); } else if (speciesTotalSortedWeight < speciesTotalComputedSortedWeight) { - throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.species.error.incoherentTotalSorted")); + throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.species.incoherentTotalSorted")); } catchBatch.setSpeciesTotalUnsortedComputedWeight(speciesTotalComputedUnsortedWeight); @@ -307,7 +308,7 @@ catchBatch.setBenthosTotalSortedComputedWeight(benthosTotalSortedWeight); } else if (benthosTotalSortedWeight < benthosTotalComputedSortedWeight) { - throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.benthos.error.incoherentTotalSorted")); + throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted")); } catchBatch.setBenthosTotalUnsortedComputedWeight(benthosTotalComputedUnsortedWeight); @@ -338,7 +339,7 @@ marineLitterTotalWeight = marineLitterTotalComputedWeight; } else if (marineLitterTotalComputedWeight != null && marineLitterTotalWeight < marineLitterTotalComputedWeight) { - throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal")); + throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.marineLitter.incoherentTotal")); } // nothing to do with the marine litter weight, it is an isolated weight @@ -430,7 +431,7 @@ } else if (categoryWeight < sum) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight"), + _("tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight"), TuttiWeightComputingException.CatchType.SPECIES, thisIndex); @@ -479,7 +480,7 @@ // if the weight of the frequencies is different from the category // weight, then set the weight of the sample if (frequencyWeight > categoryWeight) { - throw new TuttiWeightComputingException(_("tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight"), + throw new TuttiWeightComputingException(_("tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight"), TuttiWeightComputingException.CatchType.SPECIES, thisIndex); @@ -488,7 +489,7 @@ } else if (!rowWeight.equals(frequencyWeight)) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency"), + _("tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency"), TuttiWeightComputingException.CatchType.SPECIES, thisIndex); } @@ -504,7 +505,7 @@ } if (result == null && batch.getParentBatch() == null) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.species.error.noWeight"), + _("tutti.service.operations.computeWeights.error.species.noWeight"), TuttiWeightComputingException.CatchType.SPECIES, thisIndex); } @@ -563,7 +564,7 @@ } else if (categoryWeight < sum) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight"), + _("tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight"), TuttiWeightComputingException.CatchType.BENTHOS, thisIndex); @@ -614,7 +615,7 @@ // weight, then set the weight of the sample if (frequencyWeight > categoryWeight) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight"), + _("tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight"), TuttiWeightComputingException.CatchType.BENTHOS, thisIndex); @@ -623,7 +624,7 @@ } else if (!rowWeight.equals(frequencyWeight)) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency"), + _("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency"), TuttiWeightComputingException.CatchType.BENTHOS, thisIndex); } @@ -640,7 +641,7 @@ if (result == null && batch.getParentBatch() == null) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.benthos.error.noWeight"), + _("tutti.service.operations.computeWeights.error.benthos.noWeight"), TuttiWeightComputingException.CatchType.BENTHOS, thisIndex); } @@ -657,9 +658,10 @@ List<MarineLitterBatch> children = rootMarineLitterBatch.getChildren(); for (int i = 0; i < children.size(); i++) { MarineLitterBatch batch = children.get(i); - if (batch.getWeight() == null) { + NuitonValidatorResult validator = validationService.validateMarineLitterBatch(batch); + if (validator.hasWarningMessages()) { throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.marineLitter.error.noWeight"), + _(validator.getMessagesForScope(NuitonValidatorScope.WARNING).get(0)), TuttiWeightComputingException.CatchType.MARINE_LITTER, i); } Added: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml (rev 0) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml 2013-04-23 08:09:40 UTC (rev 862) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="species"> + <field-validator type="required" short-circuit="true"> + <message> + tutti.service.operations.accidental.error.species.required + </message> + </field-validator> + </field> + +</validators> \ No newline at end of file Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml 2013-04-23 08:09:40 UTC (rev 862) @@ -33,14 +33,14 @@ <param name="expression"> <![CDATA[ !(sampleCategoryWeight == null && weight != null) ]]> </param> - <message>tutti.service.catches.computeWeights.error.incoherentRowWeightCategory</message> + <message>tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory</message> </field-validator> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ weight == null || sampleCategoryWeight == null || weight <= sampleCategoryWeight ]]> </param> - <message>tutti.service.catches.computeWeights.benthos.error.incoherentSampleWeight</message> + <message>tutti.service.operations.computeWeights.error.benthos.incoherentSampleWeight</message> </field-validator> </field> Added: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml (rev 0) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml 2013-04-23 08:09:40 UTC (rev 862) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="species"> + <field-validator type="required" short-circuit="true"> + <message> + tutti.service.operations.individualObservation.error.species.required + </message> + </field-validator> + </field> + + <field name="weight"> + <field-validator type="required" short-circuit="true"> + <message> + tutti.service.operations.individualObservation.error.weight.required + </message> + </field-validator> + </field> + + <field name="size"> + <field-validator type="required" short-circuit="true"> + <message> + tutti.service.operations.individualObservation.error.size.required + </message> + </field-validator> + </field> + + <field name="lengthStepCaracteristic"> + <field-validator type="required" short-circuit="true"> + <message> + tutti.service.operations.individualObservation.error.lengthStepCaracteristic.required + </message> + </field-validator> + </field> + +</validators> \ No newline at end of file Added: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml (rev 0) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml 2013-04-23 08:09:40 UTC (rev 862) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="marineLitterCategory"> + <field-validator type="required" short-circuit="true"> + <message>tutti.service.operations.marineLitter.error.marineLitterCategory.required</message> + </field-validator> + </field> + + <field name="marineLitterSizeCategory"> + <field-validator type="required" short-circuit="true"> + <message>tutti.service.operations.marineLitter.error.marineLitterSizeCategory.required</message> + </field-validator> + </field> + + <field name="number"> + <field-validator type="required" short-circuit="true"> + <message>tutti.service.operations.marineLitter.error.number.required</message> + </field-validator> + </field> + + +</validators> \ No newline at end of file Added: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml (rev 0) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-warning-validation.xml 2013-04-23 08:09:40 UTC (rev 862) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="weight"> + <field-validator type="required" short-circuit="true"> + <message>tutti.service.operations.marineLitter.warning.weight.required</message> + </field-validator> + </field> + +</validators> \ No newline at end of file Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml 2013-04-23 08:09:40 UTC (rev 862) @@ -33,14 +33,14 @@ <param name="expression"> <![CDATA[ !(sampleCategoryWeight == null && weight != null) ]]> </param> - <message>tutti.service.catches.computeWeights.error.incoherentRowWeightCategory</message> + <message>tutti.service.operations.computeWeights.error.species.incoherentRowWeightCategory</message> </field-validator> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ weight == null || sampleCategoryWeight == null || weight <= sampleCategoryWeight ]]> </param> - <message>tutti.service.catches.computeWeights.species.error.incoherentSampleWeight</message> + <message>tutti.service.operations.computeWeights.error.species.incoherentSampleWeight</message> </field-validator> </field> Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-23 08:09:40 UTC (rev 862) @@ -62,13 +62,29 @@ tutti.service.exportSumatra.header.species= tutti.service.exportSumatra.header.station= tutti.service.exportSumatra.header.weight= +tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency= tutti.service.operations.computeWeights.benthos.error.incoherentTotalSorted= tutti.service.operations.computeWeights.benthos.error.noWeight= +tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight= +tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight= +tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory= +tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency= +tutti.service.operations.computeWeights.error.benthos.incoherentSampleWeight= +tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted= +tutti.service.operations.computeWeights.error.benthos.noWeight= tutti.service.operations.computeWeights.error.incoherentRowWeightCategory= tutti.service.operations.computeWeights.error.incoherentTotal= +tutti.service.operations.computeWeights.error.marineLitter.incoherentTotal= +tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight= +tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight= +tutti.service.operations.computeWeights.error.species.incoherentRowWeightCategory= +tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency= +tutti.service.operations.computeWeights.error.species.incoherentSampleWeight= +tutti.service.operations.computeWeights.error.species.incoherentTotalSorted= +tutti.service.operations.computeWeights.error.species.noWeight= tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal= tutti.service.operations.computeWeights.marineLitter.error.noWeight= tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight= @@ -77,6 +93,18 @@ tutti.service.operations.computeWeights.species.error.incoherentTotalSorted= tutti.service.operations.computeWeights.species.error.noWeight= tutti.service.operations.exportCatchesReport.error= +tutti.service.operations.individualObservation.error.lengthStepCaracteristic.required= +tutti.service.operations.individualObservation.error.size.required= +tutti.service.operations.individualObservation.error.species.required= +tutti.service.operations.individualObservation.error.weight.required= +tutti.service.operations.marineLitter.error.marineLitterCategory.required= +tutti.service.operations.marineLitter.error.marineLitterSizeCategory.required= +tutti.service.operations.marineLitter.error.number.required= +tutti.service.operations.marineLitter.warning.weight.required= +tutti.service.operations.validate.marineLitter.error.marineLitterCategory.required= +tutti.service.operations.validate.marineLitter.error.marineLitterSizeCategory.required= +tutti.service.operations.validate.marineLitter.error.number.required= +tutti.service.operations.validate.marineLitter.warning.weight.required= tutti.validator.error.comment.too.long= tutti.validator.error.cruise.beginDate.required= tutti.validator.error.cruise.dates.endBeforeStart= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-23 08:09:40 UTC (rev 862) @@ -62,21 +62,33 @@ tutti.service.exportSumatra.header.species=Espèce tutti.service.exportSumatra.header.station=Station tutti.service.exportSumatra.header.weight=Total -tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight=Le poids total des mensurations d'un lot du benthos est supérieur au poids de la catégorie -tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot du benthos est différent de la somme des poids de ses sous-catégories -tutti.service.operations.computeWeights.benthos.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot du benthos est différent du poids du sous-échantillon -tutti.service.operations.computeWeights.benthos.error.incoherentTotalSorted=Le poids total Vrac du benthos est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié -tutti.service.operations.computeWeights.benthos.error.noWeight=Un lot du benthos n'a pas de poids +tutti.service.operations.accidental.error.species.required=L'espèce est obligatoire +tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=Le poids total des mensurations d'un lot du benthos est supérieur au poids de la catégorie +tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot du benthos est différent de la somme des poids de ses sous-catégories +tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. +tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot du benthos est différent du poids du sous-échantillon +tutti.service.operations.computeWeights.error.benthos.incoherentSampleWeight=Le poids de sous-échantillon est supérieur au poids du lot. +tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted=Le poids total Vrac du benthos est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié +tutti.service.operations.computeWeights.error.benthos.noWeight=Un lot du benthos n'a pas de poids tutti.service.operations.computeWeights.error.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. tutti.service.operations.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés -tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal=Le poids total des macro-déchets est inférieur à la somme des poids des macro-déchets saisis -tutti.service.operations.computeWeights.marineLitter.error.noWeight=Un lot de macro-déchets n'a pas de poids -tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight= -tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot des espèces est différent de la somme des poids de ses sous-catégories -tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot des espèces est différent du poids du sous-échantillon -tutti.service.operations.computeWeights.species.error.incoherentTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié -tutti.service.operations.computeWeights.species.error.noWeight=Un lot des espèces n'a pas de poids +tutti.service.operations.computeWeights.error.marineLitter.incoherentTotal=Le poids total des macro-déchets est inférieur à la somme des poids des macro-déchets saisis +tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight=Le poids total des mensurations d'un lot des espèces est supérieur au poids de la catégorie +tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot des espèces est différent de la somme des poids de ses sous-catégories +tutti.service.operations.computeWeights.error.species.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids. +tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot des espèces est différent du poids du sous-échantillon +tutti.service.operations.computeWeights.error.species.incoherentSampleWeight=Le poids de sous-échantillon est supérieur au poids du lot. +tutti.service.operations.computeWeights.error.species.incoherentTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié +tutti.service.operations.computeWeights.error.species.noWeight=Un lot des espèces n'a pas de poids tutti.service.operations.exportCatchesReport.error=Erreur lors de la génération du rapport des captures +tutti.service.operations.individualObservation.error.lengthStepCaracteristic.required=La classe de taille est obligatoire +tutti.service.operations.individualObservation.error.size.required=La taille est obligatoire +tutti.service.operations.individualObservation.error.species.required=L'espèce est obligatoire +tutti.service.operations.individualObservation.error.weight.required=Le poids est obligatoire +tutti.service.operations.marineLitter.error.marineLitterCategory.required=La catégorie du lot de macro-déchet est obligatoire +tutti.service.operations.marineLitter.error.marineLitterSizeCategory.required=La catégorie de taille du lot de macro-déchet est obligatoire +tutti.service.operations.marineLitter.error.number.required=Le nombre du lot de macro-déchet est obligatoire +tutti.service.operations.marineLitter.warning.weight.required=Un lot de macro-déchets n'a pas de poids tutti.validator.error.comment.too.long=Taille de commentaire trop longue (limitée à %s caractères) tutti.validator.error.cruise.beginDate.required=La date de début est obligatoire tutti.validator.error.cruise.dates.endBeforeStart=La date de fin doit être après la date de début Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-23 08:09:40 UTC (rev 862) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -61,6 +62,7 @@ import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; +import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; import java.awt.Color; @@ -80,6 +82,8 @@ private static final Log log = LogFactory.getLog(AccidentalBatchUIHandler.class); + protected ValidationService validationService = getContext().getValidationService(); + public AccidentalBatchUIHandler(TuttiUI<?, ?> parentUi, AccidentalBatchUI ui) { super(parentUi, ui, @@ -162,7 +166,9 @@ @Override protected boolean isRowValid(AccidentalBatchRowModel row) { - boolean result = row.getSpecies() != null; + AccidentalBatch batch = row.toBean(); + NuitonValidatorResult validator = validationService.validateAccidentalBatch(batch); + boolean result = !validator.hasErrorMessagess(); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-23 08:09:40 UTC (rev 862) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -60,6 +61,7 @@ import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; +import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; import java.awt.Color; @@ -78,6 +80,8 @@ private static final Log log = LogFactory.getLog(IndividualObservationBatchUIHandler.class); + protected ValidationService validationService = getContext().getValidationService(); + public IndividualObservationBatchUIHandler(TuttiUI<?, ?> parentUi, IndividualObservationBatchUI ui) { super(parentUi, ui, IndividualObservationBatchRowModel.PROPERTY_SPECIES, @@ -158,11 +162,10 @@ @Override protected boolean isRowValid(IndividualObservationBatchRowModel row) { -// boolean result = row.getMarineLitterCategory() != null && -// row.getMarineLitterSizeCategory() != null && -// row.getNumber() != null; -// return result; - return true; + IndividualObservationBatch batch = row.toBean(); + NuitonValidatorResult validator = validationService.validateIndividualObservationBatch(batch); + boolean result = !validator.hasErrorMessagess(); + return result; } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-23 08:09:40 UTC (rev 862) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -58,6 +59,7 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; import java.awt.Color; @@ -71,10 +73,11 @@ */ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler<MarineLitterBatchRowModel, MarineLitterBatchUIModel, MarineLitterBatchUI> { - /** Logger. */ private static final Log log = LogFactory.getLog(MarineLitterBatchUIHandler.class); + protected ValidationService validationService = getContext().getValidationService(); + public MarineLitterBatchUIHandler(TuttiUI<?, ?> parentUi, MarineLitterBatchUI ui) { super(parentUi, ui, MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_CATEGORY, @@ -163,9 +166,9 @@ @Override protected boolean isRowValid(MarineLitterBatchRowModel row) { - boolean result = row.getMarineLitterCategory() != null && - row.getMarineLitterSizeCategory() != null && - row.getNumber() != null; + MarineLitterBatch batch = row.toBean(); + NuitonValidatorResult validator = validationService.validateMarineLitterBatch(batch); + boolean result = !validator.hasErrorMessagess(); return result; } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-23 08:09:40 UTC (rev 862) @@ -39,6 +39,7 @@ tutti.attachmentEditor.saveAttachment.warning.title= tutti.attachmentEditor.text= tutti.attachmentEditor.title= +tutti.caracteristicMapEditor.none.tip= tutti.caracteristicMapEditorTable.table.header.key= tutti.caracteristicMapEditorTable.table.header.value= tutti.commentEditor.action.close.tip= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-23 07:34:30 UTC (rev 861) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-23 08:09:40 UTC (rev 862) @@ -28,7 +28,6 @@ tutti.attachmentEditor.field.file=Fichier tutti.attachmentEditor.field.fileComment=Commentaire tutti.attachmentEditor.field.fileName=Nom -tutti.caracteristicMapEditor.none.tip=Pas de caractéristiques tutti.attachmentEditor.none.tip=Pas de pièce-jointes tutti.attachmentEditor.saveAttachment.button=Enregistrer tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier. @@ -40,6 +39,7 @@ tutti.attachmentEditor.saveAttachment.warning.title=Fichier existant tutti.attachmentEditor.text=(%s) tutti.attachmentEditor.title=Pièces jointes +tutti.caracteristicMapEditor.none.tip=Pas de caractéristiques tutti.caracteristicMapEditorTable.table.header.key=Caractéristique tutti.caracteristicMapEditorTable.table.header.value=Valeur tutti.commentEditor.action.close.tip=Fermer la fenêtre des commentaires

1 0