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

[Git][ultreiaio/ird-observe][develop] Sur PS / Logbook / Echantillon et Plan de cuves, afficher le ne numéro...
by Tony CHEMIT (＠tchemit) 15 Jun '23

15 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a057723b by Tony Chemit at 2023-06-15T19:49:00+02:00 Sur PS / Logbook / Echantillon et Plan de cuves, afficher le ne numéro d'activité dans la liste déroulante des activités - Closes #2732 - - - - - 7 changed files: - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDtoWithRouteDecoratorDefinition.java - core/api/dto/src/main/i18n/getters/java.getter - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDto.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/class/decoratorWithClassifier.properties Changes: ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDtoWithRouteDecoratorDefinition.java ===================================== @@ -36,7 +36,7 @@ import javax.annotation.Generated; public final class ActivityStubDtoWithRouteDecoratorDefinition extends DecoratorDefinition<ActivityStubDto, ObserveDtoDecoratorRenderer<ActivityStubDto>> { public ActivityStubDtoWithRouteDecoratorDefinition() { - super(ActivityStubDto.class, "WithRoute", "##", " - ", new ObserveDtoDecoratorRenderer<>(ActivityStubDto.class), "date", "time", "vesselActivity"); + super(ActivityStubDto.class, "WithRoute", "##", " - ", new ObserveDtoDecoratorRenderer<>(ActivityStubDto.class), "date", "time", "number", "vesselActivity"); } @Override @@ -47,6 +47,8 @@ public final class ActivityStubDtoWithRouteDecoratorDefinition extends Decorator case 1: return renderer.niceTime(locale, source.getTime()); case 2: + return renderer.onNullValue("number", locale, source.getNumber()); + case 3: return renderer.label(locale, source.getVesselActivity()); default: throw new IllegalStateException("No index with value: " + index); @@ -55,7 +57,7 @@ public final class ActivityStubDtoWithRouteDecoratorDefinition extends Decorator @Override public final String decorate(Locale locale, Object source, String rendererSeparator, int index) { - return decoratorForContextCountEquals3(locale, source, rendererSeparator, index); + return decoratorForContextCountEquals4(locale, source, rendererSeparator, index); } } ===================================== core/api/dto/src/main/i18n/getters/java.getter ===================================== @@ -8,6 +8,7 @@ observe.data.ll.pairing.ActivityPairingResultItem.type observe.data.pairing.ActivityPairingResultItem.computedTimeAfter observe.data.pairing.ActivityPairingResultItem.computedTimeBefore observe.data.pairing.ActivityPairingResultItem.computedTimeEquals +observe.data.ps.logbook.ActivityStub.type observe.data.ps.observation.SpeciesFateDiscardMode.falseValue observe.data.ps.observation.SpeciesFateDiscardMode.nullValue observe.data.ps.observation.SpeciesFateDiscardMode.trueValue ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDto.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.dto.data.ps.logbook; */ import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.util.Dates; import java.util.Date; @@ -36,6 +37,10 @@ import java.util.Date; @GenerateJavaBeanDefinition public class ActivityStubDto extends GeneratedActivityStubDto implements TimeAndNumberAware { + static { + I18n.n("observe.data.ps.logbook.ActivityStub.type"); + } + public Date getTimeSecond() { return Dates.getTime(time, false, false); } @@ -51,7 +56,7 @@ public class ActivityStubDto extends GeneratedActivityStubDto implements TimeAnd } public boolean skipValidate() { - return getLatitude()==null || getLongitude()==null; + return getLatitude() == null || getLongitude() == null; } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=Activity catches observe.data.ps.logbook.ActivityStub.date=Date observe.data.ps.logbook.ActivityStub.number=Number observe.data.ps.logbook.ActivityStub.time=Observation time +observe.data.ps.logbook.ActivityStub.type=Activity observe.data.ps.logbook.Catch.action.create=Create a new catch observe.data.ps.logbook.Catch.action.save=Insert this catch observe.data.ps.logbook.Catch.action.save.tip=Insert this catch ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=ActivityCatch observe.data.ps.logbook.ActivityStub.date=Date observe.data.ps.logbook.ActivityStub.number=Number observe.data.ps.logbook.ActivityStub.time=Hora de la observación +observe.data.ps.logbook.ActivityStub.type=Actividad observe.data.ps.logbook.Catch.action.create=Crear una captura observe.data.ps.logbook.Catch.action.save=Insertar captura observe.data.ps.logbook.Catch.action.save.tip=Insertar captura ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=Capture observe.data.ps.logbook.ActivityStub.date=Date observe.data.ps.logbook.ActivityStub.number=Numéro d'ordre observe.data.ps.logbook.ActivityStub.time=Heure d'observation +observe.data.ps.logbook.ActivityStub.type=Activité observe.data.ps.logbook.Catch.action.create=Nouvelle capture observe.data.ps.logbook.Catch.action.save=Insérer cette capture observe.data.ps.logbook.Catch.action.save.tip=Insérer cette capture ===================================== model/src/main/models/Observe/dto/class/decoratorWithClassifier.properties ===================================== @@ -24,7 +24,7 @@ data.ll.observation.Branchline=OnlyHaulingIdentifier|${haulingIdentifier} data.ll.observation.Section=OnlyHaulingIdentifier|${haulingIdentifier} data.ps.common.Trip=TripLocalmarket|$(observe.data.ps.common.TripLocalmarket.type)##( ${localmarketBatchStat::stat}##${localmarketSurveyStat::stat}##${localmarketSampleStat::stat} )~TripLogbook|$(observe.data.ps.common.TripLogbook.type)##( ${routeLogbookStat::stat}##${sampleStat::stat}##${wellStat::stat} ) data.ps.logbook.Activity=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label} -data.ps.logbook.ActivityStub=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label} +data.ps.logbook.ActivityStub=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label} data.ps.observation.Activity=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label} presets.RemoteDataSourceConfiguration=WithUrl|${name}##${url} presets.ServerDataSourceConfiguration=WithUrl|${name}##${url} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a057723b741495da5ffae2520… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a057723b741495da5ffae2520… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Update decorator API
by Tony CHEMIT (＠tchemit) 15 Jun '23

15 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c82c0251 by Tony Chemit at 2023-06-15T18:29:54+02:00 Update decorator API - - - - - aadad786 by Tony Chemit at 2023-06-15T18:35:53+02:00 Sur PS / Logbook / Echantillon, améliorer le défilement de la liste de saisie des fréquences de taille - Closes #2733 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTable.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/GPSPointDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripDtoWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/common/TripReferenceWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingPartDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingPartReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/landing/LandingReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDtoWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReferenceWithStatsDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivitySampleReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BaitsCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/BranchlinesCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/FloatlinesCompositionReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/HooksCompositionDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/HooksCompositionReferenceDecoratorDefinition.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/32d05ea70619acec5a633002… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/32d05ea70619acec5a633002… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] En PS / logbook / Activité, la validation sur les heures / numéro d'incrémant...
by Tony CHEMIT (＠tchemit) 15 Jun '23

15 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 32d05ea7 by Tony Chemit at 2023-06-15T17:25:39+02:00 En PS / logbook / Activité, la validation sur les heures / numéro d'incrémant n'est pas correcte - Closes #2731 - - - - - 6 changed files: - core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/ActivityCheckTime.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult.json - toolkit/api-validation/src/main/java/fr/ird/observe/validation/validators/collection/CollectionValidationWalkerContext.java Changes: ===================================== core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/ActivityCheckTime.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.dto.validation.validators.data.ps.logbook; */ import com.opensymphony.xwork2.validator.ValidationException; +import fr.ird.observe.dto.I18nDecoratorHelper; import fr.ird.observe.dto.data.ps.logbook.ActivityDto; import fr.ird.observe.dto.data.ps.logbook.RouteDto; import fr.ird.observe.dto.data.ps.logbook.TimeAndNumberAware; @@ -64,7 +65,7 @@ public class ActivityCheckTime extends NuitonFieldValidatorSupport { protected void addError(CollectionValidationWalkerContext<ActivityDto, TimeAndNumberAware> context, Object object) { TimeAndNumberAware current = context.getCurrent(); - setDefaultMessage(MESSAGE_KEY + String.format(MESSAGE_PARAMETERS, context.getHumanIndex(), current.getTime(), current.getNumber())); + setDefaultMessage(MESSAGE_KEY + String.format(MESSAGE_PARAMETERS, context.getHumanIndex(), I18nDecoratorHelper.getTimeLabel(getValidatorContext().getLocale(),current.getTime()), current.getNumber())); addFieldError(getFieldName(), object); } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -905,10 +905,10 @@ observe.data.ll.pairing.ActivityPairingResultItem.type=Observed activity observe.data.pairing.ActivityPairingResultItem.computedTimeAfter=after observe.data.pairing.ActivityPairingResultItem.computedTimeBefore=before observe.data.pairing.ActivityPairingResultItem.computedTimeEquals=Same date - time -observe.data.ps.Activity.validation.invalid.time.and.number=Observation time cant' be after a previous activity if number is greater (activity at position %1$s is not correct (time %2$s, number %3$s). +observe.data.ps.Activity.validation.invalid.time.and.number=Observation time can't be after a previous activity if his order number is greater (activity at position %1$s is not correct (time %2$s, order number %3$s). observe.data.ps.Route.validation.duplicated.date=There is already another route at this date. observe.data.ps.Route.validation.invalid.quadrant=Activity quadrant at position %1$s is not consistent with trip ocean (%2$s) of trip (indian\: 1 or 2, atlantic\: 1,2,3 or 4). -observe.data.ps.Route.validation.invalid.time=Observation time cant' be after the one of the previous activity (activity at position %1$s is not correct). +observe.data.ps.Route.validation.invalid.time=Observation time can't be after the one of the previous activity (activity at position %1$s is not correct). observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s) observe.data.ps.SampleSpecies.validation.mismatch.subSampleNumber=The sub sample number must be strictly positive if the sample is a « super sample ». observe.data.ps.common.Trip.action.move.all=Move all ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -905,7 +905,7 @@ observe.data.ll.pairing.ActivityPairingResultItem.type=Observed activity \#TODO observe.data.pairing.ActivityPairingResultItem.computedTimeAfter=after \#TODO observe.data.pairing.ActivityPairingResultItem.computedTimeBefore=before \#TODO observe.data.pairing.ActivityPairingResultItem.computedTimeEquals=Same date - time \#TODO -observe.data.ps.Activity.validation.invalid.time.and.number=Observation time cant' be after a previous activity if number is greater (activity at position %1$s is not correct (time %2$s, number %3$s). \#TODO +observe.data.ps.Activity.validation.invalid.time.and.number=Observation time can't be after a previous activity if his order number is greater (activity at position %1$s is not correct (time %2$s, order number %3$s). \#TODO observe.data.ps.Route.validation.duplicated.date=Ya existe otra ruta en esa fecha. observe.data.ps.Route.validation.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4) observe.data.ps.Route.validation.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta). ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -905,7 +905,7 @@ observe.data.ll.pairing.ActivityPairingResultItem.type=Activité observée observe.data.pairing.ActivityPairingResultItem.computedTimeAfter=après observe.data.pairing.ActivityPairingResultItem.computedTimeBefore=avant observe.data.pairing.ActivityPairingResultItem.computedTimeEquals=Même date - heure -observe.data.ps.Activity.validation.invalid.time.and.number=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente si son identifiant l'est (activité de position %1$s incorrecte, heure \: %2$s, identifiant \: %3$s). +observe.data.ps.Activity.validation.invalid.time.and.number=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente si son numéro d'ordre l'est (activité de position %1$s incorrecte, heure \: %2$s, numéro d'ordre \: %3$s). observe.data.ps.Route.validation.duplicated.date=Il existe déjà une autre route à cette date. observe.data.ps.Route.validation.invalid.quadrant=Le quadrant de l’activité à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1 observe.data.ps.Route.validation.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte). ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult.json ===================================== @@ -39368,6 +39368,11 @@ "scope": "ERROR", "message": "Obligatoire si opération de pêche réussie" }, + { + "fieldName": "time", + "scope": "ERROR", + "message": "L\u0027heure d\u0027observation d\u0027une activité doit être supérieure à celle de l\u0027activité précédente si son numéro d\u0027ordre l\u0027est (activité de position 2 incorrecte, heure : 15:12, numéro d\u0027ordre : 1)." + }, { "fieldName": "time", "scope": "WARNING", ===================================== toolkit/api-validation/src/main/java/fr/ird/observe/validation/validators/collection/CollectionValidationWalkerContext.java ===================================== @@ -43,13 +43,13 @@ public class CollectionValidationWalkerContext<D extends ToolkitId, C extends To protected final BiPredicate<CollectionValidationWalkerContext<D, C>, C> usePredicate; protected final BiPredicate<CollectionValidationWalkerContext<D, C>, C> validPredicate; protected final int size; - protected C skip; + protected C editing; protected int index = -1; protected C current; protected C previous; public static <D extends ToolkitId, C extends ToolkitId> CollectionValidationWalkerContext<D, C> validate(D container, Collection<C> collection, C skip, BiPredicate<CollectionValidationWalkerContext<D, C>, C> usePredicate, BiPredicate<CollectionValidationWalkerContext<D, C>, C> validPredicate) { - return create(container, collection, usePredicate, validPredicate).map(c -> c.setSkip(skip).validate()).orElse(null); + return create(container, collection, usePredicate, validPredicate).map(c -> c.setEditing(skip).validate()).orElse(null); } public static <D extends ToolkitId, C extends ToolkitId> CollectionValidationWalkerContext<D, C> validate(D container, Collection<C> collection, BiPredicate<CollectionValidationWalkerContext<D, C>, C> usePredicate, BiPredicate<CollectionValidationWalkerContext<D, C>, C> validPredicate) { @@ -71,13 +71,14 @@ public class CollectionValidationWalkerContext<D extends ToolkitId, C extends To this.validPredicate = validPredicate; } - public CollectionValidationWalkerContext<D, C> setSkip(C skip) { - this.skip = skip; + public CollectionValidationWalkerContext<D, C> setEditing(C editing) { + this.editing = editing; return this; } public CollectionValidationWalkerContext<D, C> validate() { for (C current : collection) { + current = getCurrent(current); boolean use = addCurrent(current, usePredicate); if (use) { boolean valid = validPredicate.test(this, current); @@ -89,10 +90,26 @@ public class CollectionValidationWalkerContext<D extends ToolkitId, C extends To return null; } + private C getCurrent(C current) { + if (editing != null && Objects.equals(current.getId(), editing.getId())) { + // use editing one as current + return editing; + } + return current; + } + public boolean addCurrent(C current, BiPredicate<CollectionValidationWalkerContext<D, C>, C> predicate) { index++; - if (skip != null && Objects.equals(current.getId(), skip.getId())) { - return false; + if (editing != null) { + if (!Objects.equals(current.getId(), editing.getId())) { + boolean use = predicate.test(this, current); + if (use) { + this.previous = this.current; + this.current = current; + } + // always return false, since we don't want to validate this entry + return false; + } } boolean use = predicate.test(this, current); if (use) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32d05ea70619acec5a6330020… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32d05ea70619acec5a6330020… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée...
by Tony CHEMIT (＠tchemit) 15 Jun '23

15 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8626ffaa by Tony Chemit at 2023-06-15T15:24:16+02:00 Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée - Closes #2720 - - - - - acdb679d by Tony Chemit at 2023-06-15T15:24:16+02:00 Affichage des types date sur l'UI de synchro avancée de référentiel - Closes #2713 - - - - - 786fb3a1 by Tony Chemit at 2023-06-15T15:24:16+02:00 Pour les champs du modèle de persistance de type date, forcer le type réel via la tag value idoine - Closes #2728 - - - - - ab3d59a2 by Tony Chemit at 2023-06-15T15:34:25+02:00 En PS / Logbook / Activité, la direction du vent se trouve dans le modèle de données mais pas sur le formulaire - Closes #2730 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivitySample/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Sample/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Branchline/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Tdr/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set/definition.json - model/src/main/models/Observe/dto/attribute/boundNumber.properties - model/src/main/models/Observe/persistence/attribute/hibernateAttributeType.java.util.Date.properties - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Activity/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/ActivitySample/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Sample/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Activity/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Branchline/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/definition.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Tdr/definition.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5f7b7a84161497f8b2bfc731… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5f7b7a84161497f8b2bfc731… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: update pom and license (now we are talking with https :))
by Tony CHEMIT (＠tchemit) 15 Jun '23

15 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: addd51e3 by Tony Chemit at 2023-06-15T13:08:48+02:00 update pom and license (now we are talking with https :)) - - - - - 5d5cca7e by Tony Chemit at 2023-06-15T13:08:48+02:00 Le rôle saisisseur ne fonctionne pas - Closes #2724 - - - - - 01b968bc by Tony Chemit at 2023-06-15T13:08:48+02:00 Une erreur de validation sur ps_localMarket.SurveyPart.proportion - Closes #2727 - - - - - 5ec8ffb7 by Tony Chemit at 2023-06-15T13:08:48+02:00 Borne max de poids sur le formulaire Lots de faux-poisson - Closes #2719 - - - - - 3a94845e by Tony Chemit at 2023-06-15T13:08:48+02:00 Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée - Closes #2720 - - - - - 2845d3ee by Tony Chemit at 2023-06-15T13:08:48+02:00 Affichage des types date sur l'UI de synchro avancée de référentiel - Closes #2713 - - - - - 5f7b7a84 by Tony Chemit at 2023-06-15T13:08:48+02:00 Pour les champs du modèle de persistance de type date, forcer le type réel via la tag value idoine - Closes #2728 - - - - - 30 changed files: - LICENSE.txt - client/LICENSE.txt - client/configuration/LICENSE.txt - client/core/LICENSE.txt - client/datasource/LICENSE.txt - client/datasource/actions/LICENSE.txt - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource/editor/LICENSE.txt - client/datasource/editor/api-test/LICENSE.txt - client/datasource/editor/api/LICENSE.txt - client/datasource/editor/common/LICENSE.txt - client/datasource/editor/ll/LICENSE.txt - client/datasource/editor/ps/LICENSE.txt - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/spi/LICENSE.txt - client/runner/LICENSE.txt - core/LICENSE.txt - core/api/LICENSE.txt - core/api/dto-consolidation/LICENSE.txt - core/api/dto-decoration/LICENSE.txt - core/api/dto-validation/LICENSE.txt - core/api/dto/LICENSE.txt - core/api/services/LICENSE.txt - core/api/tree/LICENSE.txt - core/api/validation/LICENSE.txt - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SurveyPartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SurveyPartDto-update-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/255f5101f0f36678ae88da78… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/255f5101f0f36678ae88da78… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée...
by Tony CHEMIT (＠tchemit) 15 Jun '23

15 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 255f5101 by Tony Chemit at 2023-06-15T10:44:18+02:00 Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée - Closes #2720 - - - - - 1 changed file: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -34,7 +34,9 @@ import fr.ird.observe.dto.data.ps.logbook.ActivityReference; import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import io.ultreia.java4all.i18n.I18n; +import java.beans.PropertyChangeListener; import java.util.List; +import java.util.Objects; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -42,6 +44,17 @@ import java.util.List; */ class ActivityUIHandler extends GeneratedActivityUIHandler { + /** + * To enable or not original coordinate on ActivityDto.originalDataModified flag. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2720">issue 2720</a> + */ + private final PropertyChangeListener originalDataModifiedChanged; + + public ActivityUIHandler() { + originalDataModifiedChanged = evt -> onOriginalDataModifiedChanged((Boolean) evt.getNewValue()); + } + @Override public void onInit(ActivityUI ui) { super.onInit(ui); @@ -49,6 +62,15 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { fr.ird.observe.client.datasource.editor.ps.data.observation.ActivityUIHandler.initLabels(activities, ui.getVesselActivityInformation(), ui.getVesselActivityInformation2()); } + @Override + public void startEditUI() { + ActivityDto bean = getModel().getStates().getBean(); + bean.removePropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); + super.startEditUI(); + bean.addPropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); + onOriginalDataModifiedChanged(bean.isOriginalDataModified()); + } + @Override protected void installSaveAction() { SaveAction.create(ui, ActivityDto.class) @@ -66,10 +88,41 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { }) .install(ui.getSave()); CopyCoordinate.install(I18n.t("observe.ui.action.copyCoordinate"), - ObservePsKeyStrokes.KEY_STROKE_COPY_COORDINATE, - ui, - ui.getCoordinate(), - ui.getCoordinateOriginal(), - ui.getCopyFirstCoordinate()); + ObservePsKeyStrokes.KEY_STROKE_COPY_COORDINATE, + ui, + ui.getCoordinate(), + ui.getCoordinateOriginal(), + ui.getCopyFirstCoordinate()); + } + + + private void onOriginalDataModifiedChanged(Boolean newValue) { + + ActivityUI ui = getUi(); + + ActivityDto bean = getModel().getStates().getBean(); + if (Objects.equals(true, newValue)) { + + // original data modified + ui.getCoordinateOriginal().setEnabled(true); + //FIXME In jaxx should be done by previous statement + ui.getCoordinateOriginal().getGlobalResetButton().setEnabled(true); + ui.getCoordinateOriginal().getDmdFormat().setEnabled(true); + ui.getCoordinateOriginal().getDmsFormat().setEnabled(true); + ui.getCoordinateOriginal().getDdFormat().setEnabled(true); + ui.getCopyFirstCoordinate().setEnabled(true); + + } else { + + // original data not modified + ui.getCoordinateOriginal().getGlobalResetButton().doClick(); + ui.getCoordinateOriginal().setEnabled(false); + //FIXME In jaxx should be done by previous statement + ui.getCoordinateOriginal().getGlobalResetButton().setEnabled(false); + ui.getCoordinateOriginal().getDmdFormat().setEnabled(false); + ui.getCoordinateOriginal().getDmsFormat().setEnabled(false); + ui.getCoordinateOriginal().getDdFormat().setEnabled(false); + ui.getCopyFirstCoordinate().setEnabled(false); + } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/255f5101f0f36678ae88da788… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/255f5101f0f36678ae88da788… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée...
by Tony CHEMIT (＠tchemit) 13 Jun '23

13 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fbc57b39 by Tony Chemit at 2023-06-13T15:21:08+02:00 Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée - Closes #2720 - - - - - 93323b35 by Tony Chemit at 2023-06-13T15:48:55+02:00 Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée - Closes #2720 - - - - - 1 changed file: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -34,7 +34,9 @@ import fr.ird.observe.dto.data.ps.logbook.ActivityReference; import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import io.ultreia.java4all.i18n.I18n; +import java.beans.PropertyChangeListener; import java.util.List; +import java.util.Objects; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -42,6 +44,17 @@ import java.util.List; */ class ActivityUIHandler extends GeneratedActivityUIHandler { + /** + * To enable or not original coordinate on ActivityDto.originalDataModified flag. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2720">issue 2720</a> + */ + private final PropertyChangeListener originalDataModifiedChanged; + + public ActivityUIHandler() { + originalDataModifiedChanged = evt -> onOriginalDataModifiedChanged((Boolean) evt.getNewValue()); + } + @Override public void onInit(ActivityUI ui) { super.onInit(ui); @@ -49,6 +62,15 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { fr.ird.observe.client.datasource.editor.ps.data.observation.ActivityUIHandler.initLabels(activities, ui.getVesselActivityInformation(), ui.getVesselActivityInformation2()); } + @Override + public void startEditUI() { + ActivityDto bean = getModel().getStates().getBean(); + bean.removePropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); + super.startEditUI(); + bean.addPropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); + onOriginalDataModifiedChanged(bean.isOriginalDataModified()); + } + @Override protected void installSaveAction() { SaveAction.create(ui, ActivityDto.class) @@ -66,10 +88,41 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { }) .install(ui.getSave()); CopyCoordinate.install(I18n.t("observe.ui.action.copyCoordinate"), - ObservePsKeyStrokes.KEY_STROKE_COPY_COORDINATE, - ui, - ui.getCoordinate(), - ui.getCoordinateOriginal(), - ui.getCopyFirstCoordinate()); + ObservePsKeyStrokes.KEY_STROKE_COPY_COORDINATE, + ui, + ui.getCoordinate(), + ui.getCoordinateOriginal(), + ui.getCopyFirstCoordinate()); + } + + + private void onOriginalDataModifiedChanged(Boolean newValue) { + + ActivityUI ui = getUi(); + + ActivityDto bean = getModel().getStates().getBean(); + if (Objects.equals(true, newValue)) { + + // original data modified + ui.getCoordinateOriginal().setEnabled(true); + //FIXME In jaxx should be done by previous statement + ui.getCoordinateOriginal().getGlobalResetButton().setEnabled(true); + ui.getCoordinateOriginal().getDmdFormat().setEnabled(true); + ui.getCoordinateOriginal().getDmsFormat().setEnabled(true); + ui.getCoordinateOriginal().getDdFormat().setEnabled(true); + ui.getCopyFirstCoordinate().setEnabled(true); + + } else { + + // original data not modified + ui.getCoordinateOriginal().getGlobalResetButton().doClick(); + ui.getCoordinateOriginal().setEnabled(false); + //FIXME In jaxx should be done by previous statement + ui.getCoordinateOriginal().getGlobalResetButton().setEnabled(false); + ui.getCoordinateOriginal().getDmdFormat().setEnabled(false); + ui.getCoordinateOriginal().getDmsFormat().setEnabled(false); + ui.getCoordinateOriginal().getDdFormat().setEnabled(false); + ui.getCopyFirstCoordinate().setEnabled(false); + } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf6b3e5c10f75ac21a337a16… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf6b3e5c10f75ac21a337a16… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Une erreur de validation sur ps_localMarket.SurveyPart.proportion - Closes #2727
by Tony CHEMIT (＠tchemit) 13 Jun '23

13 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da908f05 by Tony Chemit at 2023-06-13T14:40:51+02:00 Une erreur de validation sur ps_localMarket.SurveyPart.proportion - Closes #2727 - - - - - bf6b3e5c by Tony Chemit at 2023-06-13T14:54:36+02:00 Borne max de poids sur le formulaire Lots de faux-poisson - Closes #2719 - - - - - 20 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SurveyPartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SurveyPartDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SurveyPart/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SurveyPart/validation-update.json - model/src/main/models/Observe/dto/attribute/boundNumber.properties - model/src/main/models/Observe/dto/attribute/positiveNumber.properties - model/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-update.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -9074,8 +9074,8 @@ { "name": "weight", "comments": [ - "0.0 <= weight <= 5.0 except if !countOrWeightValid", - "weight is a positive number", + "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] } @@ -9173,8 +9173,8 @@ { "name": "weight", "comments": [ - "0.0 <= weight <= 5.0 except if !countOrWeightValid", - "weight is a positive number", + "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] } @@ -9787,10 +9787,10 @@ { "name": "proportion", "comments": [ + "0.0 <= proportion <= 100.0", "proportion is a proportion", "proportion is a strictly positive number", - "proportion is mandatory except if dataEmpty", - "proportion=0.0 <= proportion <= 100.0" + "proportion is mandatory except if dataEmpty" ] }, { @@ -9836,10 +9836,10 @@ { "name": "proportion", "comments": [ + "0.0 <= proportion <= 100.0", "proportion is a proportion", "proportion is a strictly positive number", - "proportion is mandatory except if dataEmpty", - "proportion=0.0 <= proportion <= 100.0" + "proportion is mandatory except if dataEmpty" ] }, { ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-error-validation.xml ===================================== @@ -110,16 +110,17 @@ <message>observe.data.ps.localmarket.Batch.weight.validation.required</message> </field-validator> -  +  <field-validator type="positiveNumber"> + <param name="strict">true</param> <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> - <param name="min">0.0</param> - <param name="max">5.0</param> + <param name="min">0.0001</param> + <param name="max">100.0</param> <message/> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-error-validation.xml ===================================== @@ -110,16 +110,17 @@ <message>observe.data.ps.localmarket.Batch.weight.validation.required</message> </field-validator> -  +  <field-validator type="positiveNumber"> + <param name="strict">true</param> <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> - <param name="min">0.0</param> - <param name="max">5.0</param> + <param name="min">0.0001</param> + <param name="max">100.0</param> <message/> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SurveyPartDto-create-error-validation.xml ===================================== @@ -49,9 +49,9 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> - <param name="min">proportion=0.0</param> + <param name="min">0.0</param> <param name="max">100.0</param> <message/> </field-validator> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SurveyPartDto-update-error-validation.xml ===================================== @@ -49,9 +49,9 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> - <param name="min">proportion=0.0</param> + <param name="min">0.0</param> <param name="max">100.0</param> <message/> </field-validator> ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-create.json ===================================== @@ -58,8 +58,8 @@ }, "weight": { "errors": [ - "0.0 <= weight <= 5.0 except if !countOrWeightValid", - "weight is a positive number", + "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] } ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-update.json ===================================== @@ -58,8 +58,8 @@ }, "weight": { "errors": [ - "0.0 <= weight <= 5.0 except if !countOrWeightValid", - "weight is a positive number", + "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] } ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SurveyPart/validation-create.json ===================================== @@ -6,10 +6,10 @@ }, "proportion": { "errors": [ + "0.0 <= proportion <= 100.0", "proportion is a proportion", "proportion is a strictly positive number", - "proportion is mandatory except if dataEmpty", - "proportion=0.0 <= proportion <= 100.0" + "proportion is mandatory except if dataEmpty" ], "warnings": [ "the hole data is empty" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SurveyPart/validation-update.json ===================================== @@ -6,10 +6,10 @@ }, "proportion": { "errors": [ + "0.0 <= proportion <= 100.0", "proportion is a proportion", "proportion is a strictly positive number", - "proportion is mandatory except if dataEmpty", - "proportion=0.0 <= proportion <= 100.0" + "proportion is mandatory except if dataEmpty" ], "warnings": [ "the hole data is empty" ===================================== model/src/main/models/Observe/dto/attribute/boundNumber.properties ===================================== @@ -61,8 +61,8 @@ data.ps.common.Trip.attribute.landingTotalWeight=0.0:2000.0:!targetWellsSampling data.ps.common.Trip.attribute.localMarketTotalWeight=0.0:1500.0:!localmarketWellsSamplingEnabled && !localmarketSurveySamplingEnabled data.ps.common.Trip.attribute.timeAtSea=10:2400:!logbookEnabled data.ps.landing.Landing.attribute.weight=0.0:600.0 -data.ps.localmarket.Batch.attribute.weight=0.0:5.0:!countOrWeightValid -data.ps.localmarket.SurveyPart.attribute.proportion=proportion=0.0:100.0 +data.ps.localmarket.Batch.attribute.weight=0.0001:100.0:!countOrWeightValid +data.ps.localmarket.SurveyPart.attribute.proportion=0.0:100.0 data.ps.logbook.Activity.attribute.currentDirection=0:359 data.ps.logbook.Activity.attribute.currentSpeed=0.0:40.0 data.ps.logbook.Activity.attribute.setCount=0:8:!setEnabled ===================================== model/src/main/models/Observe/dto/attribute/positiveNumber.properties ===================================== @@ -111,7 +111,6 @@ data.ps.common.Trip.attribute.localMarketTotalWeight=true data.ps.common.Trip.attribute.loch=true data.ps.common.Trip.attribute.timeAtSea=true data.ps.localmarket.Batch.attribute.count=true -data.ps.localmarket.Batch.attribute.weight=true data.ps.logbook.Activity.attribute.currentDirection=true data.ps.logbook.Activity.attribute.currentSpeed=true data.ps.logbook.Activity.attribute.setCount=true ===================================== model/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties ===================================== @@ -25,6 +25,7 @@ data.ll.logbook.Activity.attribute.seaSurfaceTemperature=true data.ll.logbook.Catch.attribute.depredatedProportion=true data.ll.observation.Activity.attribute.seaSurfaceTemperature=true data.ll.observation.Set.attribute.basketsPerSectionCount=true +data.ps.localmarket.Batch.attribute.weight=true data.ps.localmarket.SampleSpeciesMeasure.attribute.count=true data.ps.localmarket.SampleSpeciesMeasure.attribute.sizeClass=true data.ps.localmarket.Survey.attribute.number=true ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create-error.xml ===================================== @@ -110,16 +110,17 @@ <message>observe.data.ps.localmarket.Batch.weight.validation.required</message> </field-validator> -  +  <field-validator type="positiveNumber"> + <param name="strict">true</param> <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> - <param name="min">0.0</param> - <param name="max">5.0</param> + <param name="min">0.0001</param> + <param name="max">100.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create.json ===================================== @@ -58,8 +58,8 @@ }, "weight": { "errors": [ - "0.0 <= weight <= 5.0 except if !countOrWeightValid", - "weight is a positive number", + "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] } ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update-error.xml ===================================== @@ -110,16 +110,17 @@ <message>observe.data.ps.localmarket.Batch.weight.validation.required</message> </field-validator> -  +  <field-validator type="positiveNumber"> + <param name="strict">true</param> <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> - <param name="min">0.0</param> - <param name="max">5.0</param> + <param name="min">0.0001</param> + <param name="max">100.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update.json ===================================== @@ -58,8 +58,8 @@ }, "weight": { "errors": [ - "0.0 <= weight <= 5.0 except if !countOrWeightValid", - "weight is a positive number", + "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] } ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-create-error.xml ===================================== @@ -49,9 +49,9 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> - <param name="min">proportion=0.0</param> + <param name="min">0.0</param> <param name="max">100.0</param> <message/> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-create.json ===================================== @@ -6,10 +6,10 @@ }, "proportion": { "errors": [ + "0.0 <= proportion <= 100.0", "proportion is a proportion", "proportion is a strictly positive number", - "proportion is mandatory except if dataEmpty", - "proportion=0.0 <= proportion <= 100.0" + "proportion is mandatory except if dataEmpty" ], "warnings": [ "the hole data is empty" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-update-error.xml ===================================== @@ -49,9 +49,9 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> - <param name="min">proportion=0.0</param> + <param name="min">0.0</param> <param name="max">100.0</param> <message/> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SurveyPart/validation-update.json ===================================== @@ -6,10 +6,10 @@ }, "proportion": { "errors": [ + "0.0 <= proportion <= 100.0", "proportion is a proportion", "proportion is a strictly positive number", - "proportion is mandatory except if dataEmpty", - "proportion=0.0 <= proportion <= 100.0" + "proportion is mandatory except if dataEmpty" ], "warnings": [ "the hole data is empty" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/931ed7b03d38d8a00070b909… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/931ed7b03d38d8a00070b909… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom and license (now we are talking with https :))
by Tony CHEMIT (＠tchemit) 13 Jun '23

13 Jun '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 958f6e91 by Tony Chemit at 2023-06-13T13:56:21+02:00 update pom and license (now we are talking with https :)) - - - - - 931ed7b0 by Tony Chemit at 2023-06-13T13:59:07+02:00 Le rôle saisisseur ne fonctionne pas - Closes #2724 - - - - - 30 changed files: - LICENSE.txt - client/LICENSE.txt - client/configuration/LICENSE.txt - client/core/LICENSE.txt - client/datasource/LICENSE.txt - client/datasource/actions/LICENSE.txt - client/datasource/editor/LICENSE.txt - client/datasource/editor/api-test/LICENSE.txt - client/datasource/editor/api/LICENSE.txt - client/datasource/editor/common/LICENSE.txt - client/datasource/editor/ll/LICENSE.txt - client/datasource/editor/ps/LICENSE.txt - client/datasource/editor/spi/LICENSE.txt - client/runner/LICENSE.txt - core/LICENSE.txt - core/api/LICENSE.txt - core/api/dto-consolidation/LICENSE.txt - core/api/dto-decoration/LICENSE.txt - core/api/dto-validation/LICENSE.txt - core/api/dto/LICENSE.txt - core/api/services/LICENSE.txt - core/api/tree/LICENSE.txt - core/api/validation/LICENSE.txt - core/persistence/LICENSE.txt - core/persistence/avdth/LICENSE.txt - core/persistence/consolidation/LICENSE.txt - core/persistence/decoration/LICENSE.txt - core/persistence/java/LICENSE.txt - core/persistence/migration/LICENSE.txt - core/persistence/report/LICENSE.txt The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c85a2bf2bc2f5b6e10d37b81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c85a2bf2bc2f5b6e10d37b81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.1.4)
by Tony CHEMIT (＠tchemit) 01 Jun '23

01 Jun '23

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: aa9b95f8 by Tony Chemit at 2023-06-01T20:41:17+02:00 Site checkin for project ObServe (version 9.1.4) - - - - - 8 changed files: - + 9.1.4/CHANGELOG.html - + 9.1.4/architecture-logicielle.html - + 9.1.4/avdth/common.html - + 9.1.4/avdth/index.html - + 9.1.4/avdth/landing.html - + 9.1.4/avdth/local_market.html - + 9.1.4/avdth/logbook.html - + 9.1.4/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/aa9b95f8c62e5bc4916288f97… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/aa9b95f8c62e5bc4916288f97… You're receiving this email because of your account on gitlab.com.

1 0