branch develop updated (08a36cc -> f88c42c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 08a36cc [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' into develop new 9743554 renommage champs source en computed (persistence) new f0fedec renommage champs source en computed (service) new de7ec84 renommage champs source en computed (ui) new e3bd0f8 [iso] factorisation de code new 7a7204e [PS] Renommer 2 champs dans nontargetlength (Fixes #8389) Merge branch 'feature/8389' into develop new df70644 Renommage script de migration new d3be653 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (persistence) new 76ebec9 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (service) new 6119279 Improve log levels new d1d368d Fix show config if no data source is open new 6e60cfc Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (ui) new f88c42c [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f88c42c32bf75b434e8b3ecc28819ef27018c356 Merge: df70644 6e60cfc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:18:59 2016 +0100 [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop commit 6e60cfcd1abdfd685f70337570e68f62295bb272 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:18:24 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (ui) commit d1d368d1a8a261f598e6504728d5352f244c5715 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:17:44 2016 +0100 Fix show config if no data source is open commit 611927925a64362eb06acb81e6af345ceb4e4082 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:17:19 2016 +0100 Improve log levels commit 76ebec9a3adf965e93b48ab6617631a47d7529f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:16:57 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (service) commit d3be653452f118feb17e688a8b48824115433fb3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:15:06 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (persistence) commit df706446d7b4331024e76165327625bbb09f32ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 14:24:56 2016 +0100 Renommage script de migration commit 7a7204e1fedbf91230af61f8f9a6bd1447a34bef Merge: 08a36cc e3bd0f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 13:02:18 2016 +0100 [PS] Renommer 2 champs dans nontargetlength (Fixes #8389) Merge branch 'feature/8389' into develop commit e3bd0f87385c4418f3581feec0ff1fc4de77ed38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 13:01:41 2016 +0100 [iso] factorisation de code commit de7ec844610f7f125d27ca1cdbfea398d4c2b597 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:48:05 2016 +0100 renommage champs source en computed (ui) commit f0fedec7809b10771bf05178cf586c008f02408b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:47:55 2016 +0100 renommage champs source en computed (service) commit 97435540e3294449aa7adaca981cb807de1b0aaa Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:47:40 2016 +0100 renommage champs source en computed (persistence) Summary of changes: .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 2 +- .../swing/decoration/DecoratorService.java | 4 +- ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 18 +++++ .../application-swing-validation_en_GB.properties | 3 + .../application-swing-validation_es_ES.properties | 3 + .../application-swing-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../swing/ui/actions/ShowConfigAction.java | 4 +- .../ref/impl/{longline => }/SizeMeasureTypeUI.jaxx | 8 +- .../{longline => }/SizeMeasureTypeUIModel.java | 4 +- .../impl/{longline => }/WeightMeasureTypeUI.jaxx | 8 +- .../{longline => }/WeightMeasureTypeUIModel.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 8 +- .../table/impl/seine/AbstractSampleUIHandler.java | 53 +++++++++++++ .../table/impl/seine/NonTargetSampleUI.jaxx | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 49 +++--------- .../table/impl/seine/NonTargetSampleUIModel.java | 4 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 30 +++---- .../content/table/impl/seine/TargetSampleUI.jcss | 24 ++++-- .../table/impl/seine/TargetSampleUIHandler.java | 87 +++++++++++---------- .../table/impl/seine/TargetSampleUIModel.java | 15 ++-- .../i18n/application-swing_en_GB.properties | 5 +- .../i18n/application-swing_es_ES.properties | 5 +- .../i18n/application-swing_fr_FR.properties | 5 +- .../DataSourceMigrationForVersion_5_1.java | 64 +++++++++++++++ .../resources/db/3.5/traduction_attributes.csv | 2 +- ...1_03_evol_6997_delete_supportVesselName-H2.sql} | 0 ...1_03_evol_6997_delete_supportVesselName-PG.sql} | 0 .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 4 + .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 4 + .../V5_1_08_evol_8390_measure_type-H2.sql | 19 +++++ .../V5_1_08_evol_8390_measure_type-PG.sql | 18 +++++ .../observe/entities/LengthWeightComputable.java | 8 +- .../observe/entities/seine/NonTargetCatchImpl.java | 8 +- entities/src/main/xmi/observe-common.zargo | Bin 37331 -> 37986 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93635 -> 93649 bytes entities/src/main/xmi/observe-seine.zargo | Bin 83528 -> 85633 bytes .../observe/services/dto/AbstractReference.java | 2 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../request/ReferenceSetRequestDefinitions.java | 7 +- .../dto/referential/ReferentialHelper.java | 8 +- .../dto/referential/SizeMeasureTypeHelper.java | 58 ++++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 42563 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67604 -> 67880 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59440 -> 59655 bytes services-dto/src/main/xmi/observe-services-dto.ini | 5 +- .../actions/validate/ValidateServiceRestTest.java | 4 +- .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 17 ++++ .../services-topia-validation_en_GB.properties | 3 + .../services-topia-validation_es_ES.properties | 3 + .../services-topia-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 8 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../topia/binder/data/SizeMeasureBinder.java | 4 +- .../topia/binder/data/TargetLengthBinder.java | 14 ++-- .../topia/binder/data/WeightMeasureBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 32 ++++---- .../services/topia/binder/BinderEngineTest.java | 4 +- .../actions/validate/ValidateServiceTopiaTest.java | 4 +- .../src/main/filters/observe-reports.properties | 16 ++-- 79 files changed, 486 insertions(+), 225 deletions(-) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-create-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-create-warning-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-update-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-update-warning-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-create-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-create-warning-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-update-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-update-warning-validation.xml (100%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/SizeMeasureTypeUI.jaxx (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/SizeMeasureTypeUIModel.java (89%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/WeightMeasureTypeUI.jaxx (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/WeightMeasureTypeUIModel.java (88%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java rename entities-migration/src/main/resources/db/migration/{V5_1_03_evol-6997_delete_supportVesselName-PG.sql => V5_1_03_evol_6997_delete_supportVesselName-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{V5_1_03_evol-6997_delete_supportVesselName-H2.sql => V5_1_03_evol_6997_delete_supportVesselName-PG.sql} (100%) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/SizeMeasureType-service-error-validation.xml (100%) rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/SizeMeasureType-service-warning-validation.xml (100%) rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/WeightMeasureType-service-error-validation.xml (100%) rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/WeightMeasureType-service-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 97435540e3294449aa7adaca981cb807de1b0aaa Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:47:40 2016 +0100 renommage champs source en computed (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 4 ++++ .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 4 ++++ .../observe/entities/LengthWeightComputable.java | 8 ++++---- .../observe/entities/seine/NonTargetCatchImpl.java | 8 ++++---- entities/src/main/xmi/observe-seine.zargo | Bin 83528 -> 83500 bytes 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 2cccfe5..dbddf29 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -33,6 +33,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("04", "evol_6832_branchlineComposition_add_tracelineLength", queries); addScript("05", "evol_6999_nonTargetCatch_add_well", queries); addScript("06", "evol_8375_setSeine_add_booleans", queries); + addScript("07", "evol_8389_rename_source_columns", queries); } diff --git a/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql new file mode 100644 index 0000000..dfb007e --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql @@ -0,0 +1,4 @@ +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql new file mode 100644 index 0000000..dfb007e --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql @@ -0,0 +1,4 @@ +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; \ No newline at end of file diff --git a/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java b/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java index ad10554..9507b10 100644 --- a/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java +++ b/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java @@ -30,16 +30,16 @@ public interface LengthWeightComputable extends TopiaEntity { void setLength(Float length); - boolean isLengthSource(); + boolean isIsLengthComputed(); - void setLengthSource(boolean lengthSource); + void setIsLengthComputed(boolean lengthSource); Float getWeight(); void setWeight(Float weight); - boolean isWeightSource(); + boolean isIsWeightComputed(); - void setWeightSource(boolean weightSource); + void setIsWeightComputed(boolean weightSource); } //LengthWeightComputable diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java index 0f0a497..810a7c3 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java @@ -58,12 +58,12 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { } @Override - public boolean isLengthSource() { + public boolean isIsLengthComputed() { return isMeanLengthComputed(); } @Override - public void setLengthSource(boolean lengthSource) { + public void setIsLengthComputed(boolean lengthSource) { setMeanLengthComputedSource(NonTargetCatchComputedValueSourcePersist.fromData); } @@ -78,12 +78,12 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { } @Override - public boolean isWeightSource() { + public boolean isIsWeightComputed() { return isMeanWeightComputed(); } @Override - public void setWeightSource(boolean weightSource) { + public void setIsWeightComputed(boolean weightSource) { setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.fromData); } diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 738b0ac..a341754 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f0fedec7809b10771bf05178cf586c008f02408b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:47:55 2016 +0100 renommage champs source en computed (service) --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59440 -> 59419 bytes .../topia/binder/data/NonTargetLengthBinder.java | 8 +++--- .../topia/binder/data/TargetLengthBinder.java | 8 +++--- .../consolidate/ConsolidateDataServiceTopia.java | 32 ++++++++++----------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 43c7aa0..2c55ad2 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index 44ea733..48e1d5a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java @@ -48,8 +48,8 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No entity.setLength(dto.getLength()); entity.setWeight(dto.getWeight()); - entity.setLengthSource(dto.isLengthSource()); - entity.setWeightSource(dto.isWeightSource()); + entity.setIsLengthComputed(dto.isIsLengthComputed()); + entity.setIsWeightComputed(dto.isIsWeightComputed()); entity.setCount(dto.getCount()); entity.setAcquisitionMode(dto.getAcquisitionMode()); entity.setPicturesReferences(dto.getPicturesReferences()); @@ -66,8 +66,8 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No dto.setLength(entity.getLength()); dto.setWeight(entity.getWeight()); - dto.setLengthSource(entity.isLengthSource()); - dto.setWeightSource(entity.isWeightSource()); + dto.setIsLengthComputed(entity.isIsLengthComputed()); + dto.setIsWeightComputed(entity.isIsWeightComputed()); dto.setCount(entity.getCount()); dto.setAcquisitionMode(entity.getAcquisitionMode()); dto.setPicturesReferences(entity.getPicturesReferences()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java index bfdc931..2b90249 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java @@ -48,10 +48,10 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setMeasureType(dto.getMeasureType()); entity.setLength(dto.getLength()); - entity.setLengthSource(dto.isLengthSource()); + entity.setIsLengthComputed(dto.isIsLengthComputed()); entity.setCount(dto.getCount()); entity.setWeight(dto.getWeight()); - entity.setWeightSource(dto.isWeightSource()); + entity.setIsWeightComputed(dto.isIsWeightComputed()); entity.setAcquisitionMode(dto.getAcquisitionMode()); } @@ -64,10 +64,10 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setMeasureType(entity.getMeasureType()); dto.setLength(entity.getLength()); - dto.setLengthSource(entity.isLengthSource()); + dto.setIsLengthComputed(entity.isIsLengthComputed()); dto.setCount(entity.getCount()); dto.setWeight(entity.getWeight()); - dto.setWeightSource(entity.isWeightSource()); + dto.setIsWeightComputed(entity.isIsWeightComputed()); dto.setAcquisitionMode(entity.getAcquisitionMode()); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index 4724052..6e14b14 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -98,15 +98,15 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements BeanMonitor targetLengthMonitor = new BeanMonitor( TargetLength.PROPERTY_LENGTH, - TargetLength.PROPERTY_LENGTH_SOURCE, + TargetLength.PROPERTY_IS_LENGTH_COMPUTED, TargetLength.PROPERTY_WEIGHT, - TargetLength.PROPERTY_WEIGHT_SOURCE); + TargetLength.PROPERTY_IS_WEIGHT_COMPUTED); BeanMonitor nonTargetSampleMonitor = new BeanMonitor( NonTargetLength.PROPERTY_LENGTH, - NonTargetLength.PROPERTY_LENGTH_SOURCE, + NonTargetLength.PROPERTY_IS_LENGTH_COMPUTED, NonTargetLength.PROPERTY_WEIGHT, - NonTargetLength.PROPERTY_WEIGHT_SOURCE); + NonTargetLength.PROPERTY_IS_WEIGHT_COMPUTED); BeanMonitor nonTargetCatchMonitor = new BeanMonitor( NonTargetCatch.PROPERTY_MEAN_LENGTH, @@ -550,7 +550,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newLength != null) { lengthWeightComputable.setLength(newLength); - lengthWeightComputable.setLengthSource(true); + lengthWeightComputable.setIsLengthComputed(true); return; } @@ -566,7 +566,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newWeight != null) { lengthWeightComputable.setWeight(newWeight); - lengthWeightComputable.setWeightSource(true); + lengthWeightComputable.setIsWeightComputed(true); } } @@ -611,7 +611,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newLength != null) { lengthWeightComputable.setLength(newLength); - lengthWeightComputable.setLengthSource(true); + lengthWeightComputable.setIsLengthComputed(true); return; } @@ -625,7 +625,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newWeight != null) { lengthWeightComputable.setWeight(newWeight); - lengthWeightComputable.setWeightSource(true); + lengthWeightComputable.setIsWeightComputed(true); } } @@ -686,29 +686,29 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements public void watchTargetLength(TargetLength targetLength) { targetLengthMonitor.setBean(targetLength); - if (targetLength.isLengthSource()) { + if (targetLength.isIsLengthComputed()) { // Reset de la valeur calculée targetLength.setLength(null); - targetLength.setLengthSource(false); + targetLength.setIsLengthComputed(false); } - if (targetLength.isWeightSource()) { + if (targetLength.isIsWeightComputed()) { // Reset de la valeur calculée targetLength.setWeight(null); - targetLength.setWeightSource(false); + targetLength.setIsWeightComputed(false); } } public void watchNonTargetLenght(NonTargetLength nonTargetLength) { nonTargetLengthMonitor.setBean(nonTargetLength); - if (nonTargetLength.isLengthSource()) { + if (nonTargetLength.isIsLengthComputed()) { // Reset de la valeur calculée nonTargetLength.setLength(null); - nonTargetLength.setLengthSource(false); + nonTargetLength.setIsLengthComputed(false); } - if (nonTargetLength.isWeightSource()) { + if (nonTargetLength.isIsWeightComputed()) { // Reset de la valeur calculée nonTargetLength.setWeight(null); - nonTargetLength.setWeightSource(false); + nonTargetLength.setIsWeightComputed(false); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit de7ec844610f7f125d27ca1cdbfea398d4c2b597 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:48:05 2016 +0100 renommage champs source en computed (ui) --- .../ui/content/table/impl/seine/AbstractSampleUI.jcss | 8 ++++---- .../ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 4 ++-- .../table/impl/seine/NonTargetSampleUIHandler.java | 16 ++++++++-------- .../content/table/impl/seine/NonTargetSampleUIModel.java | 4 ++-- .../ui/content/table/impl/seine/TargetSampleUI.jaxx | 4 ++-- .../content/table/impl/seine/TargetSampleUIHandler.java | 16 ++++++++-------- .../ui/content/table/impl/seine/TargetSampleUIModel.java | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss index dab0bac..c208566 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss @@ -58,8 +58,8 @@ JToolBar { #lengthSourceInformation { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; - enabled: {tableEditBean.isLengthSource()}; - toolTipText:{getLengthDataTip(tableEditBean.isLengthSource())}; + enabled: {tableEditBean.isIsLengthComputed()}; + toolTipText:{getLengthDataTip(tableEditBean.isIsLengthComputed())}; } #weightLabel { @@ -77,8 +77,8 @@ JToolBar { #weightSourceInformation { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; - enabled: {tableEditBean.isWeightSource()}; - toolTipText:{getWeightDataTip(tableEditBean.isWeightSource())}; + enabled: {tableEditBean.isIsWeightComputed()}; + toolTipText:{getWeightDataTip(tableEditBean.isIsWeightComputed())}; } #comment { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 60764b8..81581f5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -148,7 +148,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <cell anchor='east'> <JToolBar id='lengthSourceAction'> <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetLengthSource()'/> + onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -164,7 +164,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <cell anchor='east'> <JToolBar id='weightSourceAction'> <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetWeightSource()'/> + onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 48e70f5..3e58c87 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -67,7 +67,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam /** * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getWeight()}, - * et repasser alors le flag {@link NonTargetLengthDto#isWeightSource()} à + * et repasser alors le flag {@link NonTargetLengthDto#isIsWeightComputed()} à * {@code false}. * * @since 3.0 @@ -76,7 +76,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam /** * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getLength()}, - * et repasser alors le flag {@link NonTargetLengthDto#isLengthSource()} à + * et repasser alors le flag {@link NonTargetLengthDto#isIsLengthComputed()} à * {@code false}. * * @since 3.0 @@ -87,11 +87,11 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam super(ui, DataContextType.SetSeine); weightChanged = evt -> { NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setWeightSource(false); + source.setIsWeightComputed(false); }; lengthChanged = evt -> { NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setLengthSource(false); + source.setIsLengthComputed(false); }; } @@ -100,13 +100,13 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam return (NonTargetSampleUI) super.getUi(); } - public void resetWeightSource() { - getTableEditBean().setWeightSource(false); + public void resetIsWeightComputed() { + getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } - public void resetLengthSource() { - getTableEditBean().setLengthSource(false); + public void resetIsLengthComputed() { + getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java index 8422035..495344b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -54,9 +54,9 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD NonTargetSampleDto.PROPERTY_COMMENT}, new String[]{NonTargetLengthDto.PROPERTY_SPECIES, NonTargetLengthDto.PROPERTY_LENGTH, - NonTargetLengthDto.PROPERTY_LENGTH_SOURCE, + NonTargetLengthDto.PROPERTY_IS_LENGTH_COMPUTED, NonTargetLengthDto.PROPERTY_WEIGHT, - NonTargetLengthDto.PROPERTY_WEIGHT_SOURCE, + NonTargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, NonTargetLengthDto.PROPERTY_SEX, NonTargetLengthDto.PROPERTY_COUNT, NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index 0e0e2c6..a0092bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -138,7 +138,7 @@ public String getLengthDataTip(boolean computed) { <cell anchor='east'> <JToolBar id='lengthSourceAction'> <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetLengthSource()'/> + onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -154,7 +154,7 @@ public String getLengthDataTip(boolean computed) { <cell anchor='east'> <JToolBar id='weightSourceAction'> <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetWeightSource()'/> + onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 3ca2115..4f4fcdb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -73,7 +73,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, - * et repasser alors le flag {@link TargetLengthDto#isWeightSource()} à + * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à * {@code false}. * * @since 3.0 @@ -82,7 +82,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()}, - * et repasser alors le flag {@link TargetLengthDto#isLengthSource()} à + * et repasser alors le flag {@link TargetLengthDto#isIsLengthComputed()} à * {@code false}. * * @since 3.0 @@ -95,11 +95,11 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto this.discarded = discarded; weightChanged = evt -> { TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setWeightSource(false); + source.setIsWeightComputed(false); }; lengthChanged = evt -> { TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setLengthSource(false); + source.setIsLengthComputed(false); }; } @@ -108,13 +108,13 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto return (TargetSampleUI) super.getUi(); } - public void resetWeightSource() { - getTableEditBean().setWeightSource(false); + public void resetIsWeightComputed() { + getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } - public void resetLengthSource() { - getTableEditBean().setLengthSource(false); + public void resetIsLengthComputed() { + getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index 27f4dd1..605ed3c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -55,9 +55,9 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta new String[]{ TargetLengthDto.PROPERTY_SPECIES, TargetLengthDto.PROPERTY_LENGTH, - TargetLengthDto.PROPERTY_LENGTH_SOURCE, + TargetLengthDto.PROPERTY_IS_LENGTH_COMPUTED, TargetLengthDto.PROPERTY_WEIGHT, - TargetLengthDto.PROPERTY_WEIGHT_SOURCE, + TargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, TargetLengthDto.PROPERTY_COUNT, TargetLengthDto.PROPERTY_MEASURE_TYPE, TargetLengthDto.PROPERTY_ACQUISITION_MODE}); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e3bd0f87385c4418f3581feec0ff1fc4de77ed38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 13:01:41 2016 +0100 [iso] factorisation de code --- .../table/impl/seine/AbstractSampleUIHandler.java | 53 ++++++++++++++++++++++ .../table/impl/seine/NonTargetSampleUIHandler.java | 41 +++-------------- .../table/impl/seine/TargetSampleUIHandler.java | 39 +++------------- 3 files changed, 66 insertions(+), 67 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java new file mode 100644 index 0000000..5c74528 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java @@ -0,0 +1,53 @@ +package fr.ird.observe.application.swing.ui.content.table.impl.seine; + +import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; + +import java.beans.PropertyChangeListener; + +/** + * Created on 31/10/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto> extends ContentTableUIHandler<E, D> { + + /** + * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, + * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à + * {@code false}. + * + * @since 3.0 + */ + protected final PropertyChangeListener weightChanged; + + /** + * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()}, + * et repasser alors le flag {@link TargetLengthDto#isIsLengthComputed()} à + * {@code false}. + * + * @since 3.0 + */ + protected final PropertyChangeListener lengthChanged; + + protected AbstractSampleUIHandler(ObserveContentTableUI<E, D> ui) { + super(ui, DataContextType.SetSeine); + weightChanged = evt -> { + TargetLengthDto source = (TargetLengthDto) evt.getSource(); + source.setIsWeightComputed(false); + }; + lengthChanged = evt -> { + TargetLengthDto source = (TargetLengthDto) evt.getSource(); + source.setIsLengthComputed(false); + }; + } + + public abstract void resetIsWeightComputed(); + + public abstract void resetIsLengthComputed(); + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 3e58c87..5aa7646 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -24,7 +24,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -36,10 +38,6 @@ import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.NonTargetSampleService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -47,7 +45,6 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -60,39 +57,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSampleDto, NonTargetLengthDto> { +public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetSampleDto, NonTargetLengthDto> { /** Logger */ private static final Log log = LogFactory.getLog(NonTargetSampleUIHandler.class); - /** - * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getWeight()}, - * et repasser alors le flag {@link NonTargetLengthDto#isIsWeightComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener weightChanged; - - /** - * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getLength()}, - * et repasser alors le flag {@link NonTargetLengthDto#isIsLengthComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener lengthChanged; - public NonTargetSampleUIHandler(NonTargetSampleUI ui) { - super(ui, DataContextType.SetSeine); - weightChanged = evt -> { - NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setIsWeightComputed(false); - }; - lengthChanged = evt -> { - NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setIsLengthComputed(false); - }; + super(ui); } @Override @@ -100,11 +71,13 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam return (NonTargetSampleUI) super.getUi(); } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } + @Override public void resetIsLengthComputed() { getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 4f4fcdb..6dfdb3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -23,12 +23,10 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -46,7 +44,6 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import java.beans.PropertyChangeListener; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -58,7 +55,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto, TargetLengthDto> { +public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleDto, TargetLengthDto> { /** Logger */ private static final Log log = LogFactory.getLog(TargetSampleUIHandler.class); @@ -71,36 +68,10 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto */ protected final boolean discarded; - /** - * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, - * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener weightChanged; - - /** - * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()}, - * et repasser alors le flag {@link TargetLengthDto#isIsLengthComputed()} à - * {@code false}. - * - * @since 3.0 - */ - protected final PropertyChangeListener lengthChanged; - public TargetSampleUIHandler(ContentTableUI<TargetSampleDto, TargetLengthDto> ui, boolean discarded) { - super(ui, DataContextType.SetSeine); + super(ui); this.discarded = discarded; - weightChanged = evt -> { - TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setIsWeightComputed(false); - }; - lengthChanged = evt -> { - TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setIsLengthComputed(false); - }; } @Override @@ -108,11 +79,13 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto return (TargetSampleUI) super.getUi(); } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } + @Override public void resetIsLengthComputed() { getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); @@ -233,8 +206,8 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto NuitonValidatorScope.INFO, getTypeI18nKey(SetSeineDto.class), discarded ? - t("observe.content.setSeine.message.no.targetCatch") : - t("observe.content.setSeine.message.no.targetDiscarded") + t("observe.content.setSeine.message.no.targetCatch") : + t("observe.content.setSeine.message.no.targetDiscarded") ); } return mode; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7a7204e1fedbf91230af61f8f9a6bd1447a34bef Merge: 08a36cc e3bd0f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 13:02:18 2016 +0100 [PS] Renommer 2 champs dans nontargetlength (Fixes #8389) Merge branch 'feature/8389' into develop .../content/table/impl/seine/AbstractSampleUI.jcss | 8 ++-- .../table/impl/seine/AbstractSampleUIHandler.java | 53 +++++++++++++++++++++ .../table/impl/seine/NonTargetSampleUI.jaxx | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 49 +++++-------------- .../table/impl/seine/NonTargetSampleUIModel.java | 4 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 47 ++++-------------- .../table/impl/seine/TargetSampleUIModel.java | 4 +- .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 4 ++ .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 4 ++ .../observe/entities/LengthWeightComputable.java | 8 ++-- .../observe/entities/seine/NonTargetCatchImpl.java | 8 ++-- entities/src/main/xmi/observe-seine.zargo | Bin 83528 -> 83500 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59440 -> 59419 bytes .../topia/binder/data/NonTargetLengthBinder.java | 8 ++-- .../topia/binder/data/TargetLengthBinder.java | 8 ++-- .../consolidate/ConsolidateDataServiceTopia.java | 32 ++++++------- 18 files changed, 127 insertions(+), 119 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit df706446d7b4331024e76165327625bbb09f32ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 14:24:56 2016 +0100 Renommage script de migration --- ...esselName-PG.sql => V5_1_03_evol_6997_delete_supportVesselName-H2.sql} | 0 ...esselName-H2.sql => V5_1_03_evol_6997_delete_supportVesselName-PG.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-PG.sql rename to entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-H2.sql rename to entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d3be653452f118feb17e688a8b48824115433fb3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:15:06 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (persistence) --- .../DataSourceMigrationForVersion_5_1.java | 63 +++++++++++++++++++++ .../resources/db/3.5/traduction_attributes.csv | 2 +- .../V5_1_08_evol_8390_measure_type-H2.sql | 19 +++++++ .../V5_1_08_evol_8390_measure_type-PG.sql | 18 ++++++ entities/src/main/xmi/observe-common.zargo | Bin 37331 -> 37986 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93635 -> 93649 bytes entities/src/main/xmi/observe-seine.zargo | Bin 83500 -> 85633 bytes 7 files changed, 101 insertions(+), 1 deletion(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index dbddf29..d3ac6b2 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -5,8 +5,13 @@ import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.List; /** @@ -34,8 +39,66 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("05", "evol_6999_nonTargetCatch_add_well", queries); addScript("06", "evol_8375_setSeine_add_booleans", queries); addScript("07", "evol_8389_rename_source_columns", queries); + addScript("08", "evol_8390_measure_type", queries); + + { + List<String> oldIds = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizemeasuretype"); + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + + String newIdPrefix = "fr.ird.observe.entities.referentiel.SizeMeasureType#1#"; + int count = 0; + for (String oldId : oldIds) { + String newId = newIdPrefix + (count++); + queries.add(String.format("UPDATE observe_common.sizeMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId)); + queries.add(String.format("UPDATE observe_longline.sizeMeasure SET sizeMeasureType2 = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); + queries.add(String.format("UPDATE observe_seine.targetLength SET sizeMeasureType = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); + } + } + { + List<String> oldIds = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT topiaId FROM observe_longline.weightmeasuretype"); + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + + String newIdPrefix = "fr.ird.observe.entities.referentiel.WeightMeasureType#1#"; + + int count = 0; + for (String oldId : oldIds) { + String newId = newIdPrefix + (count++); + queries.add(String.format("UPDATE observe_common.weightMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId)); + queries.add(String.format("UPDATE observe_longline.weightMeasure SET weightMeasureType2 = '%s' WHERE weightMeasureType = '%s'", newId, oldId)); + } + } + + queries.add("ALTER TABLE observe_seine.targetLength DROP COLUMN sizeMeasureType"); + queries.add("ALTER TABLE observe_seine.targetLength ALTER COLUMN sizeMeasureType2 RENAME TO sizeMeasureType"); + queries.add("ALTER TABLE observe_seine.targetlength ADD CONSTRAINT fk_targetLength_sizeMeasureType FOREIGN KEY(sizeMeasureType) REFERENCES observe_common.sizeMeasureType(topiaId);"); + queries.add("ALTER TABLE observe_longline.sizeMeasure DROP COLUMN sizeMeasureType"); + queries.add("ALTER TABLE observe_longline.sizeMeasure ALTER COLUMN sizeMeasureType2 RENAME TO sizeMeasureType"); + queries.add("ALTER TABLE observe_longline.sizeMeasure ADD CONSTRAINT fk_sizeMeasure_sizeMeasureType FOREIGN KEY(sizeMeasureType) REFERENCES observe_common.sizeMeasureType(topiaId);"); + queries.add("ALTER TABLE observe_longline.weightMeasure DROP COLUMN weightMeasureType"); + queries.add("ALTER TABLE observe_longline.weightMeasure ALTER COLUMN weightMeasureType2 RENAME TO weightMeasureType"); + queries.add("ALTER TABLE observe_longline.weightMeasure ADD CONSTRAINT fk_weightMeasure_weightMeasureType FOREIGN KEY(weightMeasureType) REFERENCES observe_common.weightMeasureType(topiaId);"); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_1 { diff --git a/entities-migration/src/main/resources/db/3.5/traduction_attributes.csv b/entities-migration/src/main/resources/db/3.5/traduction_attributes.csv index fe4ea13..eae07bc 100644 --- a/entities-migration/src/main/resources/db/3.5/traduction_attributes.csv +++ b/entities-migration/src/main/resources/db/3.5/traduction_attributes.csv @@ -94,7 +94,7 @@ poidsMoyen;meanWeight;PROPERTY_POIDS_MOYEN;PROPERTY_MEAN_WEIGHT;; modeSaisie;acquisitionMode;PROPERTY_MODE_SAISIE;PROPERTY_ACQUISITION_MODE;; heureDebut;startTime;PROPERTY_HEURE_DEBUT;PROPERTY_START_TIME;; codeQuille;keelCode;PROPERTY_CODE_QUILLE;PROPERTY_KEEL_CODE;; -codeMesure;measureType;PROPERTY_CODE_MESURE;PROPERTY_MEASURE_TYPE;; +codeMesure;sizeMeasureType;PROPERTY_CODE_MESURE;PROPERTY_MEASURE_TYPE;; codeFlotte;fleetCountry;PROPERTY_CODE_FLOTTE;PROPERTY_FLEET_COUNTRY;; tailleMin;minLength;PROPERTY_TAILLE_MIN;PROPERTY_MIN_LENGTH;; tailleMax;maxLength;PROPERTY_TAILLE_MAX;PROPERTY_MAX_LENGTH;; diff --git a/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql new file mode 100644 index 0000000..f7987d6 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql @@ -0,0 +1,19 @@ +CREATE TABLE observe_common.SIZEMEASURETYPE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)) AS SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status [...] +ALTER TABLE observe_common.SIZEMEASURETYPE ADD CONSTRAINT PK_SIZEMEASURETYPE PRIMARY KEY(TOPIAID); + +CREATE TABLE observe_common.WEIGHTMEASURETYPE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255)) AS SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, stat [...] +ALTER TABLE observe_common.WEIGHTMEASURETYPE ADD CONSTRAINT PK_WEIGHTMEASURETYPE PRIMARY KEY(TOPIAID); + +UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.SizeMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType'; +UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.WeightMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType'; + +ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType VARCHAR(255); +UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; +UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where label1 ='PDL') WHERE measureType = 1; +UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where label1='FL') WHERE measureType = 2; +ALTER TABLE observe_seine.targetlength DROP COLUMN measureType; + +ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 VARCHAR(255); +ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 VARCHAR(255); +ALTER TABLE observe_longline.weightMeasure ADD COLUMN weightMeasureType2 VARCHAR(255); + diff --git a/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql new file mode 100644 index 0000000..edaa004 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql @@ -0,0 +1,18 @@ +CREATE TABLE observe_common.SIZEMEASURETYPE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character var [...] +ALTER TABLE observe_common.SIZEMEASURETYPE ADD CONSTRAINT PK_SIZEMEASURETYPE PRIMARY KEY(TOPIAID); + +CREATE TABLE observe_common.WEIGHTMEASURETYPE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character v [...] +ALTER TABLE observe_common.WEIGHTMEASURETYPE ADD CONSTRAINT PK_WEIGHTMEASURETYPE PRIMARY KEY(TOPIAID); + +UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.SizeMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.SizeMeasureType'; +UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referentiel.WeightMeasureType' WHERE TYPE = 'fr.ird.observe.entities.referentiel.longline.WeightMeasureType'; + +ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType character varying(255); +UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; +UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where label1 ='PDL') WHERE measureType = 1; +UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where label1='FL') WHERE measureType = 2; +ALTER TABLE observe_seine.targetlength DROP COLUMN measureType; + +ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 character varying(255); +ALTER TABLE observe_longline.sizeMeasure ADD COLUMN sizeMeasureType2 character varying(255); +ALTER TABLE observe_longline.weightMeasure ADD COLUMN weightMeasureType2 character varying(255); diff --git a/entities/src/main/xmi/observe-common.zargo b/entities/src/main/xmi/observe-common.zargo index 1a0614c..94b7c59 100644 Binary files a/entities/src/main/xmi/observe-common.zargo and b/entities/src/main/xmi/observe-common.zargo differ diff --git a/entities/src/main/xmi/observe-longline.zargo b/entities/src/main/xmi/observe-longline.zargo index 11d0e01..38760b3 100644 Binary files a/entities/src/main/xmi/observe-longline.zargo and b/entities/src/main/xmi/observe-longline.zargo differ diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index a341754..da602d4 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 76ebec9a3adf965e93b48ab6617631a47d7529f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:16:57 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (service) --- .../observe/services/dto/AbstractReference.java | 2 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../request/ReferenceSetRequestDefinitions.java | 7 +-- .../dto/referential/ReferentialHelper.java | 8 ++- .../dto/referential/SizeMeasureTypeHelper.java | 58 +++++++++++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 42563 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67604 -> 67880 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59419 -> 59655 bytes services-dto/src/main/xmi/observe-services-dto.ini | 5 +- .../actions/validate/ValidateServiceRestTest.java | 4 +- .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 17 ++++++ .../services-topia-validation_en_GB.properties | 3 ++ .../services-topia-validation_es_ES.properties | 3 ++ .../services-topia-validation_fr_FR.properties | 3 ++ .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 8 +-- .../topia/binder/data/SizeMeasureBinder.java | 4 +- .../topia/binder/data/TargetLengthBinder.java | 6 ++- .../topia/binder/data/WeightMeasureBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../services/topia/binder/BinderEngineTest.java | 4 +- .../actions/validate/ValidateServiceTopiaTest.java | 4 +- .../src/main/filters/observe-reports.properties | 16 +++--- 28 files changed, 129 insertions(+), 43 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java index e27db6a..d6bac4a 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java @@ -158,7 +158,7 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, return labelPropertyNames; } - protected int getPropertyIndex(String propertyName) { + public int getPropertyIndex(String propertyName) { int index = labelPropertyNames.indexOf(propertyName); if (index == -1) { throw new ReferenceValueNotFoundException(type, propertyName); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index 31e9a49..98d93cc 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -37,12 +37,14 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -63,11 +65,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java index 76876da..9140968 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java @@ -55,12 +55,14 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -81,11 +83,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; @@ -335,7 +335,8 @@ public enum ReferenceSetRequestDefinitions { TARGET_SAMPLE_FORM( newBuilder(TargetLengthDto.class) - .addKey(TargetLengthDto.PROPERTY_SPECIES, SPECIES)), + .addKey(TargetLengthDto.PROPERTY_SPECIES, SPECIES) + .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, SIZE_MEASURE_TYPE)), NON_TARGET_SAMPLE_FORM( newBuilder(NonTargetLengthDto.class) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java index 9167511..66c5482 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java @@ -43,11 +43,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; @@ -78,6 +76,8 @@ public class ReferentialHelper extends GeneratedReferentialHelper { SexDto.class, FpaZoneDto.class, SpeciesListDto.class, + SizeMeasureTypeDto.class, + WeightMeasureTypeDto.class, PersonDto.class, OceanDto.class, OrganismDto.class, @@ -126,11 +126,9 @@ public class ReferentialHelper extends GeneratedReferentialHelper { SensorDataFormatDto.class, SensorTypeDto.class, SettingShapeDto.class, - SizeMeasureTypeDto.class, StomacFullnessDto.class, TripTypeDto.class, - VesselActivityLonglineDto.class, - WeightMeasureTypeDto.class); + VesselActivityLonglineDto.class); public static final ImmutableSet<Class<? extends ReferentialDto>> REFERENCE_DTOS = ImmutableSet.<Class<? extends ReferentialDto>>builder() .addAll(REFERENCE_COMMON_DTOS) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java new file mode 100644 index 0000000..db06793 --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -0,0 +1,58 @@ +package fr.ird.observe.services.dto.referential; + +import com.google.common.collect.ImmutableSet; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { + + public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL","LD1"); + public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("LF", "FL"); + + public static List<ReferentialReference<SizeMeasureTypeDto>> filterForSeine(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { + return incoming.stream() + .filter(d -> isLd1(d) || isLf(d)) + .map(SizeMeasureTypeHelper::filterForSeine) + .collect(Collectors.toList()); + + } + + public static ReferentialReference<SizeMeasureTypeDto> filterForSeine(ReferentialReference<SizeMeasureTypeDto> incoming) { + int index = incoming.getPropertyIndex(SizeMeasureTypeDto.PROPERTY_LABEL); + String value; + if (isLd1(incoming)) { + value = "LD1"; + } else if (isLf(incoming)) { + value = "LF"; + } else { + throw new IllegalStateException("Can't manage with code: " + incoming); + } + incoming.getLabelPropertyValues()[index] = value; + return incoming; + } + + + public static boolean isLd1(ReferentialReference<SizeMeasureTypeDto> incoming) { + return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + } + + public static boolean isLf(ReferentialReference<SizeMeasureTypeDto> incoming) { + return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + } + + public static ReferentialReference<SizeMeasureTypeDto> getLd1(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { + return incoming.stream() + .filter(SizeMeasureTypeHelper::isLd1) + .findAny().get(); + + } + + public static ReferentialReference<SizeMeasureTypeDto> getLf(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { + return incoming.stream() + .filter(SizeMeasureTypeHelper::isLf) + .findAny().get(); + + } +} diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 2df0f74..33bb2d0 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto-longline.zargo b/services-dto/src/main/xmi/observe-services-dto-longline.zargo index 4d91b77..561096d 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-longline.zargo and b/services-dto/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 2c55ad2..a4dbe6c 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini index 836c60d..0652591 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -108,7 +108,7 @@ branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDt sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto [class fr.ird.observe.services.dto.longline.SizeMeasure] -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto +sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto [class fr.ird.observe.services.dto.longline.Tdr] basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto @@ -137,7 +137,7 @@ gearUseFeaturesLongline.ordered = true gearUseFeaturesLongline.unique = true [class fr.ird.observe.services.dto.longline.WeightMeasure] -weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto +weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.WeightMeasureTypeDto [class fr.ird.observe.services.dto.referential.Gear] gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristic @@ -240,6 +240,7 @@ weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine. [class fr.ird.observe.services.dto.seine.TargetLength] species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto +sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto [class fr.ird.observe.services.dto.seine.TargetSample] targetLength.unique = true diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java index 1b600dd..1acef05 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/validate/ValidateServiceRestTest.java @@ -64,11 +64,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-error-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-error-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-warning-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SizeMeasureType-service-warning-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-error-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-error-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-error-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-warning-validation.xml similarity index 100% rename from services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-service-warning-validation.xml rename to services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/WeightMeasureType-service-warning-validation.xml diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml index 459ac5e..266addf 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml @@ -26,6 +26,23 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="sizeMeasureType"> + + <!-- pas de sizeMeasureType selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.service.targetLength.required.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sizeMeasureType.enabled ]]> + </param> + <message>validator.service.targetLength.desactivated.sizeMeasureType</message> + </field-validator> + + </field> + <field name="species"> <!-- pas de species selectionnee --> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index 7f81582..90a272e 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties @@ -147,6 +147,7 @@ observe.common.settingStartTimeStamp=Setting start timeStamp observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex observe.common.shooterSpeed=Shooter speed +observe.common.sizeMeasureType=Size measure type observe.common.snapWeight=Snap weight observe.common.species=Species observe.common.speciesCatch=Species @@ -518,10 +519,12 @@ validator.service.targetDiscarded.required.weightCategory=Weight category must b validator.service.targetDiscarded.uniqueKey=Tuple (category - reasonForDiscard) must be unique. validator.service.targetLength.bound.length=Length must be bound between %s and %s. validator.service.targetLength.bound.weight=Weight must be bound between %s and %s. +validator.service.targetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.service.targetLength.desactivated.species=Selected species is disabled. validator.service.targetLength.positive.length=Must be a positive number. validator.service.targetLength.positive.weight=Must be a positive number. validator.service.targetLength.required.count=Count must be filled. +validator.service.targetLength.required.sizeMeasureType=Size measure type is mandatory. validator.service.targetLength.required.species=Species must be filled. validator.service.targetLength.required.taille=Size must be filled. validator.service.targetLength.required.weight.or.taille=Weight or size must be filled. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties index 7337bc0..217ae20 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -147,6 +147,7 @@ observe.common.settingStartTimeStamp=Timestamp de inicio observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.sizeMeasureType=Type de mesure de taille \#TODO observe.common.snapWeight=Peso snap (kg) observe.common.species=Especie observe.common.speciesCatch=Especie @@ -518,10 +519,12 @@ validator.service.targetDiscarded.required.weightCategory=Es obligatorio selecci validator.service.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. validator.service.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.service.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.service.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. \#TODO validator.service.targetLength.desactivated.species=La especie seleccionada está desactivada. validator.service.targetLength.positive.length=La talla debe ser un entero positivo. validator.service.targetLength.positive.weight=El peso debe ser un entero positivo. validator.service.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. +validator.service.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. \#TODO validator.service.targetLength.required.species=Es obligatoria seleccionar una especie de atún. validator.service.targetLength.required.taille=Es obligatoria especificar el talla. validator.service.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties index aca144e..f8a91a5 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties @@ -147,6 +147,7 @@ observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.sizeMeasureType=Type de mesure de taille observe.common.snapWeight=Poids snap (kg) observe.common.species=Espèces observe.common.speciesCatch=Espèce @@ -518,10 +519,12 @@ validator.service.targetDiscarded.required.weightCategory=La sélection d'une ca validator.service.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. validator.service.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. validator.service.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.service.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. validator.service.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. validator.service.targetLength.positive.length=La longueur est un entier strictement positif. validator.service.targetLength.positive.weight=Le poids est un entier strictement positif. validator.service.targetLength.required.count=Le nombre effectif est obligatoire. +validator.service.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. validator.service.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. validator.service.targetLength.required.taille=La taille est obligatoire. validator.service.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. diff --git a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java index cc228de..a8adba7 100644 --- a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java +++ b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java @@ -75,11 +75,11 @@ import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.entities.referentiel.longline.SettingShape; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.longline.StomacFullness; import fr.ird.observe.entities.referentiel.longline.TripType; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.entities.referentiel.seine.DetectionMode; import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.entities.referentiel.seine.ObjectOperation; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index 41c624a..5a499e5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -82,11 +82,11 @@ import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.entities.referentiel.longline.SettingShape; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.longline.StomacFullness; import fr.ird.observe.entities.referentiel.longline.TripType; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.entities.referentiel.seine.DetectionMode; import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.entities.referentiel.seine.ObjectOperation; @@ -191,11 +191,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java index 6b184af..08d607c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.topia.binder.data; */ import fr.ird.observe.entities.longline.SizeMeasure; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java index 2b90249..9d081e8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java @@ -22,10 +22,12 @@ package fr.ird.observe.services.topia.binder.data; * #L% */ +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; @@ -46,7 +48,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe copyDtoDataFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); - entity.setMeasureType(dto.getMeasureType()); + entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType(), SizeMeasureType.class)); entity.setLength(dto.getLength()); entity.setIsLengthComputed(dto.isIsLengthComputed()); entity.setCount(dto.getCount()); @@ -62,7 +64,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe copyEntityDataFieldsToDto(entity, dto); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); - dto.setMeasureType(entity.getMeasureType()); + dto.setSizeMeasureType(toReferentialReference(referentialLocale,entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); dto.setLength(entity.getLength()); dto.setIsLengthComputed(entity.isIsLengthComputed()); dto.setCount(entity.getCount()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java index 27d1c0c..1f02b74 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java @@ -23,10 +23,10 @@ package fr.ird.observe.services.topia.binder.data; */ import fr.ird.observe.entities.longline.WeightMeasure; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java index bc6edb7..f61dc9c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.topia.binder.referential; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java index 50cbe95..3fa1178 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java @@ -22,10 +22,10 @@ package fr.ird.observe.services.topia.binder.referential; * #L% */ -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; /** * Created on 24/11/15. diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index d954003..7d8a1e1 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -94,11 +94,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java index 1458bbf..f805b5b 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java @@ -72,11 +72,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/services/src/main/filters/observe-reports.properties b/services/src/main/filters/observe-reports.properties index 1ea6616..c03d06d 100644 --- a/services/src/main/filters/observe-reports.properties +++ b/services/src/main/filters/observe-reports.properties @@ -717,7 +717,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 1 \ +And tl.sizeMeasureType = 1 \ And ts.discarded = false report.targetStoredDistributionLengthsLD1.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -728,7 +728,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 1 \ + And tl.sizeMeasureType = 1 \ And ts.discarded = false \ Group By tl.length \ Order By tl.length @@ -749,7 +749,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 1 \ +And tl.sizeMeasureType = 1 \ And ts.discarded = true report.targetDiscardedDistributionLengthsLD1.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -760,7 +760,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 1\ + And tl.sizeMeasureType = 1\ And ts.discarded = true \ Group By tl.length \ Order By tl.length @@ -781,7 +781,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 2 \ +And tl.sizeMeasureType = 2 \ And ts.discarded = false report.targetStoredDistributionLengthsLF.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -792,7 +792,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 2 \ + And tl.sizeMeasureType = 2 \ And ts.discarded = false \ Group By tl.length \ Order By tl.length @@ -813,7 +813,7 @@ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ -And tl.measureType = 2 \ +And tl.sizeMeasureType = 2 \ And ts.discarded = true report.targetDiscardedDistributionLengthsLF.request.1=0,0|row| \ Select tl.length , Sum(tl.count) \ @@ -824,7 +824,7 @@ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ Where t.id = :tripId \ And tl.species.id = :speciesId \ - And tl.measureType = 2 \ + And tl.sizeMeasureType = 2 \ And ts.discarded = true \ Group By tl.length \ Order By tl.length -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 611927925a64362eb06acb81e6af345ceb4e4082 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:17:19 2016 +0100 Improve log levels --- application-swing-configuration/src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application-swing-configuration/src/main/resources/log4j.properties b/application-swing-configuration/src/main/resources/log4j.properties index dc232bc..ff8e1ad 100644 --- a/application-swing-configuration/src/main/resources/log4j.properties +++ b/application-swing-configuration/src/main/resources/log4j.properties @@ -41,7 +41,7 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( log4j.logger.fr.ird.observe=INFO log4j.logger.fr.ird.observe.application.swing.db.impl.DataContext=WARN log4j.logger.fr.ird.observe.application.swing.db.impl.DataService=WARN -log4j.logger.fr.ird.observe.application.swing.validation.field=WARN +log4j.logger.fr.ird.observe.application.swing.validators=WARN log4j.logger.fr.ird.observe.application.swing.ui.tree=INFO log4j.logger.fr.ird.observe.application.swing.ui.util.decorator=ERROR diff --git a/application-swing-configuration/src/main/resources/observe-log4j.properties b/application-swing-configuration/src/main/resources/observe-log4j.properties index 5c02e59..a5be91a 100644 --- a/application-swing-configuration/src/main/resources/observe-log4j.properties +++ b/application-swing-configuration/src/main/resources/observe-log4j.properties @@ -41,7 +41,7 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( log4j.logger.fr.ird.observe=INFO log4j.logger.fr.ird.observe.application.swing.db.impl.DataContext=WARN log4j.logger.fr.ird.observe.application.swing.db.impl.DataService=WARN -log4j.logger.fr.ird.observe.application.swing.validation.field=WARN +log4j.logger.fr.ird.observe.application.swing.validators=WARN log4j.logger.fr.ird.observe.application.swing.ui.tree=INFO log4j.logger.fr.ird.observe.application.swing.ui.util.decorator=ERROR -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d1d368d1a8a261f598e6504728d5352f244c5715 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:17:44 2016 +0100 Fix show config if no data source is open --- .../fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java index dba3337..790c2e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java @@ -116,7 +116,7 @@ public class ShowConfigAction extends AbstractAction { SpeciesListTableCellEditor editor = null; SpeciesListsTableCellRenderer renderer = null; - if (dataSource != null) { + if (dataSource != null && dataSource.isOpen()) { Set<ReferentialReference<SpeciesListDto>> speciesLists = dataSource.getReferentialReferences(SpeciesListDto.class); @@ -191,7 +191,7 @@ public class ShowConfigAction extends AbstractAction { protected void addDataOptions(ObserveConfigUIBuilder helper, ObserveSwingDataSource dataSource) { - if (dataSource != null) { + if (dataSource != null && dataSource.isOpen()) { helper.addCategory(n("observe.config.category.speciesList.seine"), n("observe.config.category.speciesList.seine.description"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6e60cfcd1abdfd685f70337570e68f62295bb272 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:18:24 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (ui) --- .../swing/decoration/DecoratorService.java | 4 +-- ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 18 ++++++++++ .../application-swing-validation_en_GB.properties | 3 ++ .../application-swing-validation_es_ES.properties | 3 ++ .../application-swing-validation_fr_FR.properties | 3 ++ .../validation/BeanValidatorDetectorTest.java | 4 +-- .../ref/impl/{longline => }/SizeMeasureTypeUI.jaxx | 8 ++--- .../{longline => }/SizeMeasureTypeUIModel.java | 4 +-- .../impl/{longline => }/WeightMeasureTypeUI.jaxx | 8 ++--- .../{longline => }/WeightMeasureTypeUIModel.java | 4 +-- .../impl/longline/CatchLonglineUIHandler.java | 4 +-- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 30 +++++++--------- .../content/table/impl/seine/TargetSampleUI.jcss | 24 +++++++++---- .../table/impl/seine/TargetSampleUIHandler.java | 40 +++++++++++++++++++--- .../table/impl/seine/TargetSampleUIModel.java | 11 +++--- .../i18n/application-swing_en_GB.properties | 5 +-- .../i18n/application-swing_es_ES.properties | 5 +-- .../i18n/application-swing_fr_FR.properties | 5 +-- 28 files changed, 127 insertions(+), 60 deletions(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 638550f..81d5cc3 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -88,11 +88,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml index 9e3e337..0fea9ab 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml @@ -26,6 +26,24 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="sizeMeasureType"> + + <!-- pas de sizeMeasureType selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.targetLength.required.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sizeMeasureType.enabled ]]> + </param> + <message>validator.ui.targetLength.desactivated.sizeMeasureType</message> + </field-validator> + + </field> + + <field name="species"> <!-- pas de species selectionnee --> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index cd26f38..3e9eca9 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -153,6 +153,7 @@ observe.common.settingStartTimeStamp=Setting start timeStamp observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex observe.common.shooterSpeed=Shooter speed +observe.common.sizeMeasureType=Size measure type observe.common.snapWeight=Snap weight observe.common.species=Species observe.common.speciesCatch=Species @@ -533,10 +534,12 @@ validator.ui.targetDiscarded.required.weightCategory=Weight category must be fil validator.ui.targetDiscarded.uniqueKey=Tuple (category - reasonForDiscard) must be unique. validator.ui.targetLength.bound.length=Length must be bound between %s and %s. validator.ui.targetLength.bound.weight=Weight must be bound between %s and %s. +validator.ui.targetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.ui.targetLength.desactivated.species=Selected species is disabled. validator.ui.targetLength.positive.length=Must be a positive number. validator.ui.targetLength.positive.weight=Must be a positive number. validator.ui.targetLength.required.count=Count must be filled. +validator.ui.targetLength.required.sizeMeasureType=Size measure type is mandatory. validator.ui.targetLength.required.species=Species must be filled. validator.ui.targetLength.required.taille=Size must be filled. validator.ui.targetLength.required.weight.or.taille=Weight or size must be filled. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index d7cc884..64dd001 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -153,6 +153,7 @@ observe.common.settingStartTimeStamp=Timestamp de inicio observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.sizeMeasureType=Size measure type \#TODO observe.common.snapWeight=Peso snap (kg) observe.common.species=Especie observe.common.speciesCatch=Especie @@ -533,10 +534,12 @@ validator.ui.targetDiscarded.required.weightCategory=Es obligatorio seleccionar validator.ui.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. validator.ui.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.ui.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.ui.targetLength.desactivated.sizeMeasureType=Selected size mesure type is disabled. \#TODO validator.ui.targetLength.desactivated.species=La especie seleccionada está desactivada. validator.ui.targetLength.positive.length=La talla debe ser un entero positivo. validator.ui.targetLength.positive.weight=El peso debe ser un entero positivo. validator.ui.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. +validator.ui.targetLength.required.sizeMeasureType=Es obligatoria especificar el size measure type \#TODO validator.ui.targetLength.required.species=Es obligatoria seleccionar una especie de atún. validator.ui.targetLength.required.taille=Es obligatoria especificar el talla. validator.ui.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index 10c1d1d..c090076 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -153,6 +153,7 @@ observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.sizeMeasureType=Type de mesure observe.common.snapWeight=Poids snap (kg) observe.common.species=Espèces observe.common.speciesCatch=Espèce @@ -533,10 +534,12 @@ validator.ui.targetDiscarded.required.weightCategory=La sélection d'une catégo validator.ui.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. validator.ui.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. validator.ui.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.ui.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. validator.ui.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. validator.ui.targetLength.positive.length=La longueur est un entier strictement positif. validator.ui.targetLength.positive.weight=Le poids est un entier strictement positif. validator.ui.targetLength.required.count=Le nombre effectif est obligatoire. +validator.ui.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. validator.ui.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. validator.ui.targetLength.required.taille=La taille est obligatoire. validator.ui.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. diff --git a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java index bfd5ac4..b9cc5a5 100644 --- a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java +++ b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -79,11 +79,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx index 716227b..c4da1a3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx @@ -21,12 +21,12 @@ --> <fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SizeMeasureTypeDto'> - <style source="../ReferenceEntity.jcss"/> - <style source="../I18nReferenceEntity.jcss"/> + <style source="ReferenceEntity.jcss"/> + <style source="I18nReferenceEntity.jcss"/> <import> fr.ird.observe.services.dto.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel @@ -36,7 +36,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto' + beanClass='fr.ird.observe.services.dto.referential.SizeMeasureTypeDto' context='ui-create' errorTableModel='{getErrorTableModel()}'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIModel.java similarity index 89% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIModel.java index 0b6c93d..cad3885 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIModel.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.content.ref.impl.longline; +package fr.ird.observe.application.swing.ui.content.ref.impl; /* * #%L @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx index 7796ec7..f29f5c9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx @@ -21,12 +21,12 @@ --> <fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='WeightMeasureTypeDto'> - <style source="../ReferenceEntity.jcss"/> - <style source="../I18nReferenceEntity.jcss"/> + <style source="ReferenceEntity.jcss"/> + <style source="I18nReferenceEntity.jcss"/> <import> fr.ird.observe.services.dto.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto + fr.ird.observe.services.dto.referential.WeightMeasureTypeDto fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel @@ -36,7 +36,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto' + beanClass='fr.ird.observe.services.dto.referential.WeightMeasureTypeDto' context='ui-create' errorTableModel='{getErrorTableModel()}'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIModel.java similarity index 88% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIModel.java index 108df3e..0243cf0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIModel.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.content.ref.impl.longline; +package fr.ird.observe.application.swing.ui.content.ref.impl; /* * #%L @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index b253832..c55755f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -55,8 +55,8 @@ import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.BranchlineService; import fr.ird.observe.services.service.longline.SetLonglineCatchService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java index 7ae0002..ee77d4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java index d8edf35..f8a1fa6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index a0092bd..ae3f271 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -21,18 +21,18 @@ --> <fr.ird.observe.application.swing.ui.content.table.ContentTableUI - superGenericType='TargetSampleDto, TargetLengthDto' - abstract="true"> + superGenericType='TargetSampleDto, TargetLengthDto' + abstract="true"> <style source="AbstractSampleUI.jcss"/> <import> fr.ird.observe.services.dto.seine.TargetSampleDto fr.ird.observe.services.dto.seine.TargetLengthDto - fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum fr.ird.observe.application.swing.ui.content.table.impl.seine.ModeSaisieEchantillonEnum fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.application.swing.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -106,12 +106,10 @@ public String getLengthDataTip(boolean computed) { <JRadioButton id='acquisitionModeEffectif'/> <JRadioButton id='acquisitionModeIndividu'/> </JPanel> - <JPanel id='measureTypePanel' layout='{new BorderLayout()}'> - <EnumEditor id='measureType' - constraints="BorderLayout.CENTER" - constructorParams='CodeMesureEnum.class' - genericType='CodeMesureEnum' - onItemStateChanged='getTableEditBean().setMeasureType(measureType.getSelectedIndex())'/> + <JPanel id='sizeMeasureTypePanel' layout='{new BorderLayout()}'> + <JLabel id='sizeMeasureTypeLabel' constraints="BorderLayout.WEST"/> + <BeanComboBox id='sizeMeasureType' genericType='ReferentialReference<SizeMeasureTypeDto>' + constructorParams='this' constraints="BorderLayout.CENTER"/> </JPanel> </JPanel> </cell> @@ -123,7 +121,7 @@ public String getLengthDataTip(boolean computed) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> + <BeanComboBox id='species' genericType='ReferentialReference<SpeciesDto>' constructorParams='this'/> </cell> </row> @@ -137,8 +135,7 @@ public String getLengthDataTip(boolean computed) { </cell> <cell anchor='east'> <JToolBar id='lengthSourceAction'> - <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetIsLengthComputed()'/> + <JButton id='lengthSourceInformation' onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -153,8 +150,7 @@ public String getLengthDataTip(boolean computed) { </cell> <cell anchor='east'> <JToolBar id='weightSourceAction'> - <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetIsWeightComputed()'/> + <JButton id='weightSourceInformation' onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> @@ -173,10 +169,8 @@ public String getLengthDataTip(boolean computed) { <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> + <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> + <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> </JScrollPane> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss index 17c1381..699dadf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss @@ -22,6 +22,12 @@ #speciesLabel { text:"observe.common.speciesThon"; + labelFor:{species}; +} + + +#species { + _entityClass:{SpeciesDto.class}; } #modeAndCodePanel { @@ -37,12 +43,20 @@ layout:{new GridLayout(0,1)}; } -#measureTypePanel { - border:{new TitledBorder(t("observe.common.measureType"))}; +#sizeMeasureTypePanel { + border:{new TitledBorder(t("observe.common.sizeMeasureType"))}; +} + +#sizeMeasureTypeLabel { + labelFor:{sizeMeasureType}; } -#measureType { - selectedIndex:{tableEditBean.getMeasureType()}; +#sizeMeasureType { + _entityClass:{SizeMeasureTypeDto.class}; + _tablePropertyName:{TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE}; + property:{TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE}; + selectedItem:{tableEditBean.getSizeMeasureType()}; + bean:{tableEditBean}; } #acquisitionModeEffectif { @@ -51,7 +65,6 @@ text:{ModeSaisieEchantillonEnum.byEffectif.getI18nKey()}; selected:{tableEditBean.getAcquisitionMode() == 0}; enabled:{!tableModel.isEditable() || tableModel.isCreate()}; - /*enabled:{!tableModel.isEditable() || !model.isRowSaved()};*/ } #acquisitionModeIndividu { @@ -60,7 +73,6 @@ text:{ModeSaisieEchantillonEnum.byIndividu.getI18nKey()}; selected:{tableEditBean.getAcquisitionMode() == 1}; enabled:{!tableModel.isEditable() || tableModel.isCreate()}; - /*enabled:{!tableModel.isEditable() || !model.isRowSaved()};*/ } #lengthLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 6dfdb3e..e5b9d83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -30,6 +30,8 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeHelper; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -44,6 +46,7 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; +import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -109,6 +112,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD JComponent requestFocus; ModeSaisieEchantillonEnum modeSaisieEchantillonEnum; + ReferentialReference<SizeMeasureTypeDto> sizeMeasureType = null; if (create) { @@ -123,8 +127,8 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD } // on utilise par défaut le code mesure lf - ui.getMeasureType().setSelectedItem(null); - ui.getMeasureType().setSelectedItem(CodeMesureEnum.lf); + sizeMeasureType = SizeMeasureTypeHelper.getLf(ui.getSizeMeasureType().getData()); + } requestFocus = ui.getSpecies(); @@ -135,12 +139,18 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD int acquisitionMode = bean.getAcquisitionMode(); modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.valueOf(acquisitionMode); + + sizeMeasureType = bean.getSizeMeasureType(); + } ui.getAcquisitionModeGroup().setSelectedValue(null); ui.getAcquisitionModeGroup().setSelectedValue(modeSaisieEchantillonEnum); + ui.getSizeMeasureType().setSelectedItem(null); + ui.getSizeMeasureType().setSelectedItem(sizeMeasureType); + // on met a jour l'espce ui.getSpecies().setSelectedItem(null); @@ -161,6 +171,22 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD } @Override + public void openUI() { + super.openUI(); + + List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = new ArrayList<>(getDataSource().getReferentialReferences(SizeMeasureTypeDto.class)); + List<ReferentialReference<SizeMeasureTypeDto>> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); + if (log.isInfoEnabled()) { + log.info("Using " + data.size() + " size measure type(s)."); + } + if (data.size() != 2) { + throw new IllegalStateException("WHY???"); + } + getUi().getSizeMeasureType().setData(data); + + } + + @Override protected void initTableUI(DefaultTableCellRenderer renderer) { JTable table = getUi().getTable(); @@ -169,8 +195,8 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD table, n("observe.content.targetSample.table.speciesThon"), n("observe.content.targetSample.table.speciesThon.tip"), - n("observe.content.targetSample.table.measureType"), - n("observe.content.targetSample.table.measureType.tip"), + n("observe.content.targetSample.table.sizeMeasureType"), + n("observe.content.targetSample.table.sizeMeasureType.tip"), n("observe.content.targetSample.table.length"), n("observe.content.targetSample.table.length.tip"), n("observe.content.targetSample.table.meanWeight"), @@ -181,7 +207,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD n("observe.content.targetSample.table.totalWeight.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CodeMesureEnum.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -292,6 +318,10 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); + for (TargetLengthDto targetLengthDto : getBean().getTargetLength()) { + ReferentialReference<SizeMeasureTypeDto> sizeMeasureType = targetLengthDto.getSizeMeasureType(); + SizeMeasureTypeHelper.filterForSeine(sizeMeasureType); + } } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index 605ed3c..e8f06f0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -24,13 +24,13 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.services.dto.seine.TargetLengthDto; -import fr.ird.observe.services.dto.seine.TargetLengthHelper; -import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetLengthHelper; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import java.util.Collection; import java.util.List; @@ -59,12 +59,12 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta TargetLengthDto.PROPERTY_WEIGHT, TargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, TargetLengthDto.PROPERTY_COUNT, - TargetLengthDto.PROPERTY_MEASURE_TYPE, + TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, TargetLengthDto.PROPERTY_ACQUISITION_MODE}); List<ContentTableMeta<TargetLengthDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SPECIES, true), - ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_MEASURE_TYPE, true), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, true), ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_LENGTH, true), ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_WEIGHT, true), ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_COUNT, false), @@ -80,6 +80,7 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta List<ContentTableMeta<TargetLengthDto>> contentTableMetas) { return new ContentTableModel<TargetSampleDto, TargetLengthDto>(ui, contentTableMetas) { private static final long serialVersionUID = 1L; + @Override protected Collection<TargetLengthDto> getChilds(TargetSampleDto bean) { return bean.getTargetLength(); diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index c5d2ea1..449536f 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -473,6 +473,7 @@ observe.common.scientificLabel=Scientific label observe.common.seaSurfaceTemperature=Sea surface temperature observe.common.searchMaximum=Search maximum observe.common.sex=Sex +observe.common.sizeMeasureType=Measure type observe.common.species=Species observe.common.speciesFate=Species fate observe.common.speciesFaune=Fauna species @@ -1190,8 +1191,8 @@ observe.content.targetSample.table.length=Length observe.content.targetSample.table.length.tip=Length (cm inf.) observe.content.targetSample.table.meanWeight=Indiv. weight observe.content.targetSample.table.meanWeight.tip=Individual weight (in Kg) -observe.content.targetSample.table.measureType=Measure type -observe.content.targetSample.table.measureType.tip=Measure type (LF or LD1) +observe.content.targetSample.table.sizeMeasureType=Measure type +observe.content.targetSample.table.sizeMeasureType.tip=Measure type (LF or LD1) observe.content.targetSample.table.speciesThon=Species observe.content.targetSample.table.speciesThon.tip=Target sample species observe.content.targetSample.table.totalWeight=Total weight (in t) diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 57ac15f..92d3ad0 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -473,6 +473,7 @@ observe.common.scientificLabel=Texto científico observe.common.seaSurfaceTemperature=Temperatura en superficie (°) observe.common.searchMaximum=Velocidad máxima de prospección observe.common.sex=Sexo +observe.common.sizeMeasureType=Tipo de medida observe.common.species=Especie observe.common.speciesFate=Devenir de fauna observe.common.speciesFaune=Especie de fauna @@ -1190,8 +1191,8 @@ observe.content.targetSample.table.length=Longitud observe.content.targetSample.table.length.tip=Longitud (cm inf.) observe.content.targetSample.table.meanWeight=Peso ind. observe.content.targetSample.table.meanWeight.tip=Peso individual (en Kg) -observe.content.targetSample.table.measureType=Tipo de medición -observe.content.targetSample.table.measureType.tip=El tipo de medición utilizado (LF ou LD1) +observe.content.targetSample.table.sizeMeasureType=Tipo de medición +observe.content.targetSample.table.sizeMeasureType.tip=El tipo de medición utilizado (LF ou LD1) observe.content.targetSample.table.speciesThon=Especie de atún observe.content.targetSample.table.speciesThon.tip=Especie de atún observe.content.targetSample.table.totalWeight=Peso tot. diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 7a80abf..dfdcecc 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -473,6 +473,7 @@ observe.common.scientificLabel=Libellé scientifique observe.common.seaSurfaceTemperature=Température surface (°) observe.common.searchMaximum=Vitesse maximale observe.common.sex=Sexe +observe.common.sizeMeasureType=Type de mensuration observe.common.species=Espèce observe.common.speciesFate=Devenir espèce observe.common.speciesFaune=Espèce de faune @@ -1190,8 +1191,8 @@ observe.content.targetSample.table.length=Longueur observe.content.targetSample.table.length.tip=Longueur (cm inf.) observe.content.targetSample.table.meanWeight=Poids ind. observe.content.targetSample.table.meanWeight.tip=Poids individuel (en Kg) -observe.content.targetSample.table.measureType=Type de mensuration -observe.content.targetSample.table.measureType.tip=Le type de mensuration utilisé (LF ou LD1) +observe.content.targetSample.table.sizeMeasureType=Type de mensuration +observe.content.targetSample.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1) observe.content.targetSample.table.speciesThon=Espèce de thon observe.content.targetSample.table.speciesThon.tip=Espèce de thon observe.content.targetSample.table.totalWeight=Poids tot. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f88c42c32bf75b434e8b3ecc28819ef27018c356 Merge: df70644 6e60cfc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:18:59 2016 +0100 [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 2 +- .../swing/decoration/DecoratorService.java | 4 +- ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 18 ++++++ .../application-swing-validation_en_GB.properties | 3 + .../application-swing-validation_es_ES.properties | 3 + .../application-swing-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../swing/ui/actions/ShowConfigAction.java | 4 +- .../ref/impl/{longline => }/SizeMeasureTypeUI.jaxx | 8 +-- .../{longline => }/SizeMeasureTypeUIModel.java | 4 +- .../impl/{longline => }/WeightMeasureTypeUI.jaxx | 8 +-- .../{longline => }/WeightMeasureTypeUIModel.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 30 ++++------ .../content/table/impl/seine/TargetSampleUI.jcss | 24 ++++++-- .../table/impl/seine/TargetSampleUIHandler.java | 40 +++++++++++-- .../table/impl/seine/TargetSampleUIModel.java | 11 ++-- .../i18n/application-swing_en_GB.properties | 5 +- .../i18n/application-swing_es_ES.properties | 5 +- .../i18n/application-swing_fr_FR.properties | 5 +- .../DataSourceMigrationForVersion_5_1.java | 63 +++++++++++++++++++++ .../resources/db/3.5/traduction_attributes.csv | 2 +- .../V5_1_08_evol_8390_measure_type-H2.sql | 19 +++++++ .../V5_1_08_evol_8390_measure_type-PG.sql | 18 ++++++ entities/src/main/xmi/observe-common.zargo | Bin 37331 -> 37986 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93635 -> 93649 bytes entities/src/main/xmi/observe-seine.zargo | Bin 83500 -> 85633 bytes .../observe/services/dto/AbstractReference.java | 2 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../request/ReferenceSetRequestDefinitions.java | 7 ++- .../dto/referential/ReferentialHelper.java | 8 +-- .../dto/referential/SizeMeasureTypeHelper.java | 58 +++++++++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 42563 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67604 -> 67880 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59419 -> 59655 bytes services-dto/src/main/xmi/observe-services-dto.ini | 5 +- .../actions/validate/ValidateServiceRestTest.java | 4 +- .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 17 ++++++ .../services-topia-validation_en_GB.properties | 3 + .../services-topia-validation_es_ES.properties | 3 + .../services-topia-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 8 +-- .../topia/binder/data/SizeMeasureBinder.java | 4 +- .../topia/binder/data/TargetLengthBinder.java | 6 +- .../topia/binder/data/WeightMeasureBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../services/topia/binder/BinderEngineTest.java | 4 +- .../actions/validate/ValidateServiceTopiaTest.java | 4 +- .../src/main/filters/observe-reports.properties | 16 +++--- 66 files changed, 361 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm