June 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] [PS][FAD] Comportement des entrées 'FAD' et 'LOG' - Closes #1324
by Tony CHEMIT 27 Jun '19

27 Jun '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a037ee9d by tchemit at 2019-06-27T05:06:00Z [PS][FAD] Comportement des entrées 'FAD' et 'LOG' - Closes #1324 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== @@ -43,7 +43,6 @@ import fr.ird.observe.dto.data.seine.FloatingObjectReference; import fr.ird.observe.dto.data.seine.ObjectMaterialHierarchyDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; -import fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference; import fr.ird.observe.dto.referential.seine.ObjectOperationReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.actions.consolidate.dcp.ConsolidateFloatingObjectRequest; @@ -310,12 +309,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy(); - ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new); - for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) { - if (objectMaterialHierarchyDto.isEnabled()) { - objectMaterialHierarchyDto.setObjectMaterialType(booleanType); - } - } Map<String, ObjectMaterialDto> allMap = new TreeMap<>(); detailedForm.getAllDtos().forEach(s -> allMap.putIfAbsent(s.getId(), s)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a037ee9dcc41c420a50445cc75c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a037ee9dcc41c420a50445cc75c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Une modification sur le référentiel n'active pas le bouton 'Enregistrer' - Closes #1325
by Tony CHEMIT 27 Jun '19

27 Jun '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 509b0f1c by tchemit at 2019-06-27T04:55:37Z Une modification sur le référentiel n'active pas le bouton 'Enregistrer' - Closes #1325 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss ===================================== @@ -60,8 +60,10 @@ #nonEntangling { booleanValue:{bean.getNonEntangling()}; + _propertyName:{ObjectMaterialDto.PROPERTY_NON_ENTANGLING}; } #biodegradable { booleanValue:{bean.getBiodegradable()}; + _propertyName:{ObjectMaterialDto.PROPERTY_BIODEGRADABLE}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/509b0f1c61127d289d30dfbc649… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/509b0f1c61127d289d30dfbc649… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [REFERENTIEL] Impossible de modifier le parent d'un matériau - Closes #1338
by Tony CHEMIT 27 Jun '19

27 Jun '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e02c7f10 by tchemit at 2019-06-27T04:37:30Z [REFERENTIEL] Impossible de modifier le parent d'un matériau - Closes #1338 - - - - - 1c58659b by tchemit at 2019-06-27T04:43:40Z [REFERENTIEL] La validation sur les Objets flottant matériaux ne fonctionnent plus :( - Closes #1339 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUIHandler.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUIHandler.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.dto.referential.seine.ObjectMaterialReference; import org.nuiton.jaxx.runtime.spi.UIHandler; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -46,6 +45,16 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt @Override public void createUI() { super.createUI(); + setParentList(); + } + + @Override + public void modifyUI() { + super.modifyUI(); + setParentList(); + } + + private void setParentList() { Optional<Set<ObjectMaterialReference>> optionalReferenceSetDto = getModel().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT); if (optionalReferenceSetDto.isPresent()) { @@ -56,16 +65,4 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt } } - @Override - public void modifyUI() { - super.modifyUI(); - ObjectMaterialReference parent = getBean().getParent(); - if (parent == null) { - - getUi().getParentCode().setData(Collections.emptyList()); - } else { - getUi().getParentCode().setData(Collections.singletonList(parent)); - } - } - } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.referential.seine; * #L% */ +import fr.ird.observe.dto.referential.FormulaHelper; import org.apache.commons.lang3.StringUtils; public class ObjectMaterialDto extends GeneratedObjectMaterialDto { @@ -44,6 +45,13 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { return objectMaterialType != null && "fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } + @Override + public void setValidation(String validation) { + super.setValidation(validation); + boolean result = FormulaHelper.validateObjectMaterialValidation(validation, 10); + setValidationValid(result); + } + public boolean withValidation() { return StringUtils.isNoneEmpty(validation); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3cf7c59b335e6d1bcfaa0cf3e9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3cf7c59b335e6d1bcfaa0cf3e9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom
by Tony CHEMIT 27 Jun '19

27 Jun '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 952d393e by tchemit at 2019-06-27T04:18:50Z update pom - - - - - 3cf7c59b by tchemit at 2019-06-27T04:18:55Z [UI REFERENTIEL] Liste des relations taille-poids et taille-taille - Closes #1335 (report V7) + Clés de référentiel non traduite ou nom des clés invalide - See #1336 - - - - - 16 changed files: - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/referential/LengthLengthParameterReference.java - dto/src/main/java/fr/ird/observe/dto/referential/LengthWeightParameterReference.java - dto/src/main/java/fr/ird/observe/dto/referential/PersonHelper.java - dto/src/main/models/Observe.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java - pom.xml - validation/src/main/i18n/getters/validation-fields.getter Changes: ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -36,6 +36,12 @@ observe.common.SetLonglineDetailCompositionDto.type observe.common.SetLonglineDto.type observe.common.SetLonglineGlobalCompositionDto.type observe.common.SetSeineDto.type +observe.common.WithFormula.coefficients +observe.common.WithFormula.coefficientsInformation +observe.common.WithFormula.equation +observe.common.WithFormula.source +observe.common.WithFormula.speciesFaoCode +observe.common.WithFormula.speciesLabel observe.common.gps.activity observe.common.gps.gpsPoint observe.common.inconnu ===================================== dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java ===================================== @@ -50,6 +50,7 @@ public class LengthLengthParameterDtoReferenceBinder extends ReferentialDtoRefer return new LengthLengthParameterReference(dto, dto.getUri(), Optional.ofNullable(dto.getOcean()).map(OceanReference::getLabel).orElse(null), + Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getFaoCode).orElse(null), Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getScientificLabel).orElse(null), Optional.ofNullable(dto.getSex()).map(SexReference::getLabel).orElse(null), dto.getStartDate(), ===================================== dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java ===================================== @@ -49,6 +49,7 @@ public class LengthWeightParameterDtoReferenceBinder extends ReferentialDtoRefer return new LengthWeightParameterReference(dto, dto.getUri(), Optional.ofNullable(dto.getOcean()).map(OceanReference::getLabel).orElse(null), + Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getFaoCode).orElse(null), Optional.ofNullable(dto.getSpecies()).map(SpeciesReference::getScientificLabel).orElse(null), Optional.ofNullable(dto.getSex()).map(SexReference::getLabel).orElse(null), dto.getStartDate(), ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -561,13 +561,13 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLengthLengthParameterDto() { registerDecorator(new LengthLengthParameterDecorator(libelle)); - registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureTypeCode}$s##${outputSizeMeasureTypeCode}$s"); + registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesFaoCode}$s##${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%5$tm/%5$tY##${endDate}$td/%6$tm/%6$tY##${inputSizeMeasureTypeCode}$s##${outputSizeMeasureTypeCode}$s"); } @Override public void initLengthWeightParameterDto() { registerDecorator(new LengthWeightParameterDecorator(libelle)); - registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${sizeMeasureTypeCode}$s"); + registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesFaoCode}$s##${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%5$tm/%5$tY##${endDate}$td/%6$tm/%6$tY##${sizeMeasureTypeCode}$s"); } @Override ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -23,14 +23,21 @@ package fr.ird.observe.dto.decoration; */ import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.referential.I18nReferentialDto; +import fr.ird.observe.dto.referential.LengthLengthParameterDto; +import fr.ird.observe.dto.referential.LengthLengthParameterReference; import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.dto.referential.SpeciesDto; +import fr.ird.observe.dto.referential.WithFormula; import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport; +import org.apache.commons.lang3.StringUtils; import java.util.Map; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.n; @@ -84,11 +91,26 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport n("observe.common.ReferentialDto.uri"); n("observe.common.SetLonglineGlobalCompositionDto.type"); n("observe.common.SetLonglineDetailCompositionDto.type"); + + n("observe.common.WithFormula.equation"); + n("observe.common.WithFormula.coefficients"); + n("observe.common.WithFormula.coefficientsInformation"); + n("observe.common.WithFormula.source"); + n("observe.common.WithFormula.speciesLabel"); + n("observe.common.WithFormula.speciesFaoCode"); } - public ObserveI18nLabelsBuilder() { + ObserveI18nLabelsBuilder() { super(ObserveI18nDecoratorHelper.OBSERVE_COMMON_PREFIX); } + @Override + protected Map<String, String> createPropertyKeyMapping() { + return ImmutableMap.<String, String>builder() + .put("sizeMeasureTypeCode", "sizeMeasureType") + .put("inputSizeMeasureTypeCode", "inputSizeMeasureType") + .put("outputSizeMeasureTypeCode", "outputSizeMeasureType") + .build(); + } @Override protected Map<String, String> createMapping() { @@ -141,11 +163,35 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport .put("traceCutOff", DataDto.class.getSimpleName() + ".") .put("baitHaulingStatus", DataDto.class.getSimpleName() + ".") + .put("coefficientsInformation", WithFormula.class.getSimpleName() + ".") + .put(WithFormula.PROPERTY_COEFFICIENTS, WithFormula.class.getSimpleName() + ".") + .put("equation", WithFormula.class.getSimpleName() + ".") + .put(WithFormula.PROPERTY_SOURCE, WithFormula.class.getSimpleName() + ".") + + .put("speciesLabel", WithFormula.class.getSimpleName() + ".") + .put("speciesFaoCode", WithFormula.class.getSimpleName() + ".") + .build(); } + private static final ImmutableSet<String> SKIP_LABEL = ImmutableSet.of( + "speciesLabel", + "scientificLabel", + "capacityLabel", + "gaugeLabel" + ); + + @Override + public String getPropertyMapping(String property) { + if (Objects.requireNonNull(property).endsWith("Label") && !SKIP_LABEL.contains(property)) { + property = StringUtils.removeEnd(property, "Label"); + } + return super.getPropertyMapping(property); + } + @Override public String getI18nTypeKey(Class type) { return IdHelper.getDtoShortName(type) + "Dto"; } + } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/LengthLengthParameterReference.java ===================================== @@ -28,8 +28,8 @@ import java.util.Date; public class LengthLengthParameterReference extends GeneratedLengthLengthParameterReference implements WithStartEndDate { - public LengthLengthParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesLabel, String sexLabel, Date startDate, Date endDate, String inputSizeMeasureTypeCode, String inputSizeMeasureTypeLabel, String outputSizeMeasureTypeCode, String outputSizeMeasureTypeLabel, String inputOutputFormula, String outputInputFormula) { - super(dto, uri, oceanLabel, speciesLabel, sexLabel, startDate, endDate, inputSizeMeasureTypeCode, inputSizeMeasureTypeLabel, outputSizeMeasureTypeCode, outputSizeMeasureTypeLabel, inputOutputFormula, outputInputFormula); + public LengthLengthParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesFaoCode, String speciesLabel, String sexLabel, Date startDate, Date endDate, String inputSizeMeasureTypeCode, String inputSizeMeasureTypeLabel, String outputSizeMeasureTypeCode, String outputSizeMeasureTypeLabel, String inputOutputFormula, String outputInputFormula) { + super(dto, uri, oceanLabel, speciesFaoCode, speciesLabel, sexLabel, startDate, endDate, inputSizeMeasureTypeCode, inputSizeMeasureTypeLabel, outputSizeMeasureTypeCode, outputSizeMeasureTypeLabel, inputOutputFormula, outputInputFormula); } } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/LengthWeightParameterReference.java ===================================== @@ -28,8 +28,8 @@ import java.util.Date; public class LengthWeightParameterReference extends GeneratedLengthWeightParameterReference implements WithStartEndDate { - public LengthWeightParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesLabel, String sexLabel, Date startDate, Date endDate, String lengthWeightFormula, String weightLengthFormula, String sizeMeasureTypeCode) { - super(dto, uri, oceanLabel, speciesLabel, sexLabel, startDate, endDate, lengthWeightFormula, weightLengthFormula, sizeMeasureTypeCode); + public LengthWeightParameterReference(ReferentialDtoReferenceAware dto, String uri, String oceanLabel, String speciesFaoCode, String speciesLabel, String sexLabel, Date startDate, Date endDate, String lengthWeightFormula, String weightLengthFormula, String sizeMeasureTypeCode) { + super(dto, uri, oceanLabel, speciesFaoCode,speciesLabel, sexLabel, startDate, endDate, lengthWeightFormula, weightLengthFormula, sizeMeasureTypeCode); } } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/PersonHelper.java ===================================== @@ -25,40 +25,20 @@ package fr.ird.observe.dto.referential; import java.util.Collection; import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; import java.util.stream.Collectors; public class PersonHelper extends GeneratedPersonHelper { public static List<PersonReference> filterCaptainReferences(Collection<PersonReference> incoming) { - return incoming.stream().filter(newCaptainReferencePredicate()).collect(Collectors.toList()); + return incoming.stream().filter(PersonReference::isCaptain).collect(Collectors.toList()); } public static List<PersonReference> filterObserverReferences(Collection<PersonReference> incoming) { - return incoming.stream().filter(newObserverReferencePredicate()).collect(Collectors.toList()); + return incoming.stream().filter(PersonReference::isObserver).collect(Collectors.toList()); } public static List<PersonReference> filterDataEntryOperatorReferences(Collection<PersonReference> incoming) { - return incoming.stream().filter(newDataEntryOperatorReferencePredicate()).collect(Collectors.toList()); - } - - public static Predicate<PersonReference> newCaptainReferencePredicate() { - return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_CAPTAIN) - && Objects.equals(true, input.isCaptain()); - - } - - public static Predicate<PersonReference> newDataEntryOperatorReferencePredicate() { - return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_DATA_ENTRY_OPERATOR) - && Objects.equals(true, input.isDataEntryOperator()); - - } - - public static Predicate<PersonReference> newObserverReferencePredicate() { - return input -> input.getPropertyNames().contains(PersonDto.PROPERTY_OBSERVER) - && Objects.equals(true, input.isObserver()); - + return incoming.stream().filter(PersonReference::isDataEntryOperator).collect(Collectors.toList()); } public static String getNames(PersonDto person) { ===================================== dto/src/main/models/Observe.model ===================================== @@ -385,7 +385,7 @@ longitude + {*:1} Float quadrant + {*:1} Integer country {*:0..1} fr.ird.observe.dto.referential.CountryReference -referential.LengthLengthParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeCode,inputSizeMeasureTypeLabel,outputSizeMeasureTypeCode,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula +referential.LengthLengthParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesFaoCode,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeCode,inputSizeMeasureTypeLabel,outputSizeMeasureTypeCode,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula inputOutputFormula + {*:1} String inputOutputFormulaValid + {*:1} boolean outputInputFormula + {*:1} String @@ -393,7 +393,7 @@ outputInputFormulaValid + {*:1} boolean inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference -referential.LengthWeightParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureTypeCode +referential.LengthWeightParameter > referential.LengthFormulaSupport | references=uri,oceanLabel,speciesFaoCode,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureTypeCode lengthWeightFormula + {*:1} String weightLengthFormula + {*:1} String meanLength + {*:1} Float ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1627,6 +1627,8 @@ observe.common.WithFormula.coefficients=Coefficients observe.common.WithFormula.coefficientsInformation=Coefficients of relations msut follow the syntax name\=value and are separated by \: (example \: a\=1\:b\=2\:c\=3) observe.common.WithFormula.equation=Equation observe.common.WithFormula.source=Source +observe.common.WithFormula.speciesFaoCode=Species - FAO Code +observe.common.WithFormula.speciesLabel=Species - Scientific label observe.common.acquisitionMode=Acquisition mode observe.common.action.moveCatchDown=Move down observe.common.action.moveCatchDown.tip=Move down the catch ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1627,6 +1627,8 @@ observe.common.WithFormula.coefficients=Coeficientes observe.common.WithFormula.coefficientsInformation=Los coeficientes de relaciones son de la forma texto\=valor y están separados por \: (ejemplo \: a\=1\:b\=2\:c\=3) observe.common.WithFormula.equation=Relación talla-peso observe.common.WithFormula.source=Fuente +observe.common.WithFormula.speciesFaoCode=Especie - Codigo FAO +observe.common.WithFormula.speciesLabel=Especie - Texto científico observe.common.acquisitionMode=Modo de entrada de datos observe.common.action.moveCatchDown=Descender observe.common.action.moveCatchDown.tip=Descender la captura ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1627,6 +1627,8 @@ observe.common.WithFormula.coefficients=Coefficients observe.common.WithFormula.coefficientsInformation=Les coefficients des relations sont de la forme nom\=valeur et sont séparé par des \: (exemple \: a\=1\:b\=2\:c\=3) observe.common.WithFormula.equation=Relation Taille-Poids observe.common.WithFormula.source=Source +observe.common.WithFormula.speciesFaoCode=Espèce - Code FAO +observe.common.WithFormula.speciesLabel=Espèce - Libéllé scientifique observe.common.acquisitionMode=Mode de saisie observe.common.action.moveCatchDown=Descendre observe.common.action.moveCatchDown.tip=Descendre la capture ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java ===================================== @@ -47,6 +47,7 @@ public class LengthLengthParameterEntityReferenceBinder extends ReferentialEntit return new LengthLengthParameterReference(dto, dto.getUri(), dto.getOcean().getLabel(referentialLocale), + dto.getSpecies().getFaoCode(), dto.getSpecies().getScientificLabel(), dto.getSex().getLabel(referentialLocale), dto.getStartDate(), ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java ===================================== @@ -48,6 +48,7 @@ public class LengthWeightParameterEntityReferenceBinder extends ReferentialEntit return new LengthWeightParameterReference(dto, dto.getUri(), dto.getOcean().getLabel(referentialLocale), + dto.getSpecies().getFaoCode(), dto.getSpecies().getScientificLabel(), dto.getSex().getLabel(referentialLocale), dto.getStartDate(), ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.18</version> + <version>2019.8.22</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@  <lib.version.h2>1.4.196</lib.version.h2> <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> - <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx> +   <lib.version.java4all.topia>1.1.14</lib.version.java4all.topia> ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -254,3 +254,4 @@ observe.common.VesselSizeCategoryDto.capacityLabel observe.common.VesselSizeCategoryDto.gaugeLabel observe.common.WindDto.speedRange observe.common.WindDto.waveHeight +observe.common.WithFormula.coefficients View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b6863d974e651cb8a97f493659… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b6863d974e651cb8a97f493659… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300
by Tony CHEMIT 26 Jun '19

26 Jun '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 20db5376 by tchemit at 2019-06-26T16:34:07Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 268dfcb5 by tchemit at 2019-06-26T16:34:55Z Module 2 - second flush - - - - - 8e6c0c30 by tchemit at 2019-06-26T16:35:02Z Fix referential back to list action - - - - - 30 changed files: - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveTripSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineActivityAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineRouteAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/FloatingObjectUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SetSeineUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ce68ab38504ff623fccc8148bf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ce68ab38504ff623fccc8148bf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300
by Tony CHEMIT 26 Jun '19

26 Jun '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 5c2908c8 by tchemit at 2019-06-26T12:07:14Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - ce68ab38 by tchemit at 2019-06-26T14:45:55Z Module 2 - second flush - - - - - 30 changed files: - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineActivityAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineRouteAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineObsRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SetSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SetSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/logbook/ObjectMaterialTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/logbook/ObjectMaterialUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/logbook/ObjectOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/logbook/ObservedSystemUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/logbook/ReferenceHomeSeineLogbookUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/682fdac26ea9fbefbe09f27596… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/682fdac26ea9fbefbe09f27596… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Module 2 (first flush)
by Tony CHEMIT 26 Jun '19

26 Jun '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 682fdac2 by tchemit at 2019-06-26T00:12:36Z Module 2 (first flush) - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToLeftAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToRightAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/delete/DeleteActivitySeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/delete/DeleteFloatingObjectSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/delete/DeleteRouteSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/delete/DeleteSetSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/move/MoveMultipleActivitySeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/move/MoveMultipleRouteUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/move/MoveSingleActivitySeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/move/MoveSingleRouteUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/save/SaveActivitySeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/save/SaveFloatingObjectSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/save/SaveRouteSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/save/SaveSetSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/682fdac26ea9fbefbe09f27596f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/682fdac26ea9fbefbe09f27596f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Reorganise navigation tree nodes
by Tony CHEMIT 25 Jun '19

25 Jun '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6ece2117 by tchemit at 2019-06-25T14:05:27Z Reorganise navigation tree nodes - - - - - ddd980c3 by tchemit at 2019-06-25T15:55:55Z Use relative name on generated dto model and dao supplier - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleLonglineSampleLogbookRequest.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleLonglineSampleLogbookRequest.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveRouteSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/RootNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/common/GearUseFeaturesLonglineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/common/ProgramLonglineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/common/TripLonglineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookListNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineSampleLogbookNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/ActivityLonglineSampleLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/CatchLonglineLogbookNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/CatchLonglineLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/SetLonglineLogbookGlobalCompositionNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/SetLonglineLogbookGlobalCompositionNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/SetLonglineLogbookNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/SetLonglineLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineLandingLogbookListNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/TripLonglineLandingLogbookListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineLandingLogbookNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/TripLonglineLandingLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineSampleLogbookListNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/TripLonglineSampleLogbookListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineSampleLogbookNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/TripLonglineSampleLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/ActivityLonglineObsListNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/ActivityLonglineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/CatchLonglineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/CatchLonglineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/EncounterObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/EncounterObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/SensorUsedObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/SensorUsedObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/SetLonglineObsDetailCompositionNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/SetLonglineObsDetailCompositionNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/SetLonglineObsGlobalCompositionNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/SetLonglineObsGlobalCompositionNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/SetLonglineObsNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/SetLonglineObsNavigationTreeNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/630724529fa87dcbcee63c34dc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/630724529fa87dcbcee63c34dc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 4 commits: Use relative name on generated dto model and dao supplier
by Tony CHEMIT 25 Jun '19

25 Jun '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: ddd980c3 by tchemit at 2019-06-25T15:55:55Z Use relative name on generated dto model and dao supplier - - - - - 40ad92ab by tchemit at 2019-06-25T16:12:58Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 19c11be0 by tchemit at 2019-06-25T16:12:58Z Move to new version 9.0-alpha-1 - - - - - ede126c5 by tchemit at 2019-06-25T16:12:58Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/dcp/AddFloatingObjectPresetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/obs/NonTargetSampleSeineNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetCatchUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetCatchUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetCatchUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetDiscardCatchUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/10bdf9b07e011f301d92353f11… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/10bdf9b07e011f301d92353f11… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: Réorganisation des données d’observation PS - Réorganisation des captures et...
by Tony CHEMIT 25 Jun '19

25 Jun '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: b66ab765 by tchemit at 2019-06-25T14:33:46Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 30d34bcf by tchemit at 2019-06-25T14:33:46Z Move to new version 9.0-alpha-1 - - - - - 10bdf9b0 by tchemit at 2019-06-25T14:33:46Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/dcp/AddFloatingObjectPresetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/obs/NonTargetSampleSeineNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetCatchUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetCatchUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetCatchUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetDiscardCatchUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/CatchUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ccac77a441479443be25d4b122… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ccac77a441479443be25d4b122… You're receiving this email because of your account on gitlab.com.

1 0