branch develop updated (c6b0f1a -> ce5b988)
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 c6b0f1a [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) new 986452d Fix back migration new 1b266f6 Correction code new 1709445 Ajout length.tagNumber (persistence) new 3a1bbb5 Ajout length.tagNumber (service) new 5731c8b Ajout length.tagNumber (ui) new ce5b988 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop The 6 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 ce5b98830fe1bdf0cd1f66fffe3f48f632476742 Merge: c6b0f1a 5731c8b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:59 2016 +0100 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop commit 5731c8b5e3234edc204e528b3f4a62360406aea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:53 2016 +0100 Ajout length.tagNumber (ui) commit 3a1bbb557ec05f1c97132407b61c1ab44bb38d5b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:41 2016 +0100 Ajout length.tagNumber (service) commit 17094452cd38c8e36d430a61afe683a7ce7bdb10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:28 2016 +0100 Ajout length.tagNumber (persistence) commit 1b266f629b212c6ab21e0e894a8554cad783a43d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:06 2016 +0100 Correction code commit 986452d75fcd366f533b4cbd97b3353ca00c4a0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 15:47:26 2016 +0100 Fix back migration Summary of changes: .../table/impl/longline/CatchLonglineUI.jaxx | 15 ++++++++++++-- .../table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++ .../table/impl/seine/AbstractSampleUIHandler.java | 19 +++++++++++++---- .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++++++++++++++ .../content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++ .../table/impl/seine/TargetSampleUIModel.java | 3 ++- .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../DataSourceMigrationForVersion_5_1.java | 23 ++++++++++----------- .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 3 +++ .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 3 +++ entities/src/main/xmi/observe-longline.zargo | Bin 93649 -> 93746 bytes entities/src/main/xmi/observe-seine.zargo | Bin 85870 -> 86054 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 21 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-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 986452d75fcd366f533b4cbd97b3353ca00c4a0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 15:47:26 2016 +0100 Fix back migration --- .../DataSourceMigrationForVersion_5_1.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 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 8945897..925fcae 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 @@ -42,16 +42,16 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC boolean showSql, boolean showProgression) { -// addScript("01", "evol_8374_delete_sonarUsed", queries); -// addScript("02", "evol_7886_catch_add_set_idx", queries); -// addScript("03", "evol_6997_delete_supportVesselName", queries); -// 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); -// addScript("08", "evol_8390_measure_type", queries); -// addScript("09", "evol_7877_targetLength_add_sex", queries); -// evol7877(topiaSqlSupport, queries); + addScript("01", "evol_8374_delete_sonarUsed", queries); + addScript("02", "evol_7886_catch_add_set_idx", queries); + addScript("03", "evol_6997_delete_supportVesselName", queries); + 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); + addScript("08", "evol_8390_measure_type", queries); + addScript("09", "evol_7877_targetLength_add_sex", queries); + evol7877(topiaSqlSupport, queries); addScript("10", "evol_8391_species_add_sizeMeasureType", queries); evol8391(topiaSqlSupport, queries); } @@ -60,8 +60,6 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC ImmutableMap<String,String> missingCodesMapping = ImmutableMap.<String,String>builder() . put("LT ?","TL") -// . put("TL","TL") -// .put("LF","LF") .put("FL","LF") .put("L1","TL") .put("LC","TL") -- 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 1b266f629b212c6ab21e0e894a8554cad783a43d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:06 2016 +0100 Correction code --- .../table/impl/seine/AbstractSampleUIHandler.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 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 index 5c74528..052a5ca 100644 --- 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 @@ -4,6 +4,7 @@ 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.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import java.beans.PropertyChangeListener; @@ -37,12 +38,22 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto> protected AbstractSampleUIHandler(ObserveContentTableUI<E, D> ui) { super(ui, DataContextType.SetSeine); weightChanged = evt -> { - TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setIsWeightComputed(false); + if (evt.getSource() instanceof TargetLengthDto) { + TargetLengthDto source = (TargetLengthDto) evt.getSource(); + source.setIsWeightComputed(false); + } else if (evt.getSource() instanceof NonTargetLengthDto) { + NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); + source.setIsWeightComputed(false); + } }; lengthChanged = evt -> { - TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setIsLengthComputed(false); + if (evt.getSource() instanceof TargetLengthDto) { + TargetLengthDto source = (TargetLengthDto) evt.getSource(); + source.setIsLengthComputed(false); + } else if (evt.getSource() instanceof NonTargetLengthDto) { + NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); + source.setIsLengthComputed(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 17094452cd38c8e36d430a61afe683a7ce7bdb10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:28 2016 +0100 Ajout length.tagNumber (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 3 +++ .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 3 +++ entities/src/main/xmi/observe-longline.zargo | Bin 93649 -> 93746 bytes entities/src/main/xmi/observe-seine.zargo | Bin 85870 -> 86054 bytes 5 files changed, 7 insertions(+) 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 925fcae..0e594b9 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 @@ -54,6 +54,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC evol7877(topiaSqlSupport, queries); addScript("10", "evol_8391_species_add_sizeMeasureType", queries); evol8391(topiaSqlSupport, queries); + addScript("11", "evol_8571_length_add_tagNumber", queries); } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql new file mode 100644 index 0000000..4a08f97 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql @@ -0,0 +1,3 @@ +ALTER TABLE observe_seine.targetlength ADD COLUMN tagNumber VARCHAR(255); +ALTER TABLE observe_seine.nontargetlength ADD COLUMN tagNumber VARCHAR(255); +ALTER TABLE observe_longline.catch ADD COLUMN tagNumber VARCHAR(255); diff --git a/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql new file mode 100644 index 0000000..87815eb --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql @@ -0,0 +1,3 @@ +ALTER TABLE observe_seine.targetlength ADD COLUMN tagNumber character varying(255); +ALTER TABLE observe_seine.nontargetlength ADD COLUMN tagNumber character varying(255); +ALTER TABLE observe_longline.catch ADD COLUMN tagNumber character varying(255); diff --git a/entities/src/main/xmi/observe-longline.zargo b/entities/src/main/xmi/observe-longline.zargo index 38760b3..62bd7db 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 0cd143b..7e9b56b 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 3a1bbb557ec05f1c97132407b61c1ab44bb38d5b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:41 2016 +0100 Ajout length.tagNumber (service) --- .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 5 files changed, 6 insertions(+) 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 561096d..c95582f 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 cab12be..8507c64 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/CatchLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java index 599db78..3456418 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java @@ -91,6 +91,7 @@ public class CatchLonglineBinder extends DataBinderSupport<CatchLongline, CatchL entity.setSizeMeasure(toEntityCollection(referentialLocale, dto.getSizeMeasure(), SizeMeasure.class, entity.getSizeMeasure())); entity.setPredator(toEntitySet(dto.getPredator(), Species.class)); entity.setWeightMeasure(toEntityCollection(referentialLocale, dto.getWeightMeasure(), WeightMeasure.class, entity.getWeightMeasure())); + entity.setTagNumber(dto.getTagNumber()); } @@ -123,6 +124,7 @@ public class CatchLonglineBinder extends DataBinderSupport<CatchLongline, CatchL dto.setPredator(toReferentialReferenceList(referentialLocale, entity.getPredator(), SpeciesDto.class)); dto.setSizeMeasure(toLinkedHashSetData(referentialLocale, entity.getSizeMeasure(), SizeMeasureDto.class)); dto.setWeightMeasure(toLinkedHashSetData(referentialLocale, entity.getWeightMeasure(), WeightMeasureDto.class)); + dto.setTagNumber(entity.getTagNumber()); } 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 48e1d5a..69ac71c 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 @@ -56,6 +56,7 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No entity.setLength(dto.getLength()); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setSex(toEntity(dto.getSex(), Sex.class)); + entity.setTagNumber(dto.getTagNumber()); } @@ -74,6 +75,7 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No dto.setLength(entity.getLength()); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setSex(toReferentialReference(referentialLocale, entity.getSex(), SexDto.class)); + dto.setTagNumber(entity.getTagNumber()); } } 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 b590d6a..a25723c 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 @@ -58,6 +58,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe entity.setWeight(dto.getWeight()); entity.setIsWeightComputed(dto.isIsWeightComputed()); entity.setAcquisitionMode(dto.getAcquisitionMode()); + entity.setTagNumber(dto.getTagNumber()); } @@ -75,6 +76,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe dto.setWeight(entity.getWeight()); dto.setIsWeightComputed(entity.isIsWeightComputed()); dto.setAcquisitionMode(entity.getAcquisitionMode()); + dto.setTagNumber(entity.getTagNumber()); } -- 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 5731c8b5e3234edc204e528b3f4a62360406aea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:53 2016 +0100 Ajout length.tagNumber (ui) --- .../ui/content/table/impl/longline/CatchLonglineUI.jaxx | 15 +++++++++++++-- .../ui/content/table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../ui/content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++++ .../ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 15 +++++++++++++++ .../ui/content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++++ .../content/table/impl/seine/TargetSampleUIModel.java | 3 ++- .../resources/i18n/application-swing_en_GB.properties | 2 ++ .../resources/i18n/application-swing_es_ES.properties | 2 ++ .../resources/i18n/application-swing_fr_FR.properties | 2 ++ 10 files changed, 88 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index 14815cc..4aa6e01 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -181,14 +181,25 @@ </row> <!-- speciesCatch --> + <!-- tagNumber --> <row> <cell> <JLabel id='speciesCatchLabel'/> </cell> - <cell weightx='1' anchor='east' columns="3"> + <cell weightx='1' anchor='east'> <BeanComboBox id='speciesCatch' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> </cell> - + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='tagNumberToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetTagNumber' styleClass='resetButton'/> + </JToolBar> + <JTextField id='tagNumber' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> </row> <!-- count --> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index ed5c587..3c3faae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -137,6 +137,23 @@ _tablePropertyName:{CatchLonglineDto.PROPERTY_PHOTO_REFERENCES}; } +#tagNumberLabel { + text:"observe.content.common.tagNumber"; + labelFor:{tagNumber}; +} + +#resetTagNumber { + toolTipText:"observe.content.common.action.reset.tagNumber.tip"; + _resetTablePropertyName:{CatchLonglineDto.PROPERTY_TAG_NUMBER}; + enabled:{tableEditBean.getAcquisitionMode() == 0}; +} + +#tagNumber { + text:{getStringValue(tableEditBean.getTagNumber())}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_TAG_NUMBER}; + enabled:{tableEditBean.getAcquisitionMode() == 0}; +} + #countLabel { text:"observe.content.catchLongline.count"; labelFor:{count}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java index c5ce76c..054e30e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java @@ -70,6 +70,7 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt CatchLonglineDto.PROPERTY_HOOK_POSITION, CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, + CatchLonglineDto.PROPERTY_TAG_NUMBER, CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED).build(); public static final Set<String> DEPREDATED_TAB_PROPERTIES = @@ -142,6 +143,7 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt CatchLonglineDto.PROPERTY_SECTION, CatchLonglineDto.PROPERTY_BASKET, CatchLonglineDto.PROPERTY_BRANCHLINE, + CatchLonglineDto.PROPERTY_TAG_NUMBER, CatchLonglineDto.PROPERTY_COMMENT }); 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 7e76dab..2abd16d 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 @@ -104,3 +104,20 @@ JToolBar { #comment2 { text:{getStringValue(bean.getComment())}; } + +#tagNumberLabel { + text:"observe.content.common.tagNumber"; + labelFor:{tagNumber}; +} + +#resetTagNumber { + toolTipText:"observe.content.common.action.reset.tagNumber.tip"; + _resetTablePropertyName:{"tagNumber"}; + enabled:{tableEditBean.getAcquisitionMode() == 1}; +} + +#tagNumber { + text:{getStringValue(tableEditBean.getTagNumber())}; + _tablePropertyName:{"tagNumber"}; + enabled:{tableEditBean.getAcquisitionMode() == 1}; +} 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 1098ec4..ac03944 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 @@ -203,6 +203,21 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species </cell> </row> + <!-- tagNumber --> + <row> + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='tagNumberToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetTagNumber' styleClass='resetButton'/> + </JToolBar> + <JTextField id='tagNumber' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + </Table> <Table id='extraZone' fill='both' weightx='1' insets='0'> 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 a660b5e..63d969c 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 @@ -175,6 +175,22 @@ public String getLengthDataTip(boolean computed) { <NumberEditor id='count' constructorParams='this'/> </cell> </row> + + <!-- tagNumber --> + <row> + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='tagNumberToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetTagNumber' styleClass='resetButton'/> + </JToolBar> + <JTextField id='tagNumber' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + </Table> <Table id='extraZone' fill='both' weightx='1' insets='0'> 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 1efdf22..7c41275 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 @@ -61,7 +61,8 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta TargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, TargetLengthDto.PROPERTY_COUNT, TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, - TargetLengthDto.PROPERTY_ACQUISITION_MODE}); + TargetLengthDto.PROPERTY_ACQUISITION_MODE, + TargetLengthDto.PROPERTY_TAG_NUMBER}); List<ContentTableMeta<TargetLengthDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SPECIES, true), 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 71ac088..da89e82 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 @@ -787,6 +787,8 @@ observe.content.choose.sensorUsed.title.exportData=Choose where to export data observe.content.choose.sensorUsed.title.importData=Choose file to import observe.content.choose.tdr.title.exportData=Choose where to export data observe.content.choose.tdr.title.importData=Choose file to import +observe.content.common.action.reset.tagNumber.tip=Reset tag number +observe.content.common.tagNumber=Tag number observe.content.encounter.action.create=Insert this encounter observe.content.encounter.action.create.tip=Insert this encounter observe.content.encounter.count=Count 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 c36a56a..fc25e7b 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 @@ -787,6 +787,8 @@ observe.content.choose.sensorUsed.title.exportData=Elegir la ubicación del arch observe.content.choose.sensorUsed.title.importData=Elegir el archivo de datos a importar observe.content.choose.tdr.title.exportData=Elegir la ubicación del archivo de datos a exportar observe.content.choose.tdr.title.importData=Elegir el archivo de datos a importar +observe.content.common.action.reset.tagNumber.tip=Réinitialiser le numéro d'échantillon \#TODO +observe.content.common.tagNumber=Numéro d'échantillon \#TODO observe.content.encounter.action.create=Insertar este encuentro observe.content.encounter.action.create.tip=Insertar este encuentro observe.content.encounter.count=Numéro 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 6005e77..432bdde 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 @@ -787,6 +787,8 @@ observe.content.choose.sensorUsed.title.exportData=Choisir l'emplacement du fich observe.content.choose.sensorUsed.title.importData=Choisir le fichier de données à importer observe.content.choose.tdr.title.exportData=Choisir l'emplacement du fichier de données à exporter observe.content.choose.tdr.title.importData=Choisir le fichier de données à importer +observe.content.common.action.reset.tagNumber.tip=Réinitialiser le numéro d'échantillon +observe.content.common.tagNumber=Numéro échantillon observe.content.encounter.action.create=Insérer cette rencontre observe.content.encounter.action.create.tip=Insérer cette rencontre observe.content.encounter.count=Nombre -- 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 ce5b98830fe1bdf0cd1f66fffe3f48f632476742 Merge: c6b0f1a 5731c8b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:59 2016 +0100 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop .../table/impl/longline/CatchLonglineUI.jaxx | 15 ++++++++++++-- .../table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++ .../table/impl/seine/AbstractSampleUIHandler.java | 19 +++++++++++++---- .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++++++++++++++ .../content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++ .../table/impl/seine/TargetSampleUIModel.java | 3 ++- .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../DataSourceMigrationForVersion_5_1.java | 23 ++++++++++----------- .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 3 +++ .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 3 +++ entities/src/main/xmi/observe-longline.zargo | Bin 93649 -> 93746 bytes entities/src/main/xmi/observe-seine.zargo | Bin 85870 -> 86054 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 21 files changed, 126 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm