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

Commits:

12 changed files:

Changes:

  • client-core/.mvn/i18n/parse-validation-messages deleted

  • client-core/pom.xml
    ... ... @@ -770,53 +770,6 @@
    770 770 
             </dependencies>
    771 771 
           </plugin>
    772 772
    773 
    -      <plugin>
    774 
    -        <groupId>fr.ird.observe.toolkit</groupId>
    775 
    -        <artifactId>toolbox-maven-plugin</artifactId>
    776 
    -        <version>${observeToolkitVersion}</version>
    777 
    -        <executions>
    778 
    -          <execution>
    779 
    -            <id>generate-i18n-validator-fields</id>
    780 
    -            <goals>
    781 
    -              <goal>generate-i18n-validator-fields</goal>
    782 
    -            </goals>
    783 
    -          </execution>
    784 
    -          <execution>
    785 
    -            <id>generate-validators-descriptor</id>
    786 
    -            <goals>
    787 
    -              <goal>generate-validators-descriptor</goal>
    788 
    -            </goals>
    789 
    -          </execution>
    790 
    -        </executions>
    791 
    -        <dependencies>
    792 
    -          <dependency>
    793 
    -            <groupId>${project.groupId}</groupId>
    794 
    -            <artifactId>client-core</artifactId>
    795 
    -            <version>${project.version}</version>
    796 
    -          </dependency>
    797 
    -          <dependency>
    798 
    -            <groupId>fr.ird.observe.toolkit</groupId>
    799 
    -            <artifactId>common-validation</artifactId>
    800 
    -            <version>${observeToolkitVersion}</version>
    801 
    -          </dependency>
    802 
    -          <dependency>
    803 
    -            <groupId>io.ultreia.java4all.jaxx</groupId>
    804 
    -            <artifactId>jaxx-widgets-gis</artifactId>
    805 
    -            <version>${lib.version.java4all.jaxx}</version>
    806 
    -          </dependency>
    807 
    -          <dependency>
    808 
    -            <groupId>io.ultreia.java4all.jaxx</groupId>
    809 
    -            <artifactId>jaxx-widgets-temperature</artifactId>
    810 
    -            <version>${lib.version.java4all.jaxx}</version>
    811 
    -          </dependency>
    812 
    -          <dependency>
    813 
    -            <groupId>org.javassist</groupId>
    814 
    -            <artifactId>javassist</artifactId>
    815 
    -            <version>${lib.version.javassist}</version>
    816 
    -          </dependency>
    817 
    -        </dependencies>
    818 
    -      </plugin>
    819 
    -
    820 773 
         </plugins>
    821 774 
       </build>
    822 775

  • client-core/src/main/i18n/getters/validation-fields.getter deleted
    1 
    -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid

  • client-core/src/main/i18n/getters/validation-messages.getter deleted
    1 
    -observe.validation.setLonglineObsDetailComposition.invalid.templates

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java
    ... ... @@ -24,6 +24,7 @@ package fr.ird.observe.client.ui.content.data.ll.observation;
    24 24
    25 25 
     import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel;
    26 26 
     import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto;
    27 
    +import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionUIDto;
    27 28 
     import io.ultreia.java4all.bean.JavaBean;
    28 29 
     import io.ultreia.java4all.bean.definition.JavaBeanDefinition;
    29 30 
     import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
    ... ... @@ -36,7 +37,7 @@ import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
    36 37 
      */
    37 38 
     @SuppressWarnings("WeakerAccess")
    38 39 
     @GenerateJavaBeanDefinition
    39 
    -public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean {
    40 
    +public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean, SetLonglineObsDetailCompositionUIDto {
    40 41
    41 42 
         public static final String PROPERTY_CAN_GENERATE = "canGenerate";
    42 43
    ... ... @@ -125,10 +126,12 @@ public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<Se
    125 126 
             firePropertyChange(PROPERTY_COMPOSITION_TAB_VALID, null, compositionTabValid);
    126 127 
         }
    127 128
    129 
    +    @Override
    128 130 
         public boolean isGenerateTabValid() {
    129 131 
             return generateTabValid;
    130 132 
         }
    131 133
    134 
    +    @Override
    132 135 
         public void setGenerateTabValid(boolean generateTabValid) {
    133 136 
             this.generateTabValid = generateTabValid;
    134 137 
             firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid);

  • dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SetLonglineObsDetailCompositionUIDto.java
    1 
    +package fr.ird.observe.dto.data.ll.observation;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Dto
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2019 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 io.ultreia.java4all.bean.JavaBean;
    26 
    +
    27 
    +/**
    28 
    + * Created on 09/06/19.
    29 
    + *
    30 
    + * @author Tony Chemit - dev@tchemit.fr
    31 
    + * @since ?
    32 
    + */
    33 
    +public interface SetLonglineObsDetailCompositionUIDto extends JavaBean {
    34 
    +
    35 
    +    boolean isGenerateTabValid();
    36 
    +
    37 
    +    void setGenerateTabValid(boolean generateTabValid);
    38 
    +}

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1446,7 +1446,6 @@ observe.common.LonglineDetailCompositionObsDto.sectionsTable.template=Template
    1446 1446 
     observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip=Template used to generate baskets floatline lengths
    1447 1447 
     observe.common.LonglineDetailCompositionObsDto.title=Detailed composition
    1448 1448 
     observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate=Can't use the first template while generating
    1449 
    -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid=Templates
    1450 1449 
     observe.common.LonglineGlobalCompositionDto.message.updating=Updating global composition
    1451 1450 
     observe.common.LonglineGlobalCompositionLogbookDto.message.updating=Updating global composition
    1452 1451 
     observe.common.LonglineGlobalCompositionObsDto.message.updating=Updating global composition
    ... ... @@ -1958,6 +1957,7 @@ observe.common.SetLonglineObsDetailCompositionDto.branchlineDetailTab=Branchline
    1958 1957 
     observe.common.SetLonglineObsDetailCompositionDto.canGenerate=Can generate
    1959 1958 
     observe.common.SetLonglineObsDetailCompositionDto.compositionTab=Composition
    1960 1959 
     observe.common.SetLonglineObsDetailCompositionDto.generateTab=generation
    1960 
    +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid=Templates
    1961 1961 
     observe.common.SetLonglineObsDto.action.reset.homeId.tip=Reset home id
    1962 1962 
     observe.common.SetLonglineObsDto.basketsPerSectionCount=Baskets per section count
    1963 1963 
     observe.common.SetLonglineObsDto.branchlinesPerBasketCount=Hooks per basket count

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -1446,7 +1446,6 @@ observe.common.LonglineDetailCompositionObsDto.sectionsTable.template=Template
    1446 1446 
     observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip=Template
    1447 1447 
     observe.common.LonglineDetailCompositionObsDto.title=Esquema del palangre
    1448 1448 
     observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate=Impossible de utilizar el primer modelo durante la generación
    1449 
    -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid=Templates \#TODO
    1450 1449 
     observe.common.LonglineGlobalCompositionDto.message.updating=Composición global del palangre en proceso de modificación
    1451 1450 
     observe.common.LonglineGlobalCompositionLogbookDto.message.updating=Composición global del palangre en proceso de modificación
    1452 1451 
     observe.common.LonglineGlobalCompositionObsDto.message.updating=Composición global del palangre en proceso de modificación
    ... ... @@ -1958,6 +1957,7 @@ observe.common.SetLonglineObsDetailCompositionDto.branchlineDetailTab=Detalle de
    1958 1957 
     observe.common.SetLonglineObsDetailCompositionDto.canGenerate=Autorizar la generación
    1959 1958 
     observe.common.SetLonglineObsDetailCompositionDto.compositionTab=Composición
    1960 1959 
     observe.common.SetLonglineObsDetailCompositionDto.generateTab=Definición de los modelos
    1960 
    +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid=Templates \#TODO
    1961 1961 
     observe.common.SetLonglineObsDto.action.reset.homeId.tip=Reiniciar el id de negocio
    1962 1962 
     observe.common.SetLonglineObsDto.basketsPerSectionCount=Número de cestas por sección
    1963 1963 
     observe.common.SetLonglineObsDto.branchlinesPerBasketCount=Número de anzuelos por cesta

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -1446,7 +1446,6 @@ observe.common.LonglineDetailCompositionObsDto.sectionsTable.template=Patron
    1446 1446 
     observe.common.LonglineDetailCompositionObsDto.sectionsTable.template.tip=Patron
    1447 1447 
     observe.common.LonglineDetailCompositionObsDto.title=Schéma de palangre
    1448 1448 
     observe.common.LonglineDetailCompositionObsDto.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération
    1449 
    -observe.common.LonglineDetailCompositionObsUIModelDto.generateTabValid=Templates
    1450 1449 
     observe.common.LonglineGlobalCompositionDto.message.updating=Composition globale de la palangre en cours de modification
    1451 1450 
     observe.common.LonglineGlobalCompositionLogbookDto.message.updating=Composition globale de la palangre en cours de modification
    1452 1451 
     observe.common.LonglineGlobalCompositionObsDto.message.updating=Composition globale de la palangre en cours de modification
    ... ... @@ -1958,6 +1957,7 @@ observe.common.SetLonglineObsDetailCompositionDto.branchlineDetailTab=Détail av
    1958 1957 
     observe.common.SetLonglineObsDetailCompositionDto.canGenerate=Autoriser la génération
    1959 1958 
     observe.common.SetLonglineObsDetailCompositionDto.compositionTab=Composition
    1960 1959 
     observe.common.SetLonglineObsDetailCompositionDto.generateTab=Définition des modèles
    1960 
    +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid=Templates
    1961 1961 
     observe.common.SetLonglineObsDto.action.reset.homeId.tip=Réinitialiser l'id métier
    1962 1962 
     observe.common.SetLonglineObsDto.basketsPerSectionCount=Nombre de paniers par section
    1963 1963 
     observe.common.SetLonglineObsDto.branchlinesPerBasketCount=Nombre d'hameçons par panier

  • validation/src/main/i18n/getters/validation-fields.getter
    ... ... @@ -241,6 +241,7 @@ observe.common.SetLonglineLogbookGlobalCompositionDto.floatlinesComposition
    241 241 
     observe.common.SetLonglineLogbookGlobalCompositionDto.floatlinesCompositionProportionSum
    242 242 
     observe.common.SetLonglineLogbookGlobalCompositionDto.hooksComposition
    243 243 
     observe.common.SetLonglineLogbookGlobalCompositionDto.hooksCompositionProportionSum
    244 
    +observe.common.SetLonglineObsDetailCompositionUIDto.generateTabValid
    244 245 
     observe.common.SetLonglineObsDto.basketsPerSectionCount
    245 246 
     observe.common.SetLonglineObsDto.branchlinesPerBasketCount
    246 247 
     observe.common.SetLonglineObsDto.haulingBreaks

  • validation/src/main/i18n/getters/validation-messages.getter
    ... ... @@ -77,6 +77,7 @@ observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp
    77 77 
     observe.validation.setLongline.hooksComposition.uniqueKey
    78 78 
     observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp
    79 79 
     observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp
    80 
    +observe.validation.setLonglineObsDetailComposition.invalid.templates
    80 81 
     observe.validation.species.length.bound
    81 82 
     observe.validation.species.weight.bound
    82 83 
     observe.validation.targetCatch.uniqueKey

  • client-core/src/main/resources/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel-update-error-validation.xml → validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetLonglineObsDetailCompositionUIDto-update-error-validation.xml
    1 1 
     <?xml version="1.0" encoding="UTF-8"?>
    2 2 
     <!--
    3 3 
       #%L
    4 
    -  ObServe :: Client core
    4 
    +  ObServe :: Validation
    5 5 
       %%
    6 6 
       Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    7 7 
       %%

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