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

[Git][ultreiaio/ird-observe][features/one-to-one] 4 commits: Labels anglais sur les référentiels - See ultreiaio/ird-observe#2302
by Tony CHEMIT (＠tchemit) 28 Apr '22

28 Apr '22

Tony CHEMIT pushed to branch features/one-to-one at ultreiaio / ird-observe Commits: ca91748d by Tony Chemit at 2022-04-28T18:46:12+02:00 Labels anglais sur les référentiels - See ultreiaio/ird-observe#2302 - - - - - 1a1b8b8e by Tony Chemit at 2022-04-28T18:46:23+02:00 Sur échantillons PS, un contrôle de validation imparfait - Closes #2295 - - - - - 6549af9a by Tony Chemit at 2022-04-28T18:46:33+02:00 Libellés français dans l'arbre à corriger - Closes #2297 - - - - - ceb3720d by Tony Chemit at 2022-04-28T18:47:05+02:00 Liste des relations FK à inverser - See ultreiaio/ird-observe#2247 - - - - - 13 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIHandler.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ll/common/TripService.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripMapBuilder.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/ToolkitEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abd22a268abb2016cef5512b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/abd22a268abb2016cef5512b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Labels anglais sur les référentiels - See ultreiaio/ird-observe#2302
by Tony CHEMIT (＠tchemit) 28 Apr '22

28 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 55e7586a by Tony Chemit at 2022-04-28T18:44:25+02:00 Labels anglais sur les référentiels - See ultreiaio/ird-observe#2302 - - - - - 0fd3e869 by Tony Chemit at 2022-04-28T18:44:25+02:00 Sur échantillons PS, un contrôle de validation imparfait - Closes #2295 - - - - - 89125aea by Tony Chemit at 2022-04-28T18:44:25+02:00 Libellés français dans l'arbre à corriger - Closes #2297 - - - - - 5 changed files: - core/persistence/resources/src/main/resources/db/migration/v9/9.0/20_0_update-ps_common_referential-labels-common.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-update.json - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/attribute/boundNumber.properties Changes: ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/20_0_update-ps_common_referential-labels-common.sql ===================================== @@ -33,3 +33,49 @@ UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE ty UPDATE ps_common.ObjectOperation SET label1 = 'Loss', topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE topiaId = 'fr.ird.referential.ps.common.ObjectOperation#1464000000000#11'; UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.ObjectOperation'; + +UPDATE ps_common.TransmittingBuoyType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'GPS finder' WHERE topiaid = 'fr.ird.referential.ps.common.TransmittingBuoyType#1464000000000#100'; +UPDATE ps_common.TransmittingBuoyType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'None' WHERE topiaid = 'fr.ird.referential.ps.common.TransmittingBuoyType#1464000000000#999'; +UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType'; + +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Super - T3', label2 = 'Super - T3' WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#01'; +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Biology - Size' WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#02'; +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Biology' WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#03'; +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Bad' WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#04'; +UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.logbook.SampleQuality'; + +UPDATE ps_observation.InformationSource SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Observer' WHERE topiaid = 'fr.ird.referential.ps.observation.InformationSource#1464000000000#01'; +UPDATE ps_observation.InformationSource SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Crew with update by observer' WHERE topiaid = 'fr.ird.referential.ps.observation.InformationSource#1464000000000#02'; +UPDATE ps_observation.InformationSource SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Crew' WHERE topiaid = 'fr.ird.referential.ps.observation.InformationSource#1464000000000#03'; +UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.observation.InformationSource'; + +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Damage' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#22'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Bait fishing' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#23'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Waiting' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#24'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Offshore transshipment (details unknown)' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#25'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Transshipment from a purse seiner' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#26'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Transshipment to a purse seiner' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#27'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Capsizing of the pursed seine net' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#28'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Transshipment to a bait boat' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#29'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Transshipment from a bait boat' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#30'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Fish discard' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#31'; +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Activity/set created from the well plan' WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#32'; +UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.VesselActivity'; + +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'At landing' WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#01'; +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'By observer' WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#02'; +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Fish sorted' WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#03'; +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Mixed school types' WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#04'; +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'At landing - fresh fish from bait boat' WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#11'; +UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.SampleType'; + +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'With brail' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#1'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'By stretcher, tarp, sarria, cargo net' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#2'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'With specific device' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#3'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'By hand from the deck' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#4'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'After disentanglement' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#5'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Submergence of floaters' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#7'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Cut in the net' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#8'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Once remaining plastic pieces were removed' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#9'; +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Daylight onboard' WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#10'; +UPDATE common.LASTUPDATEDATE SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.common.SpeciesGroupReleaseMode'; ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-create.json ===================================== @@ -1,7 +1,7 @@ { "bigsWeight": { "errors": [ - "0.0 <= bigsWeight <= 150.0 except if !weightValid", + "0.0 <= bigsWeight <= 200.0", "bigsWeight is a positive number", "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "bigsWeight not allowed if totalWeight filled" @@ -52,7 +52,7 @@ }, "smallsWeight": { "errors": [ - "0.0 <= smallsWeight <= 150.0 except if !weightValid", + "0.0 <= smallsWeight <= 200.0", "smallsWeight is a positive number", "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "smallsWeight not allowed if totalWeight filled" @@ -65,7 +65,7 @@ }, "totalWeight": { "errors": [ - "0.0 <= totalWeight <= 150.0 except if !weightValid", + "0.0 <= totalWeight <= 200.0", "totalWeight is a positive number", "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight not allowed if bigsWeight and smallsWeight filled" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Sample/validation-update.json ===================================== @@ -1,7 +1,7 @@ { "bigsWeight": { "errors": [ - "0.0 <= bigsWeight <= 150.0 except if !weightValid", + "0.0 <= bigsWeight <= 200.0", "bigsWeight is a positive number", "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "bigsWeight not allowed if totalWeight filled" @@ -52,7 +52,7 @@ }, "smallsWeight": { "errors": [ - "0.0 <= smallsWeight <= 150.0 except if !weightValid", + "0.0 <= smallsWeight <= 200.0", "smallsWeight is a positive number", "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "smallsWeight not allowed if totalWeight filled" @@ -65,7 +65,7 @@ }, "totalWeight": { "errors": [ - "0.0 <= totalWeight <= 150.0 except if !weightValid", + "0.0 <= totalWeight <= 200.0", "totalWeight is a positive number", "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight not allowed if bigsWeight and smallsWeight filled" ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -966,23 +966,23 @@ observe.data.ps.localmarket.Batch.weight.computed.tip=Le poids a été calculé observe.data.ps.localmarket.Batch.weight.observed.tip=Le poids estimé a été observé observe.data.ps.localmarket.Batch.weight.short=Poids observe.data.ps.localmarket.Batch.weight.validation.required=Le nombre ou le poids doit être renseigné (mais pas les deux). -observe.data.ps.localmarket.Sample.action.create=Échantillonnage au port suivant +observe.data.ps.localmarket.Sample.action.create=Échantillon suivant observe.data.ps.localmarket.Sample.action.move=Changer de marée -observe.data.ps.localmarket.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillonnages sélectionnés ? -observe.data.ps.localmarket.Sample.action.move.choose.parent.title=Changer la marée des échantillonnages -observe.data.ps.localmarket.Sample.action.move.tip=Changer la marée des échantillonnages sélectionnés +observe.data.ps.localmarket.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillons sélectionnés ? +observe.data.ps.localmarket.Sample.action.move.choose.parent.title=Changer la marée des échantillons +observe.data.ps.localmarket.Sample.action.move.tip=Changer la marée des échantillons sélectionnés observe.data.ps.localmarket.Sample.date=Date -observe.data.ps.localmarket.Sample.list.navigation.node=Échantillonnage au port -observe.data.ps.localmarket.Sample.list.title=Liste des échantillonnages +observe.data.ps.localmarket.Sample.list.navigation.node=Échantillons +observe.data.ps.localmarket.Sample.list.title=Liste des échantillons observe.data.ps.localmarket.Sample.message.not.open=L'échantillon n'est pas ouvert -observe.data.ps.localmarket.Sample.navigation.unsaved=Nouvel échantillonnage +observe.data.ps.localmarket.Sample.navigation.unsaved=Nouvel échantillon observe.data.ps.localmarket.Sample.number=Numéro -observe.data.ps.localmarket.Sample.title=Échantillonnage au port +observe.data.ps.localmarket.Sample.title=Échantillons observe.data.ps.localmarket.Sample.totalCount=Nombre total mesuré observe.data.ps.localmarket.Sample.type=Échantillonnage observe.data.ps.localmarket.Sample.validation.date.after.currentPsCommonTrip.endDate=La date (%2$s) doit être supérieure ou égale à la date de fin de marée (%1$s). observe.data.ps.localmarket.Sample.validation.date.after.currentPsCommonTrip.startDate=La date (%2$s) doit être supérieure ou égale à la date de début de marée (%1$s). -observe.data.ps.localmarket.Sample.validation.duplicated.number=Il existe déjà un échantillonnage avec cet identifiant. +observe.data.ps.localmarket.Sample.validation.duplicated.number=Il existe déjà un échantillon avec cet identifiant. observe.data.ps.localmarket.Sample.well=Cuves observe.data.ps.localmarket.SampleSampleSpecies.sampleSpecies=Échantillonnage espèce observe.data.ps.localmarket.SampleSampleSpecies.sampleSpecies.validation.uniqueKey=Le tuple (espèce/type de mesure) doit être unique, la donnée de rang %s est invalide. @@ -1089,38 +1089,38 @@ observe.data.ps.logbook.Route.title=Route observe.data.ps.logbook.Route.type=Route observe.data.ps.logbook.Route.validation.date.after.currentPsCommonTrip.startDate=Le jour d'observation (%2$s) doit être supérieure ou égale à la date de début de la marée (%1$s). observe.data.ps.logbook.Route.validation.date.before.currentPsCommonTrip.endDate=La date (%1$s) doit être inférieure ou égale à la date de fin de marée (%2$s). -observe.data.ps.logbook.Sample.action.create=Échantillonnage au port suivant +observe.data.ps.logbook.Sample.action.create=Échantillon suivant observe.data.ps.logbook.Sample.action.move=Changer de marée -observe.data.ps.logbook.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillonnages sélectionnés ? -observe.data.ps.logbook.Sample.action.move.choose.parent.title=Changer la marée des échantillonnages -observe.data.ps.logbook.Sample.action.move.tip=Changer la marée des échantillonnages sélectionnés +observe.data.ps.logbook.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillons sélectionnés ? +observe.data.ps.logbook.Sample.action.move.choose.parent.title=Changer la marée des échantillons +observe.data.ps.logbook.Sample.action.move.tip=Changer la marée des échantillons sélectionnés observe.data.ps.logbook.Sample.activity=Activité observe.data.ps.logbook.Sample.activityTab=Activités associées observe.data.ps.logbook.Sample.bigsWeight=Poids des +10kg (en t) -observe.data.ps.logbook.Sample.bigsWeight.validation.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné. -observe.data.ps.logbook.Sample.list.navigation.node=Échantillonnage au port -observe.data.ps.logbook.Sample.list.title=Échantillonnage au port +observe.data.ps.logbook.Sample.bigsWeight.validation.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés. +observe.data.ps.logbook.Sample.list.navigation.node=Échantillons +observe.data.ps.logbook.Sample.list.title=Échantillons observe.data.ps.logbook.Sample.message.not.open=L'échantillon n'est pas ouvert observe.data.ps.logbook.Sample.navigation.unsaved=Nouvel échantillonnage -observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.message=Il existe plus d'un échantillonnage , impossible de désactiver cette propriété +observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.message=Il existe plus d'un échantillon , impossible de désactiver cette propriété observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.title=Impossible de désactiver la propriété super échantillon observe.data.ps.logbook.Sample.number=Numéro observe.data.ps.logbook.Sample.person=Échantillonneurs observe.data.ps.logbook.Sample.personTab=Échantillonneurs observe.data.ps.logbook.Sample.sampleActivity=Activités associées observe.data.ps.logbook.Sample.smallsWeight=Poids des -10Kg (en t) -observe.data.ps.logbook.Sample.smallsWeight.validation.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné. -observe.data.ps.logbook.Sample.title=Échantillonnage au port +observe.data.ps.logbook.Sample.smallsWeight.validation.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés. +observe.data.ps.logbook.Sample.title=Échantillons observe.data.ps.logbook.Sample.totalWeight=Poids total (en t) -observe.data.ps.logbook.Sample.totalWeight.validation.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné. +observe.data.ps.logbook.Sample.totalWeight.validation.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés. observe.data.ps.logbook.Sample.type=Cuve -observe.data.ps.logbook.Sample.weight.validation.not.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné, mais pas les deux en même temps. +observe.data.ps.logbook.Sample.weight.validation.not.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés, mais pas les deux en même temps. observe.data.ps.logbook.SampleActivity.activity=Activité observe.data.ps.logbook.SampleActivity.activity.short=Activité observe.data.ps.logbook.SampleActivity.type=Pondération observe.data.ps.logbook.SampleActivity.weightedWeight=Pondération (en t) observe.data.ps.logbook.SampleActivity.weightedWeight.short=Pondération (en t) -observe.data.ps.logbook.SampleSampleSpecies.sampleSpecies=Échantillonnage espèce +observe.data.ps.logbook.SampleSampleSpecies.sampleSpecies=Échantillon espèce observe.data.ps.logbook.SampleSampleSpecies.sampleSpecies.validation.uniqueKey=Le tuple (numéro sous échantillon/espèce/type de mesure) doit être unique, la donnée de rang %s est invalide. observe.data.ps.logbook.SampleSampleSpecies.type=Échantillon espèce observe.data.ps.logbook.SampleSpecies.action.create=Nouvelle échantillon espèce ===================================== model/src/main/models/Observe/dto/attribute/boundNumber.properties ===================================== @@ -80,9 +80,9 @@ data.ps.logbook.Activity.attribute.setCount=0:8:!setEnabled data.ps.logbook.Activity.attribute.totalWeight=0.0:800.0:!setEnabled data.ps.logbook.Route.attribute.fishingTime=0.0:24.0 data.ps.logbook.Route.attribute.timeAtSea=0.0:24.0 -data.ps.logbook.Sample.attribute.bigsWeight=0.0:150.0:!weightValid -data.ps.logbook.Sample.attribute.smallsWeight=0.0:150.0:!weightValid -data.ps.logbook.Sample.attribute.totalWeight=0.0:150.0:!weightValid +data.ps.logbook.Sample.attribute.bigsWeight=0.0:200.0 +data.ps.logbook.Sample.attribute.smallsWeight=0.0:200.0 +data.ps.logbook.Sample.attribute.totalWeight=0.0:200.0 data.ps.logbook.WellPlan.attribute.weight=0.0:600.0 data.ps.observation.Activity.attribute.vesselSpeed=0.0:35.0 data.ps.observation.Catch.attribute.catchWeight=:0.0:400.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52a7d2403b7923a176db00a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52a7d2403b7923a176db00a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Fix LL_logbook.Activity wind property (not a composition)!
by Tony CHEMIT (＠tchemit) 28 Apr '22

28 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8693d491 by Tony Chemit at 2022-04-28T13:57:22+02:00 Fix LL_logbook.Activity wind property (not a composition)! - - - - - bf54a0a3 by Tony Chemit at 2022-04-28T13:57:22+02:00 Simplify model (do not add composition on simple properties) - - - - - 4ffd3432 by Tony Chemit at 2022-04-28T13:57:22+02:00 Libellés anglais sur form PS logbook Capture - Closes #2300 - - - - - 18753aaa by Tony Chemit at 2022-04-28T13:57:22+02:00 Libellés anglais dans l'arbre à corriger - Closes #2296 - - - - - bf72319e by Tony Chemit at 2022-04-28T13:57:22+02:00 En anglais, boîte de dialogue illisible - Closes #2298 - - - - - 9e877ea3 by Tony Chemit at 2022-04-28T13:57:50+02:00 Libellés anglais appartenance balise à corriger - Closes ultreiaio/ird-observe#2299 - - - - - 52a7d240 by Tony Chemit at 2022-04-28T13:57:55+02:00 Synchro avancée référentiels ne fonctionne pas - Closes ultreiaio/ird-observe#2301 - - - - - 30 changed files: - client/core/src/main/i18n/templates/InitStorageModel_en_GB.ftl - client/core/src/main/i18n/templates/InitStorageModel_es_ES.ftl - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SurveyListUINavigationHandler.java - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUINavigationHandler.java - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java - + core/persistence/resources/src/main/resources/db/migration/v9/9.0/20_0_update-ps_common_referential-labels-common.sql - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult.json - model/src/main/models/Observe/dto/00-common.model - model/src/main/models/Observe/dto/01-referential-common.model - model/src/main/models/Observe/dto/02-referential-ps-common.model - model/src/main/models/Observe/dto/05-referential-ps-landing.model - model/src/main/models/Observe/dto/06-referential-ps-localmarket.model - model/src/main/models/Observe/dto/10-referential-ll-common.model - model/src/main/models/Observe/dto/11-referential-ll-observation.model - model/src/main/models/Observe/dto/20-data-ps-observation.model - model/src/main/models/Observe/dto/21-data-ps-logbook.model - model/src/main/models/Observe/dto/22-data-ps-landing.model - model/src/main/models/Observe/dto/23-data-ps-localmarket.model - model/src/main/models/Observe/dto/25-data-ps-common.model - model/src/main/models/Observe/dto/30-data-ll-observation.model - model/src/main/models/Observe/dto/31-data-ll-logbook.model - model/src/main/models/Observe/dto/32-data-ll-landing.model - model/src/main/models/Observe/dto/35-data-ll-common.model - model/src/main/models/Observe/persistence/00-common.model - model/src/main/models/Observe/persistence/01-referential-common.model - model/src/main/models/Observe/persistence/02-referential-ps-common.model - model/src/main/models/Observe/persistence/05-referential-ps-landing.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c48b4d6551110d8b20ea30e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c48b4d6551110d8b20ea30e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch features/one-to-one
by Tony CHEMIT (＠tchemit) 28 Apr '22

28 Apr '22

Tony CHEMIT pushed new branch features/one-to-one at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/features/one-to-one 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.0.0-RC-29)
by Tony CHEMIT (＠tchemit) 27 Apr '22

27 Apr '22

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 1087d2fb by Tony Chemit at 2022-04-27T07:46:58+02:00 Site checkin for project ObServe (version 9.0.0-RC-29) - - - - - 8 changed files: - + 9.0.0-RC-29/CHANGELOG.html - + 9.0.0-RC-29/architecture-logicielle.html - + 9.0.0-RC-29/avdth/common.html - + 9.0.0-RC-29/avdth/index.html - + 9.0.0-RC-29/avdth/landing.html - + 9.0.0-RC-29/avdth/local_market.html - + 9.0.0-RC-29/avdth/logbook.html - + 9.0.0-RC-29/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1087d2fb458f2efa88840e19f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1087d2fb458f2efa88840e19f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-29
by Tony CHEMIT (＠tchemit) 27 Apr '22

27 Apr '22

Tony CHEMIT deleted branch release/9.0.0-RC-29 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.0-RC-29
by Tony CHEMIT (＠tchemit) 27 Apr '22

27 Apr '22

Tony CHEMIT pushed new tag v9.0.0-RC-29 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.0-RC-29 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.0.0-RC-29] [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-29' with...
by Tony CHEMIT (＠tchemit) 27 Apr '22

27 Apr '22

Tony CHEMIT pushed to branch release/9.0.0-RC-29 at ultreiaio / ird-observe Commits: a497e114 by Tony Chemit at 2022-04-27T07:17:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-29' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a497e1142c9fc19333ff764ec… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a497e1142c9fc19333ff764ec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 24 commits: [jgitflow-maven-plugin]updating poms for 9.0.0-RC-29-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 27 Apr '22

27 Apr '22

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: e1eea576 by Tony Chemit at 2022-04-20T17:39:32+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-29-SNAPSHOT development[skip ci] - - - - - 40c8d577 by Tony Chemit at 2022-04-20T18:09:04+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 88a43ef3 by Tony Chemit at 2022-04-20T18:09:05+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 2376af0a by Tony Chemit at 2022-04-20T18:09:06+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 65625bbb by Tony Chemit at 2022-04-24T11:26:10+02:00 Dans le gestionnaire de connexions, l'onglet serveurs pourrait être le premier - Closes #2286 - - - - - 39d09581 by Tony Chemit at 2022-04-24T11:26:22+02:00 update i18n - - - - - 12bb3774 by Tony Chemit at 2022-04-24T11:59:07+02:00 Erreur non explicitée s'il manque l'information de base par défaut - Closes #2284 - - - - - 762fb804 by Tony Chemit at 2022-04-24T12:42:47+02:00 Libellé sur UI déplacements - Closes #2281 - - - - - adfa7553 by Tony Chemit at 2022-04-25T17:35:39+02:00 Statistique bizarre sur plan de cuves - Closes #2287 - - - - - 49f40106 by Tony Chemit at 2022-04-25T19:31:31+02:00 Problème lors des déplacements, changement de programme intempestif de la marée cible - See #2282 - - - - - 29d2d56e by Tony Chemit at 2022-04-25T19:59:30+02:00 Problème lors des déplacements, changement de programme intempestif de la marée cible - See #2282 - - - - - 9ee64b18 by Tony Chemit at 2022-04-26T10:02:13+02:00 split changelog - - - - - f98757d6 by Tony Chemit at 2022-04-26T10:30:07+02:00 Normaliser la présentation des statistiques dans l'arbre - Closes #2264 - - - - - 6905073a by Tony Chemit at 2022-04-26T13:37:39+02:00 Problème performance sur l'écran Plan de cuve - Closes ultreiaio/ird-observe#2291 - - - - - d8f99de5 by Tony Chemit at 2022-04-26T13:46:04+02:00 Sur écran échantillon espèce (livre de bord PS), si on change l'ordre dans le tableau, les fréquences ne sont plus bien rattachés à la bonne ligne - Closes #2292 - - - - - 1ef773d1 by Tony Chemit at 2022-04-26T13:50:58+02:00 update toolkit - - - - - 953f4cbe by Tony Chemit at 2022-04-26T14:05:31+02:00 Erreur non explicitée s'il manque l'information de base par défaut - Closes #2284 - - - - - b090ae7c by Tony Chemit at 2022-04-26T14:33:33+02:00 update pom - - - - - 9b4f96e9 by Tony Chemit at 2022-04-26T15:55:35+02:00 fix not composite relation - - - - - 3c94bea0 by Tony Chemit at 2022-04-26T16:26:05+02:00 fix not composite relation - - - - - 0ea354f2 by Tony Chemit at 2022-04-27T07:11:20+02:00 update topia extension - - - - - a6a67256 by Tony Chemit at 2022-04-27T07:16:52+02:00 Update changelog for v.9.0.0-RC-29 [skip CI] - - - - - a497e114 by Tony Chemit at 2022-04-27T07:17:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-29' with non-snapshot versions[skip ci] - - - - - ab64a6bd by Tony Chemit at 2022-04-27T07:44:45+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-29' into 'master' - - - - - 1 changed file: - + CHANGELOG-old.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/318d08ea3e6e6f53ff66a99a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/318d08ea3e6e6f53ff66a99a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-29' with...
by Tony CHEMIT (＠tchemit) 27 Apr '22

27 Apr '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a497e114 by Tony Chemit at 2022-04-27T07:17:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-29' with non-snapshot versions[skip ci] - - - - - ab64a6bd by Tony Chemit at 2022-04-27T07:44:45+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-29' into 'master' - - - - - 79e6311a by Tony Chemit at 2022-04-27T07:44:50+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 19cadea0 by Tony Chemit at 2022-04-27T07:44:51+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 0c48b4d6 by Tony Chemit at 2022-04-27T07:44:53+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/423da467b3404b7b5f73f457… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/423da467b3404b7b5f73f457… You're receiving this email because of your account on gitlab.com.

1 0