Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

16 changed files:

Changes:

  • application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml
    ... ... @@ -60,16 +60,6 @@
    60 60
    61 61 
       </field>
    62 62
    63 
    -  <field name="daysAtSeaCount">
    64 
    -
    65 
    -    <!-- count de jours a la mer positif -->
    66 
    -    <field-validator type="int" short-circuit="true">
    67 
    -      <param name="min">0</param>
    68 
    -      <message>validator.ui.floatingObject.positive.daysAtSeaCount</message>
    69 
    -    </field-validator>
    70 
    -
    71 
    -  </field>
    72 
    -
    73 63 
       <field name="comment">
    74 64
    75 65 
         <!-- comentaire de moins de 1024 caractères -->

  • application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml deleted
    1 
    -<?xml version="1.0" encoding="UTF-8"?>
    2 
    -<!--
    3 
    -  #%L
    4 
    -  ObServe :: Application Swing Validation
    5 
    -  %%
    6 
    -  Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 
    -  %%
    8 
    -  This program is free software: you can redistribute it and/or modify
    9 
    -  it under the terms of the GNU General Public License as
    10 
    -  published by the Free Software Foundation, either version 3 of the
    11 
    -  License, or (at your option) any later version.
    12 
    -
    13 
    -  This program is distributed in the hope that it will be useful,
    14 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    -  GNU General Public License for more details.
    17 
    -
    18 
    -  You should have received a copy of the GNU General Public
    19 
    -  License along with this program.  If not, see
    20 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    -  #L%
    22 
    -  -->
    23 
    -
    24 
    -<!DOCTYPE validators PUBLIC
    25 
    -  "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    -  "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    -<validators>
    28 
    -
    29 
    -  <field name="daysAtSeaCount">
    30 
    -
    31 
    -    <!-- count de jour a l'eau non renseigne -->
    32 
    -    <field-validator type="required" short-circuit="true">
    33 
    -      <message>validator.ui.floatingObject.null.daysAtSeaCount</message>
    34 
    -    </field-validator>
    35 
    -
    36 
    -  </field>
    37 
    -
    38 
    -</validators>

  • application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml
    ... ... @@ -60,16 +60,6 @@
    60 60
    61 61 
       </field>
    62 62
    63 
    -  <field name="daysAtSeaCount">
    64 
    -
    65 
    -    <!-- count de jours a la mer positif -->
    66 
    -    <field-validator type="int" short-circuit="true">
    67 
    -      <param name="min">0</param>
    68 
    -      <message>validator.ui.floatingObject.positive.daysAtSeaCount</message>
    69 
    -    </field-validator>
    70 
    -
    71 
    -  </field>
    72 
    -
    73 63 
       <field name="comment">
    74 64
    75 65 
         <!-- comentaire de moins de 1024 caractères -->

  • application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml deleted
    1 
    -<?xml version="1.0" encoding="UTF-8"?>
    2 
    -<!--
    3 
    -  #%L
    4 
    -  ObServe :: Application Swing Validation
    5 
    -  %%
    6 
    -  Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 
    -  %%
    8 
    -  This program is free software: you can redistribute it and/or modify
    9 
    -  it under the terms of the GNU General Public License as
    10 
    -  published by the Free Software Foundation, either version 3 of the
    11 
    -  License, or (at your option) any later version.
    12 
    -
    13 
    -  This program is distributed in the hope that it will be useful,
    14 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    -  GNU General Public License for more details.
    17 
    -
    18 
    -  You should have received a copy of the GNU General Public
    19 
    -  License along with this program.  If not, see
    20 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    -  #L%
    22 
    -  -->
    23 
    -
    24 
    -<!DOCTYPE validators PUBLIC
    25 
    -  "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    -  "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    -<validators>
    28 
    -
    29 
    -  <field name="daysAtSeaCount">
    30 
    -
    31 
    -    <!-- count de jour a l'eau non renseigne -->
    32 
    -    <field-validator type="required" short-circuit="true">
    33 
    -      <message>validator.ui.floatingObject.null.daysAtSeaCount</message>
    34 
    -    </field-validator>
    35 
    -
    36 
    -  </field>
    37 
    -
    38 
    -</validators>

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx
    ... ... @@ -86,14 +86,6 @@
    86 86 
                         </cell>
    87 87 
                       </row>
    88 88 
                       <row>
    89 
    -                    <cell anchor='west'>
    90 
    -                      <JLabel id='daysAtSeaCountLabel'/>
    91 
    -                    </cell>
    92 
    -                    <cell anchor='east' weightx="1">
    93 
    -                      <NumberEditor id='daysAtSeaCount' constructorParams='this' styleClass="int6"/>
    94 
    -                    </cell>
    95 
    -                  </row>
    96 
    -                  <row>
    97 89 
                         <cell columns='2' fill="both" weighty="0.7">
    98 90 
                           <JComment id="comment"/>
    99 91 
                         </cell>

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss
    ... ... @@ -72,18 +72,6 @@ BeanComboBox {
    72 72 
       selectedItem:{bean.getObjectType()};
    73 73 
     }
    74 74
    75 
    -#daysAtSeaCountLabel {
    76 
    -  text:"observe.common.daysAtSeaCount";
    77 
    -  labelFor:{daysAtSeaCount};
    78 
    -}
    79 
    -
    80 
    -#daysAtSeaCount {
    81 
    -  bean:{bean};
    82 
    -  property:{FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT};
    83 
    -  numberValue:{bean.getDaysAtSeaCount()};
    84 
    -  showReset:true;
    85 
    -}
    86 
    -
    87 75 
     #comment {
    88 76 
       title:"observe.common.comment.floatingObject";
    89 77 
     }

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
    ... ... @@ -207,8 +207,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
    207 207 
                            getTypeI18nKey(FloatingObjectDto.class),
    208 208 
                            t("observe.content.floatingObject.message.updating"));
    209 209 
             }
    210 
    -        super.startEditUI(FloatingObjectUI.BINDING_DAYS_AT_SEA_COUNT_NUMBER_VALUE,
    211 
    -                          FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM,
    210 
    +        super.startEditUI(FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM,
    212 211 
                               FloatingObjectUI.BINDING_COMMENT_MODEL);
    213 212 
             contentUIModel.setModified(create);
    214 213 
         }

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java
    ... ... @@ -72,7 +72,6 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
    72 72 
         public static final Set<String> GENERAL_TAB_PROPERTIES =
    73 73 
                 ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION,
    74 74 
                                                    FloatingObjectDto.PROPERTY_OBJECT_TYPE,
    75 
    -                                               FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT,
    76 75 
                                                    FloatingObjectDto.PROPERTY_COMMENT).build();
    77 76
    78 77 
         static final Set<String> MATERIALS_TAB_PROPERTIES =

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java
    ... ... @@ -49,6 +49,7 @@ public class DataSourceMigrationForVersion_7_0 extends AbstractObserveMigrationC
    49 49 
             addScript("01", "add_object_operation", queries);
    50 50 
             addScript("02", "add_object_material", queries);
    51 51 
             addScript("03", "add_floating_object_part", queries);
    52 
    +        addScript("04", "remove_dcp_fields", queries);
    52 53 
         }
    53 54
    54 55 
         public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_0 {

  • persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_H2.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +ALTER TABLE observe_seine.FloatingObject DROP COLUMN DAYSATSEACOUNT;
    23 
    +

  • persistence/src/main/resources/db/migration/6.901/04_remove_dcp_fields_PG.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +ALTER TABLE observe_seine.FloatingObject DROP COLUMN DAYSATSEACOUNT;
    23 
    +

  • persistence/src/main/xmi/observe-seine.zargo
    No preview for this file type
  • services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java
    ... ... @@ -48,7 +48,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa
    48 48
    49 49 
             copyDtoDataFieldsToEntity(dto, entity);
    50 50
    51 
    -        entity.setDaysAtSeaCount(dto.getDaysAtSeaCount());
    52 51 
             entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class));
    53 52 
             entity.setObjectType(toEntity(dto.getObjectType(), ObjectType.class));
    54 53
    ... ... @@ -59,7 +58,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa
    59 58
    60 59 
             copyEntityDataFieldsToDto(entity, dto);
    61 60
    62 
    -        dto.setDaysAtSeaCount(entity.getDaysAtSeaCount());
    63 61 
             dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class));
    64 62 
             dto.setObjectType(toReferentialReference(referentialLocale, entity.getObjectType(), ObjectTypeDto.class));
    65 63

  • services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml
    ... ... @@ -60,16 +60,6 @@
    60 60
    61 61 
       </field>
    62 62
    63 
    -  <field name="daysAtSeaCount">
    64 
    -
    65 
    -    <!-- count de jours a la mer positif -->
    66 
    -    <field-validator type="int" short-circuit="true">
    67 
    -      <param name="min">0</param>
    68 
    -      <message>validator.service.floatingObject.positive.daysAtSeaCount</message>
    69 
    -    </field-validator>
    70 
    -
    71 
    -  </field>
    72 
    -
    73 63 
       <field name="comment">
    74 64
    75 65 
         <!-- comentaire de moins de 1024 caractères -->

  • services-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-warning-validation.xml deleted
    1 
    -<?xml version="1.0" encoding="UTF-8"?>
    2 
    -<!--
    3 
    -  #%L
    4 
    -  ObServe :: Services Validation
    5 
    -  %%
    6 
    -  Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 
    -  %%
    8 
    -  This program is free software: you can redistribute it and/or modify
    9 
    -  it under the terms of the GNU General Public License as
    10 
    -  published by the Free Software Foundation, either version 3 of the
    11 
    -  License, or (at your option) any later version.
    12 
    -
    13 
    -  This program is distributed in the hope that it will be useful,
    14 
    -  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    -  GNU General Public License for more details.
    17 
    -
    18 
    -  You should have received a copy of the GNU General Public
    19 
    -  License along with this program.  If not, see
    20 
    -  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    -  #L%
    22 
    -  -->
    23 
    -
    24 
    -<!DOCTYPE validators PUBLIC
    25 
    -  "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 
    -  "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 
    -<validators>
    28 
    -
    29 
    -  <field name="daysAtSeaCount">
    30 
    -
    31 
    -    <!-- count de jour a l'eau non renseigne -->
    32 
    -    <field-validator type="required" short-circuit="true">
    33 
    -      <message>validator.service.floatingObject.null.daysAtSeaCount</message>
    34 
    -    </field-validator>
    35 
    -
    36 
    -  </field>
    37 
    -
    38 
    -</validators>

  • services/src/main/xmi/observe-services-dto-seine.zargo
    No preview for this file type

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.