branch develop updated (7d7bdee -> 10d3542)
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 discards 7d7bdee Correction de la migration des SpeciesFate (Fixes #8377) new 0286243 Correction de la migration des SpeciesFate + utilisation version Boolean (Fixes #8377) new 38a3c3b fix pg migration script new 10d3542 fix jaxx binding This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7d7bdee) \ N -- N -- N refs/heads/develop (10d3542) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 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 10d35425d9d6df672c40e67ed055b513227bdf95 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 09:33:00 2016 +0100 fix jaxx binding commit 38a3c3be3d9755d92b9ae1d1adc395ca31acb93c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 08:49:33 2016 +0100 fix pg migration script commit 02862436c146b6e09b79f9a458d496df6aa8f86b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 08:49:23 2016 +0100 Correction de la migration des SpeciesFate + utilisation version Boolean (Fixes #8377) Summary of changes: .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 49 +++++++++------------ .../ui/content/ref/impl/seine/SpeciesFateUI.jcss | 9 +++- .../content/ref/impl/seine/SpeciesFateUIModel.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 7 ++- .../V5_1_08_evol_8390_measure_type-PG.sql | 6 ++- entities/src/main/xmi/observe-seine.zargo | Bin 86714 -> 86801 bytes .../ReferentialReferenceSetDefinitions.java | 2 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60566 -> 60613 bytes .../binder/referential/SpeciesFateBinder.java | 8 ++-- 9 files changed, 43 insertions(+), 40 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 02862436c146b6e09b79f9a458d496df6aa8f86b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 08:49:23 2016 +0100 Correction de la migration des SpeciesFate + utilisation version Boolean (Fixes #8377) --- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 49 +++++++++------------ .../ui/content/ref/impl/seine/SpeciesFateUI.jcss | 9 +++- .../table/impl/seine/NonTargetCatchUIHandler.java | 7 ++- ...5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 9 +++- ...5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 9 +++- entities/src/main/xmi/observe-seine.zargo | Bin 86714 -> 86801 bytes .../ReferentialReferenceSetDefinitions.java | 2 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60566 -> 60613 bytes .../binder/referential/SpeciesFateBinder.java | 8 ++-- 9 files changed, 54 insertions(+), 39 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx index be5a518..3f100f7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx @@ -29,16 +29,15 @@ fr.ird.observe.services.dto.constants.ReferenceStatus fr.ird.observe.services.dto.referential.seine.SpeciesFateDto fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel + fr.ird.observe.application.swing.ui.util.BooleanEditor static fr.ird.observe.application.swing.ui.UIHelper.getStringValue static org.nuiton.i18n.I18n.n </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.seine.SpeciesFateDto' - context='ui-create' - errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.seine.SpeciesFateDto'/> <!-- model --> <SpeciesFateUIModel id='model'/> @@ -65,10 +64,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' constraints='BorderLayout.WEST' - onKeyReleased='getBean().setCode(code.getText())'/> - <EnumEditor id='status' constraints='BorderLayout.CENTER' - constructorParams='ReferenceStatus.class' + <JTextField id='code' constraints='BorderLayout.WEST' onKeyReleased='getBean().setCode(code.getText())'/> + <EnumEditor id='status' constraints='BorderLayout.CENTER' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> </JPanel> @@ -78,18 +75,20 @@ <!-- needComment --> <row> <cell anchor='east' weightx="1" fill="both" columns="2"> - <JCheckBox id='needComment' - onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + <JCheckBox id='needComment' onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> </cell> </row> <!-- discard --> <row> - <cell anchor='east' weightx="1" fill="both" columns="2"> - <JCheckBox id='discard' - onItemStateChanged='getBean().setDiscard(discard.isSelected())'/> + <cell anchor="west"> + <JLabel id='discardLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='discard' onItemStateChanged='getBean().setDiscard(discard.getBooleanValue())'/> </cell> </row> + </Table> <Table id='editI18nTable'> @@ -98,15 +97,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' - onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' - onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> </cell> </row> <row> @@ -114,15 +111,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' - onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' - onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> </cell> </row> <row> @@ -130,15 +125,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' - onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' - onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> </cell> </row> <row> @@ -146,15 +139,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' - onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' - onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss index ce9ff62..f70926f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss @@ -20,8 +20,13 @@ * #L% */ -#discard { +#discardLabel { text:"observe.common.discard"; - selected:{bean.isDiscard()}; + labelFor:{discard}; +} + +#discard { + booleanValue:{bean.getDiscard()}; + _propertyName:{SpeciesFateDto.PROPERTY_DISCARD}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 288c7f3..b9918a2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -401,7 +401,12 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } public boolean showReasonForDiscard(ReferentialReference<SpeciesFateDto> speciesFate) { - return speciesFate != null && (boolean) speciesFate.getPropertyValue(SpeciesFateDto.PROPERTY_DISCARD); + boolean result = speciesFate != null; + if (result) { + Boolean discard = (Boolean) speciesFate.getPropertyValue(SpeciesFateDto.PROPERTY_DISCARD); + result = discard == null || discard; + } + return result; } protected NonTargetCatchService getNonTargetCatchService() { diff --git a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql index 18ae37a..bc1b035 100644 --- a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql @@ -1 +1,8 @@ -ALTER TABLE observe_seine.speciesfate ADD COLUMN discard BOOLEAN DEFAULT false; \ No newline at end of file +ALTER TABLE observe_seine.speciesfate ADD COLUMN discard BOOLEAN; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='1'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='3'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='4'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='5'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='2'; +UPDATE observe_seine.speciesfate SET discard = false WHERE code ='6'; +UPDATE observe_seine.speciesfate SET discard = false WHERE code ='8'; diff --git a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql index 18ae37a..bc1b035 100644 --- a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql @@ -1 +1,8 @@ -ALTER TABLE observe_seine.speciesfate ADD COLUMN discard BOOLEAN DEFAULT false; \ No newline at end of file +ALTER TABLE observe_seine.speciesfate ADD COLUMN discard BOOLEAN; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='1'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='3'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='4'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='5'; +UPDATE observe_seine.speciesfate SET discard = true WHERE code ='2'; +UPDATE observe_seine.speciesfate SET discard = false WHERE code ='6'; +UPDATE observe_seine.speciesfate SET discard = false WHERE code ='8'; diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index de28753..68f4ce1 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ 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 5b06607..d46b97d 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 @@ -244,7 +244,7 @@ public enum ReferentialReferenceSetDefinitions { REASON_FOR_NULL_SET(newDefaultDefinitionBuilder(ReasonForNullSetDto.class)), SPECIES_FATE(newDefaultDefinitionBuilder(SpeciesFateDto.class) - .addProperty(boolean.class, SpeciesFateDto.PROPERTY_DISCARD)), + .addProperty(Boolean.class, SpeciesFateDto.PROPERTY_DISCARD)), SPECIES_STATUS(newDefaultDefinitionBuilder(SpeciesStatusDto.class)), 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 843fee6..ee71220 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-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java index 90b4329..e9133aa 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java @@ -43,7 +43,7 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); - entity.setDiscard(dto.isDiscard()); + entity.setDiscard(dto.getDiscard()); } @@ -52,20 +52,20 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); - dto.setDiscard(entity.isDiscard()); + dto.setDiscard(entity.getDiscard()); } @Override public ReferentialReference<SpeciesFateDto> toReferentialReference(ReferentialLocale referentialLocale, SpeciesFate entity) { - return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isDiscard()); + return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.getDiscard()); } @Override public ReferentialReference<SpeciesFateDto> toReferentialReference(ReferentialLocale referentialLocale, SpeciesFateDto dto) { - return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isDiscard()); + return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.getDiscard()); } } -- 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 38a3c3be3d9755d92b9ae1d1adc395ca31acb93c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 08:49:33 2016 +0100 fix pg migration script --- .../resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index edaa004..fa33d6f 100644 --- 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 @@ -1,8 +1,10 @@ -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 [...] +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); +INSERT INTO observe_common.SIZEMEASURETYPE(topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8) (SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM OBSERVE_LONGLINE.SIZEMEASURETYPE); -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 [...] +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); +INSERT INTO observe_common.WEIGHTMEASURETYPE( topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8) (SELECT topiaId, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM OBSERVE_LONGLINE.WEIGHTMEASURETYPE); 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'; -- 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 10d35425d9d6df672c40e67ed055b513227bdf95 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 09:33:00 2016 +0100 fix jaxx binding --- .../application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java index cc710c1..73c5dd0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java @@ -38,7 +38,7 @@ public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFateDto> public SpeciesFateUIModel() { super(SpeciesFateDto.class, new String[]{SpeciesFateDto.PROPERTY_DISCARD}, - new String[]{SpeciesFateUI.BINDING_DISCARD_SELECTED}); + new String[]{SpeciesFateUI.BINDING_DISCARD_BOOLEAN_VALUE}); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm