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

Commits:

5 changed files:

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
    33 33
    34 34 
     UPDATE ps_common.ObjectOperation SET label1 = 'Loss', topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE topiaId = 'fr.ird.referential.ps.common.ObjectOperation#1464000000000#11';
    35 35 
     UPDATE common.LASTUPDATEDATE SET  lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.ObjectOperation';
    36 
    +
    37 
    +UPDATE ps_common.TransmittingBuoyType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'GPS finder' WHERE topiaid = 'fr.ird.referential.ps.common.TransmittingBuoyType#1464000000000#100';
    38 
    +UPDATE ps_common.TransmittingBuoyType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'None' WHERE topiaid = 'fr.ird.referential.ps.common.TransmittingBuoyType#1464000000000#999';
    39 
    +UPDATE common.LASTUPDATEDATE SET  lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType';
    40 
    +
    41 
    +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';
    42 
    +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Biology - Size' WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#02';
    43 
    +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Biology'         WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#03';
    44 
    +UPDATE ps_logbook.SampleQuality SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Bad'           WHERE topiaid = 'fr.ird.referential.ps.logbook.SampleQuality#1464000000000#04';
    45 
    +UPDATE common.LASTUPDATEDATE SET  lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.logbook.SampleQuality';
    46 
    +
    47 
    +UPDATE ps_observation.InformationSource SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Observer'                                   WHERE topiaid = 'fr.ird.referential.ps.observation.InformationSource#1464000000000#01';
    48 
    +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';
    49 
    +UPDATE ps_observation.InformationSource SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Crew'                                      WHERE topiaid = 'fr.ird.referential.ps.observation.InformationSource#1464000000000#03';
    50 
    +UPDATE common.LASTUPDATEDATE SET  lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.observation.InformationSource';
    51 
    +
    52 
    +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Damage'                                 WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#22';
    53 
    +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Bait fishing'                                  WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#23';
    54 
    +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Waiting'                                WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#24';
    55 
    +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';
    56 
    +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';
    57 
    +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';
    58 
    +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';
    59 
    +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';
    60 
    +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';
    61 
    +UPDATE ps_common.VesselActivity SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Fish discard'                       WHERE topiaid = 'fr.ird.referential.ps.common.VesselActivity#1464000000000#31';
    62 
    +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';
    63 
    +UPDATE common.LASTUPDATEDATE SET  lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.VesselActivity';
    64 
    +
    65 
    +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'At landing'                     WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#01';
    66 
    +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'By observer'                      WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#02';
    67 
    +UPDATE ps_common.SampleType SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Fish sorted'                     WHERE topiaid = 'fr.ird.referential.ps.common.SampleType#1464000000000#03';
    68 
    +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';
    69 
    +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';
    70 
    +UPDATE common.LASTUPDATEDATE SET  lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.ps.common.SampleType';
    71 
    +
    72 
    +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'With brail'                              WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#1';
    73 
    +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';
    74 
    +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'With specific device'                 WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#3';
    75 
    +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';
    76 
    +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'After disentanglement'                           WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#5';
    77 
    +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Submergence of floaters'                   WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#7';
    78 
    +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Cut in the net'                     WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#8';
    79 
    +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';
    80 
    +UPDATE common.SpeciesGroupReleaseMode SET topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}, label1 = 'Daylight onboard'                                WHERE topiaid = 'fr.ird.referential.common.SpeciesGroupReleaseMode#0#10';
    81 
    +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 1 
     {
    2 2 
       "bigsWeight": {
    3 3 
         "errors": [
    4 
    -      "0.0 <= bigsWeight <= 150.0 except if !weightValid",
    4 
    +      "0.0 <= bigsWeight <= 200.0",
    5 5 
           "bigsWeight is a positive number",
    6 6 
           "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    7 7 
           "bigsWeight not allowed if totalWeight filled"
    ... ... @@ -52,7 +52,7 @@
    52 52 
       },
    53 53 
       "smallsWeight": {
    54 54 
         "errors": [
    55 
    -      "0.0 <= smallsWeight <= 150.0 except if !weightValid",
    55 
    +      "0.0 <= smallsWeight <= 200.0",
    56 56 
           "smallsWeight is a positive number",
    57 57 
           "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    58 58 
           "smallsWeight not allowed if totalWeight filled"
    ... ... @@ -65,7 +65,7 @@
    65 65 
       },
    66 66 
       "totalWeight": {
    67 67 
         "errors": [
    68 
    -      "0.0 <= totalWeight <= 150.0 except if !weightValid",
    68 
    +      "0.0 <= totalWeight <= 200.0",
    69 69 
           "totalWeight is a positive number",
    70 70 
           "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)",
    71 71 
           "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 1 
     {
    2 2 
       "bigsWeight": {
    3 3 
         "errors": [
    4 
    -      "0.0 <= bigsWeight <= 150.0 except if !weightValid",
    4 
    +      "0.0 <= bigsWeight <= 200.0",
    5 5 
           "bigsWeight is a positive number",
    6 6 
           "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    7 7 
           "bigsWeight not allowed if totalWeight filled"
    ... ... @@ -52,7 +52,7 @@
    52 52 
       },
    53 53 
       "smallsWeight": {
    54 54 
         "errors": [
    55 
    -      "0.0 <= smallsWeight <= 150.0 except if !weightValid",
    55 
    +      "0.0 <= smallsWeight <= 200.0",
    56 56 
           "smallsWeight is a positive number",
    57 57 
           "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    58 58 
           "smallsWeight not allowed if totalWeight filled"
    ... ... @@ -65,7 +65,7 @@
    65 65 
       },
    66 66 
       "totalWeight": {
    67 67 
         "errors": [
    68 
    -      "0.0 <= totalWeight <= 150.0 except if !weightValid",
    68 
    +      "0.0 <= totalWeight <= 200.0",
    69 69 
           "totalWeight is a positive number",
    70 70 
           "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)",
    71 71 
           "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é
    966 966 
     observe.data.ps.localmarket.Batch.weight.observed.tip=Le poids estimé a été observé
    967 967 
     observe.data.ps.localmarket.Batch.weight.short=Poids
    968 968 
     observe.data.ps.localmarket.Batch.weight.validation.required=Le nombre ou le poids doit être renseigné (mais pas les deux).
    969 
    -observe.data.ps.localmarket.Sample.action.create=Échantillonnage au port suivant
    969 
    +observe.data.ps.localmarket.Sample.action.create=Échantillon suivant
    970 970 
     observe.data.ps.localmarket.Sample.action.move=Changer de marée
    971 
    -observe.data.ps.localmarket.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillonnages sélectionnés ?
    972 
    -observe.data.ps.localmarket.Sample.action.move.choose.parent.title=Changer la marée des échantillonnages
    973 
    -observe.data.ps.localmarket.Sample.action.move.tip=Changer la marée des échantillonnages sélectionnés
    971 
    +observe.data.ps.localmarket.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillons sélectionnés ?
    972 
    +observe.data.ps.localmarket.Sample.action.move.choose.parent.title=Changer la marée des échantillons
    973 
    +observe.data.ps.localmarket.Sample.action.move.tip=Changer la marée des échantillons sélectionnés
    974 974 
     observe.data.ps.localmarket.Sample.date=Date
    975 
    -observe.data.ps.localmarket.Sample.list.navigation.node=Échantillonnage au port
    976 
    -observe.data.ps.localmarket.Sample.list.title=Liste des échantillonnages
    975 
    +observe.data.ps.localmarket.Sample.list.navigation.node=Échantillons
    976 
    +observe.data.ps.localmarket.Sample.list.title=Liste des échantillons
    977 977 
     observe.data.ps.localmarket.Sample.message.not.open=L'échantillon n'est pas ouvert
    978 
    -observe.data.ps.localmarket.Sample.navigation.unsaved=Nouvel échantillonnage
    978 
    +observe.data.ps.localmarket.Sample.navigation.unsaved=Nouvel échantillon
    979 979 
     observe.data.ps.localmarket.Sample.number=Numéro
    980 
    -observe.data.ps.localmarket.Sample.title=Échantillonnage au port
    980 
    +observe.data.ps.localmarket.Sample.title=Échantillons
    981 981 
     observe.data.ps.localmarket.Sample.totalCount=Nombre total mesuré
    982 982 
     observe.data.ps.localmarket.Sample.type=Échantillonnage
    983 983 
     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).
    984 984 
     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).
    985 
    -observe.data.ps.localmarket.Sample.validation.duplicated.number=Il existe déjà un échantillonnage avec cet identifiant.
    985 
    +observe.data.ps.localmarket.Sample.validation.duplicated.number=Il existe déjà un échantillon avec cet identifiant.
    986 986 
     observe.data.ps.localmarket.Sample.well=Cuves
    987 987 
     observe.data.ps.localmarket.SampleSampleSpecies.sampleSpecies=Échantillonnage espèce
    988 988 
     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
    1089 1089 
     observe.data.ps.logbook.Route.type=Route
    1090 1090 
     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).
    1091 1091 
     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).
    1092 
    -observe.data.ps.logbook.Sample.action.create=Échantillonnage au port suivant
    1092 
    +observe.data.ps.logbook.Sample.action.create=Échantillon suivant
    1093 1093 
     observe.data.ps.logbook.Sample.action.move=Changer de marée
    1094 
    -observe.data.ps.logbook.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillonnages sélectionnés ?
    1095 
    -observe.data.ps.logbook.Sample.action.move.choose.parent.title=Changer la marée des échantillonnages
    1096 
    -observe.data.ps.logbook.Sample.action.move.tip=Changer la marée des échantillonnages sélectionnés
    1094 
    +observe.data.ps.logbook.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillons sélectionnés ?
    1095 
    +observe.data.ps.logbook.Sample.action.move.choose.parent.title=Changer la marée des échantillons
    1096 
    +observe.data.ps.logbook.Sample.action.move.tip=Changer la marée des échantillons sélectionnés
    1097 1097 
     observe.data.ps.logbook.Sample.activity=Activité
    1098 1098 
     observe.data.ps.logbook.Sample.activityTab=Activités associées
    1099 1099 
     observe.data.ps.logbook.Sample.bigsWeight=Poids des +10kg (en t)
    1100 
    -observe.data.ps.logbook.Sample.bigsWeight.validation.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné.
    1101 
    -observe.data.ps.logbook.Sample.list.navigation.node=Échantillonnage au port
    1102 
    -observe.data.ps.logbook.Sample.list.title=Échantillonnage au port
    1100 
    +observe.data.ps.logbook.Sample.bigsWeight.validation.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés.
    1101 
    +observe.data.ps.logbook.Sample.list.navigation.node=Échantillons
    1102 
    +observe.data.ps.logbook.Sample.list.title=Échantillons
    1103 1103 
     observe.data.ps.logbook.Sample.message.not.open=L'échantillon n'est pas ouvert
    1104 1104 
     observe.data.ps.logbook.Sample.navigation.unsaved=Nouvel échantillonnage
    1105 
    -observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.message=Il existe plus d'un échantillonnage , impossible de désactiver cette propriété
    1105 
    +observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.message=Il existe plus d'un échantillon , impossible de désactiver cette propriété
    1106 1106 
     observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.title=Impossible de désactiver la propriété super échantillon
    1107 1107 
     observe.data.ps.logbook.Sample.number=Numéro
    1108 1108 
     observe.data.ps.logbook.Sample.person=Échantillonneurs
    1109 1109 
     observe.data.ps.logbook.Sample.personTab=Échantillonneurs
    1110 1110 
     observe.data.ps.logbook.Sample.sampleActivity=Activités associées
    1111 1111 
     observe.data.ps.logbook.Sample.smallsWeight=Poids des -10Kg (en t)
    1112 
    -observe.data.ps.logbook.Sample.smallsWeight.validation.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné.
    1113 
    -observe.data.ps.logbook.Sample.title=Échantillonnage au port
    1112 
    +observe.data.ps.logbook.Sample.smallsWeight.validation.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés.
    1113 
    +observe.data.ps.logbook.Sample.title=Échantillons
    1114 1114 
     observe.data.ps.logbook.Sample.totalWeight=Poids total (en t)
    1115 
    -observe.data.ps.logbook.Sample.totalWeight.validation.required=Le poids total (ou le poids -10kg et +10kg) doit être renseigné.
    1115 
    +observe.data.ps.logbook.Sample.totalWeight.validation.required=Le poids total ou (les poids -10kg et +10kg) doivent être renseignés.
    1116 1116 
     observe.data.ps.logbook.Sample.type=Cuve
    1117 
    -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.
    1117 
    +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.
    1118 1118 
     observe.data.ps.logbook.SampleActivity.activity=Activité
    1119 1119 
     observe.data.ps.logbook.SampleActivity.activity.short=Activité
    1120 1120 
     observe.data.ps.logbook.SampleActivity.type=Pondération
    1121 1121 
     observe.data.ps.logbook.SampleActivity.weightedWeight=Pondération (en t)
    1122 1122 
     observe.data.ps.logbook.SampleActivity.weightedWeight.short=Pondération (en t)
    1123 
    -observe.data.ps.logbook.SampleSampleSpecies.sampleSpecies=Échantillonnage espèce
    1123 
    +observe.data.ps.logbook.SampleSampleSpecies.sampleSpecies=Échantillon espèce
    1124 1124 
     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.
    1125 1125 
     observe.data.ps.logbook.SampleSampleSpecies.type=Échantillon espèce
    1126 1126 
     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
    80 80 
     data.ps.logbook.Activity.attribute.totalWeight=0.0:800.0:!setEnabled
    81 81 
     data.ps.logbook.Route.attribute.fishingTime=0.0:24.0
    82 82 
     data.ps.logbook.Route.attribute.timeAtSea=0.0:24.0
    83 
    -data.ps.logbook.Sample.attribute.bigsWeight=0.0:150.0:!weightValid
    84 
    -data.ps.logbook.Sample.attribute.smallsWeight=0.0:150.0:!weightValid
    85 
    -data.ps.logbook.Sample.attribute.totalWeight=0.0:150.0:!weightValid
    83 
    +data.ps.logbook.Sample.attribute.bigsWeight=0.0:200.0
    84 
    +data.ps.logbook.Sample.attribute.smallsWeight=0.0:200.0
    85 
    +data.ps.logbook.Sample.attribute.totalWeight=0.0:200.0
    86 86 
     data.ps.logbook.WellPlan.attribute.weight=0.0:600.0
    87 87 
     data.ps.observation.Activity.attribute.vesselSpeed=0.0:35.0
    88 88 
     data.ps.observation.Catch.attribute.catchWeight=:0.0:400.0

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.