Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe

Commits:

7 changed files:

Changes:

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss
    ... ... @@ -73,6 +73,7 @@
    73 73 
     #section {
    74 74 
       property:{CatchLonglineDto.PROPERTY_SECTION};
    75 75 
       selectedItem:{tableEditBean.getSection()};
    76 
    +  force:true;
    76 77 
       _listNoLoad:{true};
    77 78 
     }
    78 79

  • pom.xml
    ... ... @@ -169,7 +169,7 @@
    169 169
    170 170 
         <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
    171 171 
         <processorPluginVersion>1.3</processorPluginVersion>
    172 
    -    <jaxxVersion>2.40</jaxxVersion>
    172 
    +    <jaxxVersion>2.41</jaxxVersion>
    173 173 
         <nuitonI18nVersion>3.6.3</nuitonI18nVersion>
    174 174 
         <nuitonConfigVersion>3.2</nuitonConfigVersion>
    175 175 
         <topiaVersion>3.2.1</topiaVersion>

  • services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java
    1 
    +package fr.ird.observe.services.dto.longline;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services DTO
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.services.dto.DataReference;
    26 
    +
    27 
    +import javax.annotation.Generated;
    28 
    +
    29 
    +@Generated(value = "org.nuiton.eugene.java.BeanTransformer", date = "Wed Mar 01 18:04:05 CET 2017")
    30 
    +public class CatchLonglineDto extends GeneratedCatchLonglineDto {
    31 
    +
    32 
    +
    33 
    +    public void setSection(DataReference<SectionDto> section) {
    34 
    +        super.setSection(section);
    35 
    +        System.out.println("WTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTF ???? to section: "+section);
    36 
    +    }
    37 
    +
    38 
    +    private static final long serialVersionUID = 3846975004402399536L;
    39 
    +} //CatchLonglineDto

  • services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
    ... ... @@ -200,25 +200,25 @@ public enum DataReferenceSetDefinitions {
    200 200 
                              .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)),
    201 201
    202 202 
         SECTION(newDefinitionBuilder(SectionDto.class)
    203 
    -                    .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)
    204 
    -                    .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)),
    203 
    +                    .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)
    204 
    +                    .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)),
    205 205
    206 206 
         BASKET(newDefinitionBuilder(BasketDto.class)
    207 
    -                   .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)
    208 
    -                   .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)),
    207 
    +                   .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)
    208 
    +                   .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)),
    209 209
    210 210 
         BRANCHLINE(newDefinitionBuilder(BranchlineDto.class)
    211 
    -                       .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)
    212 
    -                       .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)),
    211 
    +                       .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)
    212 
    +                       .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)),
    213 213
    214 214 
         BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class)
    215 
    -                                .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER)
    216 215 
                                     .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER)
    216 
    +                                .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER)
    217 217 
                                     .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)),
    218 218
    219 219 
         BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class)
    220 
    -                                   .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER)
    221 220 
                                        .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER)
    221 
    +                                   .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER)
    222 222 
                                        .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)),
    223 223
    224 224 
         FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class)

  • services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java
    ... ... @@ -69,14 +69,14 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> {
    69 69 
         @Override
    70 70 
         public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, Basket entity) {
    71 71
    72 
    -        return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier());
    72 
    +        return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier());
    73 73
    74 74 
         }
    75 75
    76 76 
         @Override
    77 77 
         public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, BasketDto dto) {
    78 78
    79 
    -        return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier());
    79 
    +        return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier());
    80 80
    81 81 
         }
    82 82 
     }

  • services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java
    ... ... @@ -115,14 +115,14 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt
    115 115 
         @Override
    116 116 
         public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, Branchline entity) {
    117 117
    118 
    -        return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier());
    118 
    +        return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier());
    119 119
    120 120 
         }
    121 121
    122 122 
         @Override
    123 123 
         public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, BranchlineDto dto) {
    124 124
    125 
    -        return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier());
    125 
    +        return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier());
    126 126
    127 127 
         }
    128 128 
     }

  • services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java
    ... ... @@ -65,14 +65,18 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> {
    65 65 
         @Override
    66 66 
         public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, Section entity) {
    67 67
    68 
    -        return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier());
    68 
    +        //FIXME-tchemit Je ne sais pas pourquoi mais si on utilise ces deux variables inline
    69 
    +        //FIXME-tchemit alors les valeurs sont inversées!!! pb proxy hibernate
    70 
    +        Integer settingIdentifier = entity.getSettingIdentifier();
    71 
    +        Integer haulingIdentifier = entity.getHaulingIdentifier();
    72 
    +        return toDataReference(entity, settingIdentifier, haulingIdentifier);
    69 73
    70 74 
         }
    71 75
    72 76 
         @Override
    73 77 
         public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, SectionDto dto) {
    74 78
    75 
    -        return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier());
    79 
    +        return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier());
    76 80
    77 81 
         }
    78 82 
     }

    • —
    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.