Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fc8b728 by Tony CHEMIT at 2017-07-28T17:37:47+02:00 Re-add supportVesselName on FloatingObject (See #803) - - - - - 12 changed files: - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - persistence/src/main/models/Observe.model - − persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql - − persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql - persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql - services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java - services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml - services/src/main/models/Observe.model Changes: ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml @@ -60,6 +60,19 @@ </field> + <field name="supportVesselName"> + + <!-- supportVesselName de ${maxLength} caractères maximum --> + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">maxLength:32</param> + <param name="expression"> + <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> + </param> + <message>validator.ui.floatingObject.size.supportVesselName##${ints.maxLength}</message> + </field-validator> + + </field> + <field name="comment"> <!-- comentaire de moins de 1024 caractères --> ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml @@ -60,6 +60,19 @@ </field> + <field name="supportVesselName"> + + <!-- supportVesselName de ${maxLength} caractères maximum --> + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">maxLength:32</param> + <param name="expression"> + <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> + </param> + <message>validator.ui.floatingObject.size.supportVesselName##${ints.maxLength}</message> + </field-validator> + + </field> + <field name="comment"> <!-- comentaire de moins de 1024 caractères --> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -92,6 +92,19 @@ </cell> </row> <row> + <cell anchor="west"> + <JLabel id='supportVesselNameLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='supportVesselNameToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetSupportVesselName' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='supportVesselName' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <row> <cell columns='2'> <JPanel id='floatingObjectReferencePanel' layout="{new BorderLayout()}"> <JLabel id='floatingObjectReferenceLabel' constraints='BorderLayout.CENTER'/> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -82,6 +82,22 @@ BeanComboBox { selectedItem:{bean.getObjectType()}; } +#supportVesselNameLabel { + text:"observe.common.supportVesselName"; + labelFor:{supportVesselName}; +} + +#supportVesselName { + _propertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; + text:{getStringValue(bean.getSupportVesselName())}; + _validatorLabel:{t("observe.common.supportVesselName")}; +} + +#resetSupportVesselName{ + toolTipText:"observe.content.action.reset.supportVesselName.tip"; + _resetPropertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; +} + #comment { title:"observe.common.comment.floatingObject"; } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java @@ -60,7 +60,6 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC 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); ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -727,6 +727,7 @@ objectSchoolEstimate + {*} seine.ObjectSchoolEstimate objectObservedSpecies + {*} seine.ObjectObservedSpecies objectType {*:0..1} referentiel.seine.ObjectType objectOperation {*:1} referentiel.seine.ObjectOperation +supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique floatingObjectPart + {*} seine.FloatingObjectPart | unique getTypeTransmittingBuoyOperation() !fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation ===================================== persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql deleted ===================================== --- a/persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql +++ /dev/null @@ -1,22 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as --- published by the Free Software Foundation, either version 3 of the --- License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- -ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName; ===================================== persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql deleted ===================================== --- a/persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql +++ /dev/null @@ -1,22 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as --- published by the Free Software Foundation, either version 3 of the --- License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- -ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName CASCADE; ===================================== persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql +++ b/persistence/src/main/resources/db/migration/6.901/01_add_object_operation-PG.sql @@ -44,9 +44,9 @@ UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entit UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'; UPDATE observe_seine.floatingObject set objectOperation2 = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' WHERE objectOperation = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' AND objectFate not in ('fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683674#0.32469201752917276','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.7559688295127481','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.88526017739943','fr.ird.observe.entities.referentiel.seine.ObjectFate#1239832683675#0.190123844350496', 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488'); -alter table observe_seine.floatingObject drop COLUMN objectOperation; -alter table observe_seine.floatingObject drop COLUMN objectFate; -drop table observe_seine.objectFate; +alter table observe_seine.floatingObject drop COLUMN objectOperation CASCADE; +alter table observe_seine.floatingObject drop COLUMN objectFate CASCADE; +drop table observe_seine.objectFate CASCADE; delete from observe_seine.objectOperation; ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java @@ -50,6 +50,7 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class)); entity.setObjectType(toEntity(dto.getObjectType(), ObjectType.class)); + entity.setSupportVesselName(dto.getSupportVesselName()); } @@ -60,6 +61,7 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class)); dto.setObjectType(toReferentialReference(referentialLocale, entity.getObjectType(), ObjectTypeDto.class)); + dto.setSupportVesselName(entity.getSupportVesselName()); } ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml +++ b/services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml @@ -60,6 +60,19 @@ </field> + <field name="supportVesselName"> + + <!-- supportVesselName de ${maxLength} caractères maximum --> + <field-validator type="fieldexpressionwithparams"> + <param name="intParams">maxLength:32</param> + <param name="expression"> + <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> + </param> + <message>validator.service.floatingObject.size.supportVesselName##${ints.maxLength}</message> + </field-validator> + + </field> + <field name="comment"> <!-- comentaire de moins de 1024 caractères --> ===================================== services/src/main/models/Observe.model ===================================== --- a/services/src/main/models/Observe.model +++ b/services/src/main/models/Observe.model @@ -623,6 +623,7 @@ activityFinDeVeille + {*:1} boolean seine.FloatingObject > Commentable objectType {*:0..1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectTypeDto objectOperation {*:1} reference.ReferentialReference | attributeGeneric=fr.ird.observe.services.dto.referential.seine.ObjectOperationDto +supportVesselName + {*:1} String seine.FloatingObjectObservedSpecies > Commentable objectObservedSpecies {*} seine.ObjectObservedSpecies View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7fc8b728e45c16da682aad8f6025... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7fc8b728e45c16da682aad8f6025... You're receiving this email because of your account on gitlab.com.